summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rwxr-xr-x[-rw-r--r--]libre/abiword-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/abiword-libre/abiword-2.8.6-libpng15.patch0
-rwxr-xr-x[-rw-r--r--]libre/abiword-libre/abiword-2.8.6-no-undefined.patch0
-rwxr-xr-x[-rw-r--r--]libre/abiword-libre/abiword-libre.install0
-rwxr-xr-x[-rw-r--r--]libre/abiword-libre/compat_libwpg_0_9.patch0
-rwxr-xr-x[-rw-r--r--]libre/abiword-libre/liberation-fonts.patch0
-rwxr-xr-x[-rw-r--r--]libre/abs-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/abs-libre/abs.install0
-rwxr-xr-x[-rw-r--r--]libre/abuse-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/abuse-libre/abuse.install0
-rwxr-xr-x[-rw-r--r--]libre/abuse-libre/non-claudio.patch0
-rwxr-xr-x[-rw-r--r--]libre/abuse-libre/rePKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/aif-libre/PKGBUILD0
-rw-r--r--libre/apache-ant-libre/PKGBUILD72
-rw-r--r--libre/apache-ant-libre/ant_diagnostics.patch23
-rw-r--r--libre/apache-ant-libre/apache-ant.csh2
-rw-r--r--libre/apache-ant-libre/apache-ant.sh3
-rwxr-xr-x[-rw-r--r--]libre/aspell-pl-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/atool-libre/PKGBUILD8
-rwxr-xr-x[-rw-r--r--]libre/atool-libre/atool.changelog (renamed from libre/atool-libre/ChangeLog)11
-rwxr-xr-x[-rw-r--r--]libre/atool-libre/rePKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/audacious-plugins-libre/PKGBUILD26
-rwxr-xr-x[-rw-r--r--]libre/audacity-libre/.directory0
-rwxr-xr-x[-rw-r--r--]libre/audacity-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/audacity-libre/audacity-libre.install0
-rwxr-xr-x[-rw-r--r--]libre/audacity-libre/remove-unfree-nyquist.patch0
-rwxr-xr-x[-rw-r--r--]libre/blackbox-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/blackbox-libre/bbdock.patch0
-rwxr-xr-x[-rw-r--r--]libre/blackbox-libre/bsetbg-feh.patch0
-rwxr-xr-x[-rw-r--r--]libre/blackbox-libre/gcc4.3.patch0
-rwxr-xr-x[-rw-r--r--]libre/blackbox-libre/menu0
-rwxr-xr-x[-rw-r--r--]libre/blackbox-libre/textpropertytostring-unconditional.patch0
-rwxr-xr-xlibre/blender-libre/PKGBUILD183
-rwxr-xr-xlibre/blender-libre/blender-libre.install13
-rwxr-xr-xlibre/blender-libre/blender.install13
-rwxr-xr-xlibre/blender-libre/boost-1.50.patch42
-rwxr-xr-xlibre/blender-libre/ffmpeg-0.11.patch434
-rwxr-xr-x[-rw-r--r--]libre/bogofilter-libre/PKGBUILD0
-rw-r--r--libre/cdfs-libre/PKGBUILD40
-rw-r--r--libre/cdfs-libre/cdfs-3.0.patch274
-rw-r--r--libre/cdfs-libre/cdfs-3.2.patch12
-rw-r--r--libre/cdfs-libre/cdfs-3.4.patch12
-rw-r--r--libre/cdfs-libre/cdfs.install14
-rwxr-xr-x[-rw-r--r--]libre/cdrkit-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/clementine-libre/PKGBUILD46
-rw-r--r--libre/clementine-libre/clementine-fix-albumcoverfetch-crash.patch20
-rw-r--r--libre/clementine-libre/clementine-fresh-start.patch9
-rwxr-xr-x[-rw-r--r--]libre/clementine-libre/clementine.install0
-rwxr-xr-x[-rw-r--r--]libre/clementine-libre/remove-and-disable-spotify.patch3117
-rw-r--r--libre/clementine-libre/remove-nonfree-references-on-translations.patch20088
-rwxr-xr-x[-rw-r--r--]libre/crosstool-ng/PKGBUILD5
-rwxr-xr-x[-rw-r--r--]libre/crosstool-ng/libc_ports_short_name.patch0
-rwxr-xr-xlibre/cups-filters-libre/PKGBUILD43
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/PKGBUILD25
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups-avahi-1-config.patch0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups-avahi-2-backend.patch0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups-avahi-3-timeouts.patch0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups-avahi-4-poll.patch0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups-avahi-5-services.patch0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups-no-export-ssllibs.patch0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups-no-gcrypt.patch0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups-no-gzip-man.patch0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups.install0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups.logrotate0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/cups.pam0
-rwxr-xr-x[-rw-r--r--]libre/cups-libre/rePKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/debhelper/PKGBUILD0
-rw-r--r--libre/django13/PKGBUILD47
-rw-r--r--libre/django13/PKGBUILD.orig40
-rw-r--r--libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff1573
-rw-r--r--libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff1575
-rw-r--r--libre/doublecmd-libre/PKGBUILD62
-rw-r--r--libre/doublecmd-libre/doublecmd.install34
-rwxr-xr-x[-rw-r--r--]libre/dpkg/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/dpkg/dpkg-arch.patch0
-rwxr-xr-x[-rw-r--r--]libre/dpkg/dpkg-rsyncable.patch0
-rwxr-xr-x[-rw-r--r--]libre/dvdrip-libre/PKGBUILD4
-rwxr-xr-x[-rw-r--r--]libre/dvdrip-libre/dvdrip.desktop0
-rwxr-xr-x[-rw-r--r--]libre/dvdrip-libre/dvdrip.install0
-rwxr-xr-x[-rw-r--r--]libre/dvdrip-libre/libre.patch0
-rwxr-xr-x[-rw-r--r--]libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch0
-rwxr-xr-x[-rw-r--r--]libre/epdfview-libre/PKGBUILD6
-rwxr-xr-x[-rw-r--r--]libre/epdfview-libre/epdfview.desktop.patch0
-rwxr-xr-x[-rw-r--r--]libre/epdfview-libre/epdfview.install0
-rwxr-xr-xlibre/epdfview-libre/glib2_headers.patch12
-rwxr-xr-x[-rw-r--r--]libre/file-roller-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/file-roller-libre/file-roller.install0
-rwxr-xr-x[-rw-r--r--]libre/file-roller-libre/rePKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/filesystem/PKGBUILD80
-rwxr-xr-x[-rw-r--r--]libre/filesystem/crypttab36
-rwxr-xr-x[-rw-r--r--]libre/filesystem/filesystem.install15
-rwxr-xr-x[-rw-r--r--]libre/filesystem/fstab0
-rwxr-xr-x[-rw-r--r--]libre/filesystem/group2
-rwxr-xr-x[-rw-r--r--]libre/filesystem/gshadow2
-rwxr-xr-x[-rw-r--r--]libre/filesystem/host.conf0
-rwxr-xr-x[-rw-r--r--]libre/filesystem/hosts0
-rwxr-xr-x[-rw-r--r--]libre/filesystem/issue0
-rwxr-xr-x[-rw-r--r--]libre/filesystem/ld.so.conf0
-rw-r--r--libre/filesystem/locale.sh28
-rwxr-xr-x[-rw-r--r--]libre/filesystem/modprobe.d.usb-load-ehci-first0
-rwxr-xr-x[-rw-r--r--]libre/filesystem/motd0
-rwxr-xr-x[-rw-r--r--]libre/filesystem/nsswitch.conf2
-rwxr-xr-xlibre/filesystem/os-release8
-rw-r--r--libre/filesystem/parabola.7.txt80
-rwxr-xr-x[-rw-r--r--]libre/filesystem/passwd1
-rwxr-xr-x[-rw-r--r--]libre/filesystem/profile0
-rwxr-xr-x[-rw-r--r--]libre/filesystem/resolv.conf0
-rwxr-xr-x[-rw-r--r--]libre/filesystem/securetty0
-rwxr-xr-x[-rw-r--r--]libre/filesystem/shadow1
-rwxr-xr-x[-rw-r--r--]libre/filesystem/shells0
-rwxr-xr-x[-rw-r--r--]libre/foomatic-filters-libre/PKGBUILD16
-rwxr-xr-x[-rw-r--r--]libre/ghostscript-libre/PKGBUILD15
-rwxr-xr-x[-rw-r--r--]libre/ghostscript-libre/svn_rev11948.diff0
-rwxr-xr-x[-rw-r--r--]libre/gnu-ghostscript/PKGBUILD37
-rw-r--r--libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch263
-rwxr-xr-x[-rw-r--r--]libre/gnustep-base-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/gnustep-make-libre/PKGBUILD0
-rw-r--r--libre/grub-legacy/040_all_grub-0.96-nxstack.patch (renamed from libre/grub/040_all_grub-0.96-nxstack.patch)0
-rw-r--r--libre/grub-legacy/05-grub-0.97-initrdaddr.diff (renamed from libre/grub/05-grub-0.97-initrdaddr.diff)0
-rw-r--r--libre/grub-legacy/PKGBUILD107
-rw-r--r--libre/grub-legacy/ext4.patch (renamed from libre/grub/ext4.patch)0
-rw-r--r--libre/grub-legacy/grub-0.97-gpt.patch (renamed from libre/grub/grub-0.97-gpt.patch)0
-rw-r--r--libre/grub-legacy/grub-0.97-ldflags-objcopy-remove-build-id.patch (renamed from libre/grub/grub-0.97-ldflags-objcopy-remove-build-id.patch)0
-rw-r--r--libre/grub-legacy/grub-inode-size.patch (renamed from libre/grub/grub-inode-size.patch)0
-rw-r--r--libre/grub-legacy/grub.install20
-rw-r--r--libre/grub-legacy/i2o.patch (renamed from libre/grub/i2o.patch)0
-rw-r--r--libre/grub-legacy/install-grub (renamed from libre/grub/install-grub)0
-rw-r--r--libre/grub-legacy/intelmac.patch (renamed from libre/grub/intelmac.patch)0
-rw-r--r--libre/grub-legacy/menu.lst (renamed from libre/grub/menu.lst)2
-rw-r--r--libre/grub-legacy/more-raid.patch (renamed from libre/grub/more-raid.patch)0
-rw-r--r--libre/grub-legacy/rePKGBUILD (renamed from libre/grub/rePKGBUILD)2
-rw-r--r--libre/grub-legacy/special-devices.patch (renamed from libre/grub/special-devices.patch)0
-rw-r--r--libre/grub/05_archtheme6
-rw-r--r--libre/grub/20_memtest86+29
-rwxr-xr-x[-rw-r--r--]libre/grub/PKGBUILD335
-rw-r--r--libre/grub/fix_stack_pointer_handling_16_relocator.patch13
-rw-r--r--libre/grub/grub-install.fix11
-rw-r--r--libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch15
-rw-r--r--libre/grub/grub.cfg139
-rw-r--r--libre/grub/grub.default47
-rwxr-xr-x[-rw-r--r--]libre/grub/grub.install27
-rw-r--r--libre/grub/grub2.install33
-rw-r--r--libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch134
-rw-r--r--libre/grub/grub2_bzr_export.sh113
-rw-r--r--libre/grub/grub_bzr_export.sh113
-rw-r--r--libre/grub/grub_extras_lua_args_fix.patch13
-rw-r--r--libre/grub/parabola-mkconfig.patch32
-rw-r--r--libre/grub/parabola_grub_mkconfig_fixes.patch152
-rwxr-xr-x[-rw-r--r--]libre/grub2/05_archtheme0
-rwxr-xr-x[-rw-r--r--]libre/grub2/20_memtest86+0
-rwxr-xr-x[-rw-r--r--]libre/grub2/PKGBUILD36
-rwxr-xr-x[-rw-r--r--]libre/grub2/fix_stack_pointer_handling_16_relocator.patch0
-rwxr-xr-x[-rw-r--r--]libre/grub2/grub-install.fix0
-rwxr-xr-x[-rw-r--r--]libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch0
-rwxr-xr-x[-rw-r--r--]libre/grub2/grub.cfg0
-rwxr-xr-x[-rw-r--r--]libre/grub2/grub.default4
-rwxr-xr-x[-rw-r--r--]libre/grub2/grub2.install0
-rwxr-xr-x[-rw-r--r--]libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch0
-rwxr-xr-x[-rw-r--r--]libre/grub2/grub2_bzr_export.sh0
-rwxr-xr-x[-rw-r--r--]libre/grub2/grub_extras_lua_args_fix.patch0
-rwxr-xr-x[-rw-r--r--]libre/grub2/parabola-mkconfig.patch0
-rwxr-xr-x[-rw-r--r--]libre/grub2/parabola_grub_mkconfig_fixes.patch0
-rw-r--r--libre/gst-plugins-bad-libre/PKGBUILD83
-rwxr-xr-x[-rw-r--r--]libre/gstreamer0.10-bad-libre/PKGBUILD17
-rwxr-xr-x[-rw-r--r--]libre/gstreamer0.10-bad-libre/gstreamer0.10-bad-plugins.install0
-rwxr-xr-x[-rw-r--r--]libre/gstreamer0.10-good/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install0
-rwxr-xr-x[-rw-r--r--]libre/h-client/PKGBUILD9
-rw-r--r--libre/hardinfo/.directory2
-rw-r--r--libre/hardinfo/ChangeLog20
-rwxr-xr-x[-rw-r--r--]libre/hardinfo/PKGBUILD8
-rwxr-xr-x[-rw-r--r--]libre/hardinfo/fixsensors.patch0
-rwxr-xr-x[-rw-r--r--]libre/hardinfo/hardinfo.distro0
-rwxr-xr-x[-rw-r--r--]libre/hplip-libre/PKGBUILD42
-rwxr-xr-x[-rw-r--r--]libre/hplip-libre/hplip.install8
-rw-r--r--libre/hplip-libre/rePKGBUILD26
-rwxr-xr-x[-rw-r--r--]libre/iceape-i18n/.gitignore0
-rwxr-xr-x[-rw-r--r--]libre/iceape-i18n/Makefile0
-rwxr-xr-x[-rw-r--r--]libre/iceape-i18n/PKGBUILD56
-rwxr-xr-x[-rw-r--r--]libre/iceape-i18n/PKGBUILD.in0
-rwxr-xr-x[-rw-r--r--]libre/iceape-libre/PKGBUILD14
-rwxr-xr-x[-rw-r--r--]libre/iceape-libre/clrf.patch0
-rwxr-xr-x[-rw-r--r--]libre/iceape-libre/gcc47.patch0
-rwxr-xr-x[-rw-r--r--]libre/iceape-libre/iceape-2.0-lang.patch0
-rwxr-xr-x[-rw-r--r--]libre/iceape-libre/iceape.desktop0
-rwxr-xr-x[-rw-r--r--]libre/iceape-libre/iceape.install0
-rwxr-xr-x[-rw-r--r--]libre/iceape-libre/libre.patch126
-rwxr-xr-x[-rw-r--r--]libre/iceape-libre/mozconfig0
-rwxr-xr-x[-rw-r--r--]libre/icecat-i18n/.gitignore0
-rwxr-xr-x[-rw-r--r--]libre/icecat-i18n/Makefile0
-rwxr-xr-x[-rw-r--r--]libre/icecat-i18n/PKGBUILD320
-rwxr-xr-x[-rw-r--r--]libre/icecat-i18n/PKGBUILD.in0
-rwxr-xr-x[-rw-r--r--]libre/icecat/PKGBUILD213
-rwxr-xr-xlibre/icecat/cairo.patch33
-rwxr-xr-x[-rw-r--r--]libre/icecat/gcc47.patch (renamed from libre/iceweasel-libre/gcc47.patch)0
-rwxr-xr-x[-rw-r--r--]libre/icecat/icecat-install-dir.patch (renamed from libre/icecat/firefox-install-dir.patch)23
-rwxr-xr-x[-rw-r--r--]libre/icecat/icecat-safe.desktop0
-rwxr-xr-x[-rw-r--r--]libre/icecat/icecat.desktop0
-rwxr-xr-x[-rw-r--r--]libre/icecat/icecat.install0
-rwxr-xr-x[-rw-r--r--]libre/icecat/libre.patch410
-rw-r--r--libre/icecat/libvpx.patch12
-rwxr-xr-x[-rw-r--r--]libre/icecat/mozconfig8
-rw-r--r--libre/icecat/mozconfig.default63
-rw-r--r--libre/icecat/mozconfig.firefox46
-rw-r--r--libre/icecat/mozconfig.old78
-rwxr-xr-x[-rw-r--r--]libre/icecat/mozconfig.pgo0
-rwxr-xr-x[-rw-r--r--]libre/icecat/vendor.js4
-rwxr-xr-xlibre/icecat/xulrunner-copy-stub.patch11
-rwxr-xr-x[-rw-r--r--]libre/icedove-i18n/PKGBUILD342
-rw-r--r--libre/icedove-libre/.directory2
-rwxr-xr-x[-rw-r--r--]libre/icedove-libre/PKGBUILD35
-rw-r--r--libre/icedove-libre/branding.patch19
-rw-r--r--libre/icedove-libre/clrf.patch260
-rw-r--r--libre/icedove-libre/gcc47.patch63
-rwxr-xr-x[-rw-r--r--]libre/icedove-libre/icedove.desktop0
-rwxr-xr-x[-rw-r--r--]libre/icedove-libre/icedove.install0
-rwxr-xr-x[-rw-r--r--]libre/icedove-libre/makefile.patch0
-rwxr-xr-x[-rw-r--r--]libre/icedove-libre/mozconfig0
-rwxr-xr-x[-rw-r--r--]libre/icedove-libre/vendor.js0
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-i18n/.gitignore0
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-i18n/Makefile0
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-i18n/PKGBUILD182
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-i18n/PKGBUILD.in0
-rwxr-xr-xlibre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch281
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-libre/PKGBUILD74
-rw-r--r--libre/iceweasel-libre/iceweasel-install-dir.patch49
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-libre/iceweasel.install0
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-libre/libre.patch412
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-libre/mozconfig0
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-libre/mozconfig.pgo0
-rw-r--r--libre/iceweasel-libre/region.properties23
-rwxr-xr-xlibre/iceweasel-libre/shared-libs.patch12
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-libre/vendor.js0
-rwxr-xr-x[-rw-r--r--]libre/iceweasel-libre/xulrunner-copy-stub.patch0
-rwxr-xr-xlibre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch29
-rwxr-xr-x[-rw-r--r--]libre/initscripts/PKGBUILD34
-rwxr-xr-x[-rw-r--r--]libre/initscripts/initscripts.install7
-rw-r--r--libre/initscripts/split-hwclock-calls.diff21
-rwxr-xr-x[-rw-r--r--]libre/initscripts/wireless.conf.d0
-rw-r--r--libre/java-asm2/PKGBUILD76
-rw-r--r--libre/java-asm3/PKGBUILD78
-rw-r--r--libre/java-ow-util-ant-tasks/PKGBUILD27
-rw-r--r--libre/java-ow-util-ant-tasks/SRCBUILD29
-rwxr-xr-x[-rw-r--r--]libre/kdebase-konqueror-libre/PKGBUILD10
-rwxr-xr-x[-rw-r--r--]libre/kdebase-konqueror-libre/kdebase-konqueror.install0
-rwxr-xr-x[-rw-r--r--]libre/kdebase-konqueror-libre/konq-about-fsdg.diff0
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD57
-rw-r--r--libre/kdebase-runtime-libre/duckduckgo_lite.desktop113
-rw-r--r--libre/kdebase-runtime-libre/kdebase-runtime.install13
-rwxr-xr-x[-rw-r--r--]libre/kdelibs-libre/PKGBUILD25
-rwxr-xr-x[-rw-r--r--]libre/kdelibs-libre/fix-kmail-crash.patch0
-rwxr-xr-x[-rw-r--r--]libre/kdelibs-libre/kde-applications-menu.patch0
-rwxr-xr-x[-rw-r--r--]libre/kdelibs-libre/kdelibs.install0
-rwxr-xr-x[-rw-r--r--]libre/kdelibs-libre/khtml-fsdg.diff0
-rwxr-xr-x[-rw-r--r--]libre/kdelibs-libre/use-pythondontwritebytecode.patch8
-rwxr-xr-x[-rw-r--r--]libre/kdenetwork-kopete-libre/PKGBUILD23
-rw-r--r--libre/kdenetwork-kopete-libre/gcc47.patch59
-rwxr-xr-x[-rw-r--r--]libre/kdenetwork-kopete-libre/kdenetwork-kopete.install0
-rwxr-xr-x[-rw-r--r--]libre/kdenetwork-kopete-libre/kdenetwork.install0
-rwxr-xr-x[-rw-r--r--]libre/kdeutils-ark-libre/PKGBUILD10
-rwxr-xr-x[-rw-r--r--]libre/kdeutils-ark-libre/kdeutils-ark.install0
-rwxr-xr-x[-rw-r--r--]libre/kdeutils-ark-libre/rePKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/kernel26-libre-lts/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/kernel26-libre-lts/buildfix-gcc46.diff0
-rwxr-xr-x[-rw-r--r--]libre/kernel26-libre-lts/config.i6860
-rwxr-xr-x[-rw-r--r--]libre/kernel26-libre-lts/config.x86_640
-rwxr-xr-x[-rw-r--r--]libre/kernel26-libre-lts/kernel26-libre-lts.install0
-rwxr-xr-x[-rw-r--r--]libre/kernel26-libre-lts/kernel26-lts.preset0
-rwxr-xr-x[-rw-r--r--]libre/kernel26-libre-lts/libata-alignment.patch0
-rwxr-xr-x[-rw-r--r--]libre/kernel26-libre-lts/packages/.svn/entries0
-rwxr-xr-x[-rw-r--r--]libre/kernel26-libre-manpages/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/kile-libre/PKGBUILD6
-rwxr-xr-x[-rw-r--r--]libre/kile-libre/kile.install0
-rwxr-xr-x[-rw-r--r--]libre/kile-libre/no-acroread.patch0
-rwxr-xr-x[-rw-r--r--]libre/lame-libre/PKGBUILD1
-rwxr-xr-x[-rw-r--r--]libre/lesspipe-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/lesspipe-libre/lesspipe.sh0
-rwxr-xr-x[-rw-r--r--]libre/lesspipe-libre/rePKGBUILD0
-rw-r--r--libre/lib32-mesa-demos-libre/PKGBUILD45
-rwxr-xr-xlibre/lib32-mesa-demos-libre/mesa-demos-libre.patch1192
-rw-r--r--libre/lib32-sdl-libre/PKGBUILD60
-rw-r--r--libre/lib32-sdl-libre/fix_joystick_misc_axes.diff13
-rw-r--r--libre/lib32-sdl-libre/libre.patch (renamed from libre/sdl-libre/riva_mmio.patch)24
-rw-r--r--libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch63
-rw-r--r--libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch13
-rw-r--r--libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch23
-rw-r--r--libre/libcl-libre/PKGBUILD75
-rwxr-xr-x[-rw-r--r--]libre/libquicktime-libre/PKGBUILD4
-rwxr-xr-x[-rw-r--r--]libre/libretools/PKGBUILD65
-rwxr-xr-x[-rw-r--r--]libre/libretools/libretools.install4
-rwxr-xr-x[-rw-r--r--]libre/libui-sh/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/licenses-libre/PKGBUILD6
-rwxr-xr-x[-rw-r--r--]libre/licenses-libre/ZopePublicLicense.txt0
-rwxr-xr-x[-rw-r--r--]libre/licenses-libre/cc-by-3.0.txt0
-rwxr-xr-x[-rw-r--r--]libre/licenses-libre/cc-by-sa-3.0.txt0
-rwxr-xr-x[-rw-r--r--]libre/licenses-libre/cc-readme.txt0
-rwxr-xr-x[-rw-r--r--]libre/licenses-libre/cddl-1.0.txt0
-rwxr-xr-x[-rw-r--r--]libre/licenses-libre/cpl-1.0.txt0
-rwxr-xr-x[-rw-r--r--]libre/licenses-libre/eclipse-1.0.txt0
-rwxr-xr-x[-rw-r--r--]libre/licenses-libre/perlartistic.txt0
-rwxr-xr-x[-rw-r--r--]libre/licenses-libre/python-2.txt0
-rwxr-xr-x[-rw-r--r--]libre/liferea-libre/PKGBUILD18
-rwxr-xr-x[-rw-r--r--]libre/liferea-libre/libnotify-0.7.patch0
-rwxr-xr-x[-rw-r--r--]libre/liferea-libre/liferea.install2
-rwxr-xr-x[-rw-r--r--]libre/liferea-libre/remove-non-free-suggestions.patch0
-rw-r--r--libre/lilo/.directory2
-rwxr-xr-x[-rw-r--r--]libre/lilo/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/lilo/lilo.conf0
-rwxr-xr-x[-rw-r--r--]libre/lilo/lilo.install0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-api-headers/PKGBUILD24
-rw-r--r--libre/linux-libre-firmware/PKGBUILD49
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD38
-rw-r--r--libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install33
-rw-r--r--libre/linux-libre-lts-kmod-alx/PKGBUILD38
-rw-r--r--libre/linux-libre-lts-kmod-alx/linux-libre-lts-kmod-alx.install33
-rw-r--r--libre/linux-libre-lts/.directory2
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/Kbuild0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/Kbuild.platforms0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/PKGBUILD156
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/boot-logo.patch0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/change-default-console-loglevel.patch0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/config.i68654
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/config.x86_6458
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/ext4-options.patch0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/i915-fix-ghost-tv-output.patch0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/linux-libre-lts.install19
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-lts/linux-libre-lts.preset0
-rw-r--r--libre/linux-libre-lts/module-init-wait-3.0.patch77
-rw-r--r--libre/linux-libre-lts/module-symbol-waiting-3.0.patch66
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-manpages/PKGBUILD12
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-tools/PKGBUILD119
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-tools/cpupower.conf5
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-tools/cpupower.rc33
-rwxr-xr-x[-rw-r--r--]libre/linux-libre-tools/cpupower.service2
-rwxr-xr-xlibre/linux-libre-tools/cpupower.systemd32
-rwxr-xr-xlibre/linux-libre-tools/usbipd.conf3
-rwxr-xr-xlibre/linux-libre-tools/usbipd.rc34
-rwxr-xr-xlibre/linux-libre-tools/usbipd.service8
-rw-r--r--libre/linux-libre/.directory5
-rwxr-xr-x[-rw-r--r--]libre/linux-libre/ChangeLog13
-rwxr-xr-x[-rw-r--r--]libre/linux-libre/Kbuild0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre/Kbuild.platforms0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre/PKGBUILD190
-rwxr-xr-x[-rw-r--r--]libre/linux-libre/boot-logo.patch0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre/change-default-console-loglevel.patch0
-rwxr-xr-x[-rw-r--r--]libre/linux-libre/config.i686423
-rwxr-xr-x[-rw-r--r--]libre/linux-libre/config.x86_64420
-rw-r--r--libre/linux-libre/i915-fix-ghost-tv-output.patch26
-rwxr-xr-x[-rw-r--r--]libre/linux-libre/linux-libre.install19
-rwxr-xr-x[-rw-r--r--]libre/linux-libre/linux-libre.preset0
-rw-r--r--libre/linux-libre/module-init-wait-3.6.patch77
-rw-r--r--libre/linux-libre/module-symbol-waiting-3.6.patch66
-rwxr-xr-xlibre/lirc-libre/PKGBUILD124
-rwxr-xr-xlibre/lirc-libre/irexec.conf5
-rw-r--r--libre/lirc-libre/irexec.service11
-rwxr-xr-xlibre/lirc-libre/irexecd38
-rwxr-xr-xlibre/lirc-libre/kernel-2.6.39.patch54
-rw-r--r--libre/lirc-libre/lirc-utils.install7
-rwxr-xr-xlibre/lirc-libre/lirc.install16
-rwxr-xr-xlibre/lirc-libre/lirc.logrotate5
-rw-r--r--libre/lirc-libre/lirc.service11
-rw-r--r--libre/lirc-libre/lirc.tmpfiles1
-rwxr-xr-xlibre/lirc-libre/lirc_atiusb-kfifo.patch31
-rwxr-xr-xlibre/lirc-libre/lirc_wpc8769l.patch88
-rwxr-xr-xlibre/lirc-libre/lircd52
-rwxr-xr-xlibre/lirc-libre/lircd-handle-large-config.patch39
-rwxr-xr-xlibre/lirc-libre/lircd.conf8
-rw-r--r--libre/lirc-libre/lircm.service11
-rwxr-xr-xlibre/lirc-libre/lircmd36
-rwxr-xr-x[-rw-r--r--]libre/lsb-release-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/lsb-release-libre/lsb-release.install0
-rw-r--r--libre/luxblend25/PKGBUILD46
-rw-r--r--libre/luxrays-libre/PKGBUILD42
-rw-r--r--libre/luxrender-libre/PKGBUILD48
-rwxr-xr-x[-rw-r--r--]libre/mariadb/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/mariadb/mariadb.install0
-rwxr-xr-x[-rw-r--r--]libre/mariadb/my.cnf0
-rwxr-xr-x[-rw-r--r--]libre/mariadb/mysql.install0
-rwxr-xr-x[-rw-r--r--]libre/mariadb/mysqld0
-rw-r--r--libre/maven-libre/PKGBUILD76
-rw-r--r--libre/maven-libre/maven.csh2
-rw-r--r--libre/maven-libre/maven.sh3
-rw-r--r--libre/mc-libre/PKGBUILD69
-rw-r--r--libre/mcomix-libre/PKGBUILD47
-rw-r--r--libre/mcomix-libre/mcomix.install32
-rwxr-xr-x[-rw-r--r--]libre/mesa-demos-libre/LICENSE0
-rwxr-xr-x[-rw-r--r--]libre/mesa-demos-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/metalog/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/metalog/metalog0
-rwxr-xr-x[-rw-r--r--]libre/metalog/metalog.confd0
-rwxr-xr-x[-rw-r--r--]libre/mozilla-devscripts/PKGBUILD9
-rwxr-xr-x[-rw-r--r--]libre/mozilla-searchplugins/PKGBUILD15
-rwxr-xr-x[-rw-r--r--]libre/mozilla-searchplugins/duck-duck-go-lite.xml0
-rw-r--r--libre/mozilla-searchplugins/duck-duck-go-ssl.xml8
-rwxr-xr-x[-rw-r--r--]libre/mozilla-searchplugins/internet-archive.xml0
-rwxr-xr-x[-rw-r--r--]libre/mozilla-searchplugins/jamendo-en.xml0
-rwxr-xr-x[-rw-r--r--]libre/mozilla-searchplugins/logless-search.xml0
-rwxr-xr-xlibre/mozilla-searchplugins/parabola-packages.xml9
-rwxr-xr-xlibre/mozilla-searchplugins/parabola-wiki-en.xml11
-rw-r--r--libre/mozilla-searchplugins/scroogle-ssl-english.xml14
-rwxr-xr-xlibre/mozilla-searchplugins/seeks-search.xml8
-rwxr-xr-x[-rw-r--r--]libre/mozilla-searchplugins/wikipedia.xml0
-rwxr-xr-x[-rw-r--r--]libre/mozilla-searchplugins/yacy.xml0
-rwxr-xr-x[-rw-r--r--]libre/mplayer-libre/.directory0
-rwxr-xr-x[-rw-r--r--]libre/mplayer-libre/PKGBUILD30
-rw-r--r--libre/mplayer-libre/live-media.patch13
-rwxr-xr-x[-rw-r--r--]libre/mplayer-libre/mplayer.desktop0
-rwxr-xr-x[-rw-r--r--]libre/mplayer-libre/mplayer.install0
-rwxr-xr-x[-rw-r--r--]libre/mplayer-libre/mplayer.pngbin1982 -> 1982 bytes
-rwxr-xr-x[-rw-r--r--]libre/mplayer-vaapi-libre/PKGBUILD41
-rw-r--r--libre/mplayer-vaapi-libre/gcc-4.6-mp3lib-sse-code-miscompilation.patch21
-rw-r--r--libre/mplayer-vaapi-libre/live-media.patch13
-rwxr-xr-x[-rw-r--r--]libre/mplayer-vaapi-libre/mplayer-vaapi.install8
-rw-r--r--libre/mplayer-vaapi-libre/mplayer.desktop21
-rw-r--r--libre/mplayer-vaapi-libre/mplayer.pngbin1982 -> 0 bytes
-rw-r--r--libre/mplayer-vaapi-libre/patch-fixes.patch491
-rwxr-xr-x[-rw-r--r--]libre/mplayer-vaapi-libre/tweak-desktop-file.patch22
-rw-r--r--libre/ogre-libre/PKGBUILD131
-rw-r--r--libre/ogre-libre/ogre.install4
-rwxr-xr-x[-rw-r--r--]libre/p7zip-libre/7zFM.desktop0
-rwxr-xr-x[-rw-r--r--]libre/p7zip-libre/9.04-makefile.patch0
-rwxr-xr-x[-rw-r--r--]libre/p7zip-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/p7zip-libre/install0
-rwxr-xr-x[-rw-r--r--]libre/p7zip-libre/p7zip-libre.patch0
-rwxr-xr-x[-rw-r--r--]libre/pacman-mirrorlist-libre/PKGBUILD0
-rwxr-xr-xlibre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch152
-rwxr-xr-xlibre/pacman/0002-Check-empty-subdirectory-ownership.patch61
-rwxr-xr-x[-rw-r--r--]libre/pacman/PKGBUILD36
-rwxr-xr-x[-rw-r--r--]libre/pacman/makepkg.conf0
-rwxr-xr-x[-rw-r--r--]libre/pacman/pacman.conf25
-rwxr-xr-x[-rw-r--r--]libre/pacman/pacman.conf.mips64el31
-rwxr-xr-x[-rw-r--r--]libre/pacman/pacman.conf.x86_6427
-rwxr-xr-x[-rw-r--r--]libre/pacman/pacman.install11
-rwxr-xr-xlibre/pacman/rePKGBUILD37
-rwxr-xr-x[-rw-r--r--]libre/parabola-archiso-git/PKGBUILD0
-rwxr-xr-xlibre/parabola-archiso/PKGBUILD22
-rwxr-xr-xlibre/parabola-keyring/PKGBUILD19
-rwxr-xr-xlibre/parabola-keyring/parabola-keyring.install11
-rwxr-xr-x[-rw-r--r--]libre/parabola-themes-slim/PKGBUILD2
-rw-r--r--libre/parabolaweb-git/Makefile26
-rw-r--r--libre/parabolaweb-git/PKGBUILD43
-rw-r--r--libre/parabolaweb-git/deps-ver.txt7
-rw-r--r--libre/parabolaweb-git/parabolaweb.init.sh52
-rw-r--r--libre/parabolaweb-git/parabolaweb.update.sh.in59
-rw-r--r--libre/parabolaweb-git/requirements_prod.txt7
-rw-r--r--libre/parabolaweb-utils/PKGBUILD55
-rw-r--r--libre/parabolaweb-utils/helper.sh39
-rw-r--r--libre/parabolaweb-utils/parabolaweb-download47
-rw-r--r--libre/parabolaweb-utils/parabolaweb-fcgi12
-rw-r--r--libre/parabolaweb-utils/parabolaweb-update80
-rw-r--r--libre/parabolaweb-utils/parabolaweb.conf4
-rw-r--r--libre/parabolaweb-utils/parabolaweb.rc44
-rw-r--r--libre/parabolaweb-utils/parabolaweb.service13
-rw-r--r--libre/psutils-libre/.directory2
-rwxr-xr-x[-rw-r--r--]libre/psutils-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/psutils-libre/psutils-1.17.diff0
-rw-r--r--libre/python-reportlab-libre/PKGBUILD39
-rw-r--r--libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch61
-rw-r--r--libre/python2-libre/PKGBUILD109
-rw-r--r--libre/python2-libre/SRCBUILD36
-rw-r--r--libre/python2-libre/WDAS.patch109
-rw-r--r--libre/python2-libre/doc_license_change.patch44
-rw-r--r--libre/python2-libre/gdbm-magic-values.patch12
-rw-r--r--libre/python2-libre/linux2.patch23
-rwxr-xr-x[-rw-r--r--]libre/python2-ply/PKGBUILD0
-rwxr-xr-xlibre/python2-reportlab-libre/PKGBUILD49
-rw-r--r--libre/python2-reportlab-libre/free-fonts.patch (renamed from libre/python-reportlab-libre/free-fonts.patch)26
-rwxr-xr-x[-rw-r--r--]libre/rp-pppoe-libre/PKGBUILD63
-rwxr-xr-x[-rw-r--r--]libre/rp-pppoe-libre/adsl0
-rw-r--r--libre/rp-pppoe-libre/adsl.service10
-rw-r--r--libre/rp-pppoe-libre/rp-pppoe-libre.patch34
-rwxr-xr-x[-rw-r--r--]libre/rp-pppoe-libre/rp-pppoe.install0
-rwxr-xr-x[-rw-r--r--]libre/sdl-libre/PKGBUILD42
-rw-r--r--libre/sdl-libre/fix_joystick_misc_axes.diff13
-rw-r--r--libre/sdl-libre/libre.patch578
-rw-r--r--libre/sdl-libre/libsdl-1.2.15-resizing.patch63
-rw-r--r--libre/sdl-libre/no-riva-accel.patch24
-rwxr-xr-x[-rw-r--r--]libre/sdl-libre/sdl-1.2.14-disable-mmx.patch0
-rwxr-xr-x[-rw-r--r--]libre/sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch0
-rwxr-xr-x[-rw-r--r--]libre/seamonkey-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/seamonkey-libre/clrf.patch0
-rwxr-xr-x[-rw-r--r--]libre/seamonkey-libre/gcc47.patch0
-rwxr-xr-x[-rw-r--r--]libre/seamonkey-libre/gnuzilla-addons.patch0
-rwxr-xr-x[-rw-r--r--]libre/seamonkey-libre/libvpx.patch0
-rwxr-xr-x[-rw-r--r--]libre/seamonkey-libre/mozconfig0
-rwxr-xr-x[-rw-r--r--]libre/seamonkey-libre/python27.patch0
-rwxr-xr-x[-rw-r--r--]libre/seamonkey-libre/seamonkey-2.0-lang.patch0
-rwxr-xr-x[-rw-r--r--]libre/seamonkey-libre/seamonkey.desktop0
-rwxr-xr-x[-rw-r--r--]libre/seamonkey-libre/seamonkey.install0
-rw-r--r--libre/spectrwm-libre/LICENSE47
-rw-r--r--libre/spectrwm-libre/PKGBUILD65
-rw-r--r--libre/spectrwm-libre/baraction.sh82
-rwxr-xr-x[-rw-r--r--]libre/sqlite3-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/sqlite3-libre/license.txt0
-rwxr-xr-x[-rw-r--r--]libre/sqlite3/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/sqlite3/license.txt0
-rwxr-xr-x[-rw-r--r--]libre/syslinux/PKGBUILD30
-rwxr-xr-xlibre/syslinux/avoid-using-ext2_fs.patch965
-rwxr-xr-x[-rw-r--r--]libre/syslinux/fix-undefined-type-umode_t.patch0
-rwxr-xr-xlibre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch67
-rwxr-xr-x[-rw-r--r--]libre/syslinux/rePKGBUILD15
-rwxr-xr-x[-rw-r--r--]libre/syslinux/splash.pngbin9932 -> 9932 bytes
-rwxr-xr-x[-rw-r--r--]libre/syslinux/syslinux-dont-build-dos-windows-targets.patch0
-rwxr-xr-x[-rw-r--r--]libre/syslinux/syslinux-install_update0
-rwxr-xr-x[-rw-r--r--]libre/syslinux/syslinux.cfg0
-rwxr-xr-x[-rw-r--r--]libre/syslinux/syslinux.install0
-rwxr-xr-x[-rw-r--r--]libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch0
-rwxr-xr-x[-rw-r--r--]libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch0
-rwxr-xr-x[-rw-r--r--]libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch0
-rwxr-xr-x[-rw-r--r--]libre/systemd/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/systemd/os-release0
-rwxr-xr-x[-rw-r--r--]libre/systemd/rePKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/systemd/systemd.install0
-rwxr-xr-x[-rw-r--r--]libre/texlive-bin-libre/09-texlive-fonts.conf0
-rwxr-xr-x[-rw-r--r--]libre/texlive-bin-libre/PKGBUILD143
-rwxr-xr-x[-rw-r--r--]libre/texlive-bin-libre/fix-fontforge-encoding.patch0
-rwxr-xr-x[-rw-r--r--]libre/texlive-bin-libre/luatex-poppler-0.20.patch0
-rwxr-xr-xlibre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch23
-rwxr-xr-xlibre/texlive-bin-libre/poppler-0.20.patch22
-rwxr-xr-x[-rw-r--r--]libre/texlive-bin-libre/texlive.install16
-rwxr-xr-x[-rw-r--r--]libre/texlive-bin-libre/texmf.cnf0
-rwxr-xr-x[-rw-r--r--]libre/texlive-core-libre/PKGBUILD68
-rwxr-xr-x[-rw-r--r--]libre/texlive-core-libre/texlive-core.maps6
-rwxr-xr-x[-rw-r--r--]libre/texlive-core-libre/texlive.install8
-rwxr-xr-x[-rw-r--r--]libre/texlive-fontsextra-libre/PKGBUILD40
-rwxr-xr-x[-rw-r--r--]libre/texlive-fontsextra-libre/texlive-fontsextra.maps5
-rwxr-xr-x[-rw-r--r--]libre/texlive-fontsextra-libre/texlive.install0
-rwxr-xr-x[-rw-r--r--]libre/texlive-latexextra-libre/PKGBUILD40
-rwxr-xr-x[-rw-r--r--]libre/texlive-latexextra-libre/texlive-latexextra.maps0
-rwxr-xr-x[-rw-r--r--]libre/texlive-latexextra-libre/texlive.install0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/.directory0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/channel-prefs.js0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/clrf.patch0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/gcc47.patch0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/mozconfig0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/rePKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/searchplugins-libre.patch0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/thunderbird-install-dir.patch0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/thunderbird.desktop0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/thunderbird.install0
-rwxr-xr-x[-rw-r--r--]libre/thunderbird-libre/vendor.js0
-rw-r--r--libre/tp_smapi-libre-lts/PKGBUILD60
-rw-r--r--libre/tp_smapi-libre-lts/tp_smapi-lts.install13
-rw-r--r--libre/tp_smapi-libre/PKGBUILD63
-rw-r--r--libre/tp_smapi-libre/tp_smapi.install13
-rwxr-xr-x[-rw-r--r--]libre/ttf-thai-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/ttf-thai-libre/ttf.install0
-rwxr-xr-x[-rw-r--r--]libre/unarchiver/PKGBUILD10
-rwxr-xr-x[-rw-r--r--]libre/unarchiver/libz.patch0
-rwxr-xr-x[-rw-r--r--]libre/unarchiver/native_obj_exceptions.patch0
-rwxr-xr-x[-rw-r--r--]libre/unrar-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/ununrar/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/unzip-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/unzip-libre/SRCBUILD0
-rwxr-xr-x[-rw-r--r--]libre/unzip-libre/match.patch0
-rwxr-xr-xlibre/vhba-module-libre/60-vhba.rules13
-rwxr-xr-xlibre/vhba-module-libre/PKGBUILD49
-rwxr-xr-xlibre/vhba-module-libre/vhba-module.install21
-rw-r--r--libre/virtualbox-libre-modules-lts/PKGBUILD71
-rwxr-xr-xlibre/virtualbox-libre-modules-lts/build.sh18
-rw-r--r--libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install (renamed from libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install)6
-rw-r--r--libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install (renamed from libre/virtualbox-modules-lts/virtualbox-modules-lts.install)8
-rwxr-xr-xlibre/virtualbox-libre-modules/.directory3
-rwxr-xr-xlibre/virtualbox-libre-modules/PKGBUILD71
-rwxr-xr-xlibre/virtualbox-libre-modules/build.sh18
-rwxr-xr-xlibre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install17
-rwxr-xr-xlibre/virtualbox-libre-modules/virtualbox-libre-host-modules.install19
-rw-r--r--libre/virtualbox-libre/001-vboxdrv-reference.patch112
-rwxr-xr-x[-rw-r--r--]libre/virtualbox-libre/002-change_default_driver_dir.patch (renamed from libre/virtualbox-libre/change_default_driver_dir.patch)0
-rwxr-xr-x[-rw-r--r--]libre/virtualbox-libre/10-vboxdrv.rules0
-rw-r--r--libre/virtualbox-libre/60-vboxguest.rules (renamed from libre/virtualbox-modules-lts/60-vboxguest.rules)0
-rwxr-xr-x[-rw-r--r--]libre/virtualbox-libre/LocalConfig.kmk1
-rwxr-xr-x[-rw-r--r--]libre/virtualbox-libre/PKGBUILD326
-rw-r--r--libre/virtualbox-libre/free-distros.patch998
-rw-r--r--libre/virtualbox-libre/gsoap.patch11
-rwxr-xr-xlibre/virtualbox-libre/libre.patch860
-rwxr-xr-xlibre/virtualbox-libre/os_blag.pngbin0 -> 1411 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_blag_64.pngbin0 -> 1549 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_dragora.pngbin0 -> 2375 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_dragora_64.pngbin0 -> 2430 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_dynebolic.pngbin0 -> 1621 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_gnewsense.pngbin0 -> 2315 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_gnewsense_64.pngbin0 -> 2470 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_gnu.pngbin0 -> 2728 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_gnu_64.pngbin0 -> 2705 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_gnuhurd.pngbin0 -> 2728 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_gnulinux.pngbin0 -> 2728 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_gnulinux_64.pngbin0 -> 2705 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_musix.pngbin0 -> 2451 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_musix_64.pngbin0 -> 2581 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_os64base.pngbin0 -> 1300 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_os64base.xcfbin0 -> 2844 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_osbase.pngbin0 -> 1042 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_osbase.xcfbin0 -> 2748 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_parabola.pngbin0 -> 1931 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_parabola_64.pngbin0 -> 2096 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_trisquel.pngbin0 -> 2451 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_trisquel_64.pngbin0 -> 2592 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_ututo.pngbin0 -> 2615 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_ututo_64.pngbin0 -> 2751 bytes
-rwxr-xr-xlibre/virtualbox-libre/os_venenux.pngbin0 -> 1653 bytes
-rw-r--r--libre/virtualbox-libre/vboxbuild85
-rw-r--r--libre/virtualbox-libre/vboxdrv-reference.patch57
-rwxr-xr-x[-rw-r--r--]libre/virtualbox-libre/vboxservice.conf (renamed from libre/virtualbox-libre/vbox-service.conf)0
-rwxr-xr-x[-rw-r--r--]libre/virtualbox-libre/vboxservice.rc (renamed from libre/virtualbox-libre/vbox-service.rc)16
-rwxr-xr-xlibre/virtualbox-libre/vboxservice.service9
-rwxr-xr-x[-rw-r--r--]libre/virtualbox-libre/vboxweb.conf12
-rwxr-xr-x[-rw-r--r--]libre/virtualbox-libre/vboxweb.rc0
-rwxr-xr-xlibre/virtualbox-libre/vboxweb.service11
-rwxr-xr-xlibre/virtualbox-libre/virtualbox-libre-guest-source.install30
-rwxr-xr-xlibre/virtualbox-libre/virtualbox-libre-guest-utils.install31
-rwxr-xr-xlibre/virtualbox-libre/virtualbox-libre-host-source.install30
-rwxr-xr-xlibre/virtualbox-libre/virtualbox-libre.install45
-rw-r--r--libre/virtualbox-libre/virtualbox-source.install12
-rw-r--r--libre/virtualbox-libre/virtualbox.install34
-rw-r--r--libre/virtualbox-modules-lts/LocalConfig.kmk19
-rw-r--r--libre/virtualbox-modules-lts/PKGBUILD101
-rw-r--r--libre/virtualbox-modules/.directory2
-rw-r--r--libre/virtualbox-modules/60-vboxguest.rules2
-rw-r--r--libre/virtualbox-modules/LocalConfig.kmk19
-rw-r--r--libre/virtualbox-modules/PKGBUILD104
-rw-r--r--libre/virtualbox-modules/linux34.patch12
-rw-r--r--libre/virtualbox-modules/virtualbox-modules.install19
-rw-r--r--libre/virtualbox-modules/virtualbox-parabola-modules.install17
-rwxr-xr-x[-rw-r--r--]libre/xarchiver-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/xarchiver-libre/rePKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch0
-rwxr-xr-x[-rw-r--r--]libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch0
-rwxr-xr-x[-rw-r--r--]libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch0
-rwxr-xr-x[-rw-r--r--]libre/xarchiver-libre/xarchiver.install0
-rwxr-xr-x[-rw-r--r--]libre/xchat-libre/ChangeLog0
-rwxr-xr-x[-rw-r--r--]libre/xchat-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/xchat-libre/no-firefox.patch0
-rwxr-xr-x[-rw-r--r--]libre/xchat-libre/remove-non-free-suggestion.patch0
-rwxr-xr-x[-rw-r--r--]libre/xchat-libre/xchat-2.8.8-glib-2.31.patch0
-rwxr-xr-x[-rw-r--r--]libre/xchat-libre/xchat-2.8.8-libnotify07.patch0
-rwxr-xr-x[-rw-r--r--]libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch0
-rwxr-xr-x[-rw-r--r--]libre/xchat-libre/xchat.install0
-rwxr-xr-x[-rw-r--r--]libre/xmlstarlet/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/xorg-fonts-100dpi-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/xorg-fonts-100dpi-libre/xfonts.install0
-rwxr-xr-x[-rw-r--r--]libre/xorg-fonts-75dpi-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/xorg-fonts-75dpi-libre/xfonts.install0
-rwxr-xr-x[-rw-r--r--]libre/xorg-fonts-type1-libre/PKGBUILD0
-rwxr-xr-x[-rw-r--r--]libre/xorg-fonts-type1-libre/xfonts.install0
-rwxr-xr-xlibre/xscreensaver-libre/LICENSE9
-rwxr-xr-xlibre/xscreensaver-libre/PKGBUILD47
-rwxr-xr-xlibre/xscreensaver-libre/add-electricsheep.diff12
-rwxr-xr-xlibre/xscreensaver-libre/libre.patch112
-rwxr-xr-xlibre/xscreensaver-libre/xscreensaver.pam1
-rwxr-xr-xlibre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch281
-rwxr-xr-x[-rw-r--r--]libre/xulrunner-libre/PKGBUILD66
-rw-r--r--libre/xulrunner-libre/gcc47.patch77
-rwxr-xr-x[-rw-r--r--]libre/xulrunner-libre/mozconfig0
-rwxr-xr-x[-rw-r--r--]libre/xulrunner-libre/mozilla-pkgconfig.patch0
-rwxr-xr-x[-rw-r--r--]libre/your-freedom/PKGBUILD5
-rwxr-xr-x[-rw-r--r--]libre/your-freedom/your-freedom.install2
659 files changed, 18792 insertions, 28552 deletions
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 4286d258a..4286d258a 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 829871791..829871791 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/libre/aif-libre/PKGBUILD
+++ b/libre/aif-libre/PKGBUILD
diff --git a/libre/apache-ant-libre/PKGBUILD b/libre/apache-ant-libre/PKGBUILD
deleted file mode 100644
index 9f5ef223b..000000000
--- a/libre/apache-ant-libre/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
-# Contributor: Andrew Wright <andreww@photism.org>
-
-_pkgname=apache-ant
-pkgname=apache-ant-libre
-pkgver=1.8.2
-
-provides=("$_pkgname=$pkgver")
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
-
-pkgrel=3
-pkgdesc="A java-based build tool"
-arch=('any')
-license=('APACHE')
-url="http://ant.apache.org/"
-depends=('java-environment')
-makedepends=('junit')
-optdepends=('junit: to have JUnit on the classpath in javac tasks')
-source=(http://archive.apache.org/dist/ant/source/${_pkgname}-${pkgver}-src.tar.bz2
- ${_pkgname}.sh ${_pkgname}.csh
- ant_diagnostics.patch)
-
-build() {
- # This directory is what becomes
- # http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
- # which is what Arch uses
- rm -rf "${srcdir}"/${_pkgname}-${pkgver}-bin
- mkdir -p "${srcdir}"/${_pkgname}-${pkgver}-bin
-
- cd "${srcdir}"/${_pkgname}-${pkgver}
- ln -sf /usr/share/java/junit.jar lib/optional # JUnit isn't really optional
- sh build.sh -Ddist.dir="${srcdir}"/${_pkgname}-${pkgver}-bin dist
-}
-
-package() {
- # install profile.d script
- install -dm755 "${pkgdir}"/etc/profile.d
- install -m755 "${srcdir}"/${_pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
-
- # Get the ANT_HOME env var
- source "${srcdir}"/${_pkgname}.sh
-
- cd "${srcdir}"/${_pkgname}-${pkgver}-bin
- install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib}
-
- install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib
- cp -Rp ./etc "${pkgdir}"/${ANT_HOME}
-
- # Do not copy Windows .bat/.cmd files
- find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
- -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \;
-
- # symlink to junit so it's on the javac build path for ant
- # matches behavior on ubuntu 9 and makes sense for compatibility
- # http://bugs.archlinux.org/task/15229
- ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/
-
- # fix python2 path
- sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py
-
- # The license says the NOTICE file should be redistributed for derivative
- # works, so lets supply it.
- cd "${srcdir}"/${_pkgname}-${pkgver}
- install -dm755 "${pkgdir}"/usr/share/licenses/${_pkgname}
- install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${_pkgname}
-}
-
-md5sums=('0d9e108afcd15b820150b8085c96d2b1'
- '593ee6ebd9b8ec321534a028e686880f'
- '475b684eb8202c09cbb51496cd8ee1e0'
- 'cbaab423be40a6e63f0fde901b91eb50')
diff --git a/libre/apache-ant-libre/ant_diagnostics.patch b/libre/apache-ant-libre/ant_diagnostics.patch
deleted file mode 100644
index 38148b45c..000000000
--- a/libre/apache-ant-libre/ant_diagnostics.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/main/org/apache/tools/ant/Diagnostics.java
-+++ b/src/main/org/apache/tools/ant/Diagnostics.java
-@@ -179,7 +179,10 @@
- * @param clazz the class to get the information from.
- * @since Ant 1.8.0
- */
-- private static URL getClassLocation(Class clazz) {
-+ private static URL getClassLocation(Class clazz) {
-+ if (clazz.getProtectionDomain().getCodeSource() == null) {
-+ return null;
-+ }
- return clazz.getProtectionDomain().getCodeSource().getLocation();
- }
-
-@@ -241,7 +244,7 @@
- }
- Transformer transformer = null;
- try {
-- transformer = transformerFactory.newTransformer();
-+ transformer = transformerFactory.newTransformer();
- } catch (Exception e) {
- // ignore
- ignoreThrowable(e);
diff --git a/libre/apache-ant-libre/apache-ant.csh b/libre/apache-ant-libre/apache-ant.csh
deleted file mode 100644
index b6a6d5840..000000000
--- a/libre/apache-ant-libre/apache-ant.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-setenv ANT_HOME /usr/share/java/apache-ant
-setenv PATH ${PATH}:${ANT_HOME}/bin
diff --git a/libre/apache-ant-libre/apache-ant.sh b/libre/apache-ant-libre/apache-ant.sh
deleted file mode 100644
index ab602fb28..000000000
--- a/libre/apache-ant-libre/apache-ant.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export ANT_HOME=/usr/share/java/apache-ant
-export PATH=$PATH:$ANT_HOME/bin
-
diff --git a/libre/aspell-pl-libre/PKGBUILD b/libre/aspell-pl-libre/PKGBUILD
index 6da90e449..6da90e449 100644..100755
--- a/libre/aspell-pl-libre/PKGBUILD
+++ b/libre/aspell-pl-libre/PKGBUILD
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index 7ec4d7c1e..ea1dfec52 100644..100755
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -3,12 +3,12 @@
# Contributor: leif_thande <leif.thande@gmail.com>
# Contributor: tranquility <trankas@gmail.com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=atool
pkgname=atool-libre
-pkgver=0.38.0
-pkgrel=3
+pkgver=0.39.0
+pkgrel=1
pkgdesc="A script for managing file archives of various types"
arch=('any')
url="http://www.nongnu.org/atool/"
@@ -29,7 +29,7 @@ optdepends=('bzip2: for using atool with bzip2 compressed archives'
'unzip: for using atool for unpacking archives')
source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz)
-sha256sums=('b967195facbe5e7c6535ac117aaa7f633b0eca174137c30c36a5200efb80047d')
+sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b')
build() {
diff --git a/libre/atool-libre/ChangeLog b/libre/atool-libre/atool.changelog
index aec63e70f..ce0b12c2b 100644..100755
--- a/libre/atool-libre/ChangeLog
+++ b/libre/atool-libre/atool.changelog
@@ -1,3 +1,13 @@
+2012-04-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * atool 0.39.0-1
+
+2012-02-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * atool 0.38.0-2
+ * signing package
+
+2011-08-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * Updated to major version 0.38.0
+
2009-08-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* Updated to major version 0.37.0
@@ -6,4 +16,3 @@
2008-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* Moved to [community] repo
-
diff --git a/libre/atool-libre/rePKGBUILD b/libre/atool-libre/rePKGBUILD
index e684320d0..e684320d0 100644..100755
--- 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 f5962063a..1644c5576 100644..100755
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id$
-# Arch Contributor: Alexander Fehr <pizzapunk gmail com>
-# Arch Contributor: William Rea <sillywilly@gmail.com>
-# Arch maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Parabola maintainer: Brendan Tildesley
-# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy>
+# $Id: PKGBUILD 166974 2012-09-23 22:57:12Z bisson $
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer (Parabola): Brendan Tildesley
+# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com>
_pkgname=audacious-plugins
pkgname=audacious-plugins-libre
-pkgver=3.2.3
+pkgver=3.3.2
pkgrel=1
pkgdesc='Plugins for Audacious without unfree plugins'
url='http://audacious-media-player.org/'
+license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
arch=('i686' 'x86_64')
-license=('GPL' 'GPL3' 'LGPL' 'custom')
# Licensing issues:
# The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice
@@ -60,7 +60,8 @@ optdepends=('oss: Open Sound System v4 output'
'libcue: CUE playlist format')
source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('87a795c4ecf645ad36ffe7bb3a7b5691e0316f71')
+sha1sums=('869d3820263ff35609bfc6f2e69885a00d660513')
+
build() {
# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure
@@ -105,9 +106,9 @@ build() {
popd
./configure \
- --prefix=/usr \
- --enable-amidiplug \
- --disable-adplug \
+ --prefix=/usr \
+ --enable-amidiplug \
+ --disable-adplug \
make
}
@@ -115,4 +116,5 @@ build() {
package() {
cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/libre/audacity-libre/.directory b/libre/audacity-libre/.directory
index a65007814..a65007814 100644..100755
--- a/libre/audacity-libre/.directory
+++ b/libre/audacity-libre/.directory
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
index 6d6f287b3..6d6f287b3 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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
new file mode 100755
index 000000000..396706459
--- /dev/null
+++ b/libre/blender-libre/PKGBUILD
@@ -0,0 +1,183 @@
+# $Id$
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+spacenav=false
+pkgbase=blender-libre
+pkgflag=-libre
+if [ $spacenav == true ]; then
+ pkgname=(
+ blender-spacenav-libre
+ )
+ spndesc=' (with spacenav support)'
+else
+ pkgname=(
+ blender-libre
+ )
+ spndesc=''
+fi
+pkgdesc="A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
+pkgver=2.64a
+pkgrel=3
+pkgaev=5
+arch=(
+ i686
+ x86_64
+ mips64el
+)
+license=(
+ GPL
+)
+url="http://www.${pkgbase%$pkgflag}.org"
+depends=(
+ # used by ldd software "glibc package software"
+ # dependencies tree of binaries software (root) #
+ ffmpeg
+ fftw
+ freetype2
+ jack
+ libpng
+ libtiff
+ openal
+ openimageio
+ opencolorio
+ # external softwares dependencies #
+ opencollada
+ # softwares dependencies for desktop files and mime types #
+ desktop-file-utils
+ hicolor-icon-theme
+ shared-mime-info
+ xdg-utils
+ # dependencies tree of binaries software (child) #
+ #alsa-lib
+ #boost-libs
+ #bzip2
+ #celt
+ #dbus-core
+ #flac
+ #gcc-libs
+ #glew
+ #glibc
+ #glu
+ #gsm
+ #icu
+ #ilmbase
+ #json-c
+ #lame
+ #libasyncns
+ #libdrm
+ #libgl
+ #libglapi
+ #libice
+ #libjpeg-turbo
+ #libogg
+ #libpulse
+ #libsndfile
+ #libsm
+ #libtheora
+ #libva
+ #libvorbis
+ #libvpx
+ #libx11
+ #libxau
+ #libxcb
+ #libxdamage
+ #libxdmcp
+ #libxext
+ #libxfixes
+ #libxi
+ #libxml2
+ #libxmu
+ #libxt
+ #libxxf86vm
+ #ocr
+ #openexr
+ #opencore-amr
+ #openjpeg
+ #openssl
+ #pcre
+ #python
+ #rtmpdump
+ #sdl-libre
+ #schroedinger
+ #speex
+ #util-linux
+ #x264
+ #xvidcore
+ #xz
+ #v4l-utils
+ #zlib
+)
+if [ $spacenav == true ]; then
+ depends+=(
+ # dependencies tree of binaries software (root) #
+ libspnav
+ )
+fi
+optdepends=(
+ 'bullet: for Physics Simulation in BGE'
+)
+makedepends=(
+ # make dependencies tree (root) #
+ boost
+ cmake
+ mesa
+ subversion
+)
+provides=(
+ ${pkgbase%$pkgflag}=$pkgaev:$pkgver
+)
+conflicts=(
+ ${pkgbase%$pkgflag}
+)
+replaces=(
+ ${pkgbase%$pkgflag}
+)
+install=$pkgbase.install
+source=(
+ "http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz"
+)
+sha512sums=(
+ 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5
+)
+
+build() {
+ cd $srcdir/${pkgbase%$pkgflag}-$pkgver
+
+ mkdir build
+ cd build
+
+ [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
+
+ 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 \
+ -DWITH_SYSTEM_GLEW=ON
+
+ make $MAKEFLAGS
+
+ make
+}
+
+package() {
+ cd $srcdir/${pkgbase%$pkgflag}-$pkgver/build
+ make DESTDIR=$pkgdir install
+ python -m compileall $pkgdir/usr/share/${pkgbase%$pkgflag}
+}
diff --git a/libre/blender-libre/blender-libre.install b/libre/blender-libre/blender-libre.install
new file mode 100755
index 000000000..724bfce00
--- /dev/null
+++ b/libre/blender-libre/blender-libre.install
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/blender-libre/blender.install b/libre/blender-libre/blender.install
new file mode 100755
index 000000000..724bfce00
--- /dev/null
+++ b/libre/blender-libre/blender.install
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch
new file mode 100755
index 000000000..fa698a3a6
--- /dev/null
+++ b/libre/blender-libre/boost-1.50.patch
@@ -0,0 +1,42 @@
+diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp
+--- a/intern/cycles/util/util_cache.cpp 2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_cache.cpp 2012-07-15 14:19:34.893238929 -0300
+@@ -26,8 +26,6 @@
+ #include "util_path.h"
+ #include "util_types.h"
+
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include <boost/filesystem.hpp>
+ #include <boost/algorithm/string.hpp>
+
+@@ -117,7 +115,7 @@
+ boost::filesystem::directory_iterator it(dir), it_end;
+
+ for(; it != it_end; it++) {
+- string filename = it->path().filename();
++ string filename = it->path().filename().string();
+
+ if(boost::starts_with(filename, name))
+ if(except.find(filename) == except.end())
+diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp
+--- a/intern/cycles/util/util_path.cpp 2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_path.cpp 2012-07-15 14:19:14.126293394 -0300
+@@ -26,8 +26,6 @@
+
+ #include <stdio.h>
+
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include <boost/filesystem.hpp>
+ #include <boost/algorithm/string.hpp>
+
+@@ -60,7 +58,7 @@
+
+ string path_filename(const string& path)
+ {
+- return boost::filesystem::path(path).filename();
++ return boost::filesystem::path(path).filename().string();
+ }
+
+ string path_dirname(const string& path)
diff --git a/libre/blender-libre/ffmpeg-0.11.patch b/libre/blender-libre/ffmpeg-0.11.patch
new file mode 100755
index 000000000..45144140c
--- /dev/null
+++ b/libre/blender-libre/ffmpeg-0.11.patch
@@ -0,0 +1,434 @@
+diff -Naur blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+--- blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2012-05-10 11:45:40.000000000 -0300
++++ blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2012-07-10 18:12:55.727129720 -0300
+@@ -143,23 +143,23 @@
+
+ switch(m_codecCtx->sample_fmt)
+ {
+- case SAMPLE_FMT_U8:
++ case AV_SAMPLE_FMT_U8:
+ m_convert = AUD_convert_u8_float;
+ m_specs.format = AUD_FORMAT_U8;
+ break;
+- case SAMPLE_FMT_S16:
++ case AV_SAMPLE_FMT_S16:
+ m_convert = AUD_convert_s16_float;
+ m_specs.format = AUD_FORMAT_S16;
+ break;
+- case SAMPLE_FMT_S32:
++ case AV_SAMPLE_FMT_S32:
+ m_convert = AUD_convert_s32_float;
+ m_specs.format = AUD_FORMAT_S32;
+ break;
+- case SAMPLE_FMT_FLT:
++ case AV_SAMPLE_FMT_FLT:
+ m_convert = AUD_convert_copy<float>;
+ m_specs.format = AUD_FORMAT_FLOAT32;
+ break;
+- case SAMPLE_FMT_DBL:
++ case AV_SAMPLE_FMT_DBL:
+ m_convert = AUD_convert_double_float;
+ m_specs.format = AUD_FORMAT_FLOAT64;
+ break;
+@@ -189,7 +189,7 @@
+ }
+ catch(AUD_Exception&)
+ {
+- av_close_input_file(m_formatCtx);
++ avformat_close_input(&m_formatCtx);
+ throw;
+ }
+ }
+@@ -227,7 +227,7 @@
+ }
+ catch(AUD_Exception&)
+ {
+- av_close_input_stream(m_formatCtx);
++ avformat_close_input(&m_formatCtx);
+ av_free(m_aviocontext);
+ throw;
+ }
+@@ -239,7 +239,7 @@
+
+ if(m_aviocontext)
+ {
+- av_close_input_stream(m_formatCtx);
++ avformat_close_input(&m_formatCtx);
+ av_free(m_aviocontext);
+ }
+ else
+diff -Naur blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
+--- blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2012-05-10 11:45:40.000000000 -0300
++++ blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2012-07-10 18:14:55.893790273 -0300
+@@ -133,23 +133,23 @@
+ {
+ case AUD_FORMAT_U8:
+ m_convert = AUD_convert_float_u8;
+- m_codecCtx->sample_fmt = SAMPLE_FMT_U8;
++ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_U8;
+ break;
+ case AUD_FORMAT_S16:
+ m_convert = AUD_convert_float_s16;
+- m_codecCtx->sample_fmt = SAMPLE_FMT_S16;
++ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S16;
+ break;
+ case AUD_FORMAT_S32:
+ m_convert = AUD_convert_float_s32;
+- m_codecCtx->sample_fmt = SAMPLE_FMT_S32;
++ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S32;
+ break;
+ case AUD_FORMAT_FLOAT32:
+ m_convert = AUD_convert_copy<float>;
+- m_codecCtx->sample_fmt = SAMPLE_FMT_FLT;
++ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_FLT;
+ break;
+ case AUD_FORMAT_FLOAT64:
+ m_convert = AUD_convert_float_double;
+- m_codecCtx->sample_fmt = SAMPLE_FMT_DBL;
++ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_DBL;
+ break;
+ default:
+ AUD_THROW(AUD_ERROR_FFMPEG, format_error);
+diff -Naur blender-2.63a.orig/intern/ffmpeg/ffmpeg_compat.h blender-2.63a/intern/ffmpeg/ffmpeg_compat.h
+--- blender-2.63a.orig/intern/ffmpeg/ffmpeg_compat.h 2012-05-10 11:46:17.000000000 -0300
++++ blender-2.63a/intern/ffmpeg/ffmpeg_compat.h 2012-07-10 18:17:04.823783714 -0300
+@@ -76,6 +76,10 @@
+ #define FFMPEG_FFV1_ALPHA_SUPPORTED
+ #endif
+
++#if ((LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24)) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24) && (LIBAVFORMAT_VERSION_MICRO < 2)))
++#define avformat_close_input(x) av_close_input_file(*(x))
++#endif
++
+ #ifndef FFMPEG_HAVE_AVIO
+ #define AVIO_FLAG_WRITE URL_WRONLY
+ #define avio_open url_fopen
+diff -Naur blender-2.63a.orig/source/blender/blenkernel/intern/writeffmpeg.c blender-2.63a/source/blender/blenkernel/intern/writeffmpeg.c
+--- blender-2.63a.orig/source/blender/blenkernel/intern/writeffmpeg.c 2012-05-10 11:50:20.000000000 -0300
++++ blender-2.63a/source/blender/blenkernel/intern/writeffmpeg.c 2012-07-10 18:27:00.213753426 -0300
+@@ -36,6 +36,7 @@
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/rational.h>
++#include <libavutil/samplefmt.h>
+ #include <libswscale/swscale.h>
+ #include <libavcodec/opt.h>
+
+@@ -612,7 +613,7 @@
+
+ c->sample_rate = rd->ffcodecdata.audio_mixrate;
+ c->bit_rate = ffmpeg_audio_bitrate*1000;
+- c->sample_fmt = SAMPLE_FMT_S16;
++ c->sample_fmt = AV_SAMPLE_FMT_S16;
+ c->channels = rd->ffcodecdata.audio_channels;
+ codec = avcodec_find_encoder(c->codec_id);
+ if (!codec) {
+@@ -654,11 +655,21 @@
+ }
+ /* essential functions -- start, append, end */
+
++static void ffmpeg_dict_set_int(AVDictionary **dict, const char *key, int value)
++{
++ char buffer[32];
++
++ BLI_snprintf(buffer, sizeof(buffer), "%d", value);
++
++ av_dict_set(dict, key, buffer, 0);
++}
++
+ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, ReportList *reports)
+ {
+ /* Handle to the output file */
+ AVFormatContext* of;
+ AVOutputFormat* fmt;
++ AVDictionary *opts = NULL;
+ char name[256];
+ const char ** exts;
+
+@@ -704,13 +715,14 @@
+ of->oformat = fmt;
+ of->packet_size= rd->ffcodecdata.mux_packet_size;
+ if (ffmpeg_audio_codec != CODEC_ID_NONE) {
+- of->mux_rate = rd->ffcodecdata.mux_rate;
++ ffmpeg_dict_set_int(&opts, "muxrate", rd->ffcodecdata.mux_rate);
+ }
+ else {
+- of->mux_rate = 0;
++ av_dict_set(&opts, "muxrate", "0", 0);
+ }
+
+- of->preload = (int)(0.5*AV_TIME_BASE);
++ ffmpeg_dict_set_int(&opts, "preload", (int)(0.5*AV_TIME_BASE));
++
+ of->max_delay = (int)(0.7*AV_TIME_BASE);
+
+ fmt->audio_codec = ffmpeg_audio_codec;
+@@ -773,6 +785,7 @@
+ fmt->audio_codec = CODEC_ID_PCM_S16LE;
+ if (ffmpeg_audio_codec != CODEC_ID_NONE && rd->ffcodecdata.audio_mixrate != 48000 && rd->ffcodecdata.audio_channels != 2) {
+ BKE_report(reports, RPT_ERROR, "FFMPEG only supports 48khz / stereo audio for DV!");
++ av_dict_free(&opts);
+ return 0;
+ }
+ }
+@@ -782,6 +795,7 @@
+ printf("alloc video stream %p\n", video_stream);
+ if (!video_stream) {
+ BKE_report(reports, RPT_ERROR, "Error initializing video stream.");
++ av_dict_free(&opts);
+ return 0;
+ }
+ }
+@@ -790,27 +804,27 @@
+ audio_stream = alloc_audio_stream(rd, fmt->audio_codec, of);
+ if (!audio_stream) {
+ BKE_report(reports, RPT_ERROR, "Error initializing audio stream.");
++ av_dict_free(&opts);
+ return 0;
+ }
+ }
+- if (av_set_parameters(of, NULL) < 0) {
+- BKE_report(reports, RPT_ERROR, "Error setting output parameters.");
+- return 0;
+- }
+ if (!(fmt->flags & AVFMT_NOFILE)) {
+ if (avio_open(&of->pb, name, AVIO_FLAG_WRITE) < 0) {
+ BKE_report(reports, RPT_ERROR, "Could not open file for writing.");
++ av_dict_free(&opts);
+ return 0;
+ }
+ }
+
+- if (av_write_header(of) < 0) {
++ if (avformat_write_header(of, NULL) < 0) {
+ BKE_report(reports, RPT_ERROR, "Could not initialize streams. Probably unsupported codec combination.");
++ av_dict_free(&opts);
+ return 0;
+ }
+
+ outfile = of;
+ av_dump_format(of, 0, name, 1);
++ av_dict_free(&opts);
+
+ return 1;
+ }
+diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/anim_movie.c blender-2.63a/source/blender/imbuf/intern/anim_movie.c
+--- blender-2.63a.orig/source/blender/imbuf/intern/anim_movie.c 2012-05-10 11:50:59.000000000 -0300
++++ blender-2.63a/source/blender/imbuf/intern/anim_movie.c 2012-07-10 18:30:19.413743294 -0300
+@@ -436,7 +436,7 @@
+ int i, videoStream;
+
+ AVCodec *pCodec;
+- AVFormatContext *pFormatCtx;
++ AVFormatContext *pFormatCtx = NULL;
+ AVCodecContext *pCodecCtx;
+ int frs_num;
+ double frs_den;
+@@ -455,7 +455,7 @@
+
+ do_init_ffmpeg();
+
+- if (av_open_input_file(&pFormatCtx, anim->name, NULL, 0, NULL)!=0) {
++ if (avformat_open_input(&pFormatCtx, anim->name, NULL, NULL)!=0) {
+ return -1;
+ }
+
+@@ -990,7 +990,8 @@
+ ret = av_seek_frame(anim->pFormatCtx,
+ -1,
+ pos, AVSEEK_FLAG_BYTE);
+- av_update_cur_dts(anim->pFormatCtx, v_st, dts);
++ // XXX: need double verification
++ // av_update_cur_dts(anim->pFormatCtx, v_st, dts);
+ }
+ else {
+ av_log(anim->pFormatCtx, AV_LOG_DEBUG,
+diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/indexer.c blender-2.63a/source/blender/imbuf/intern/indexer.c
+--- blender-2.63a.orig/source/blender/imbuf/intern/indexer.c 2012-05-10 11:50:59.000000000 -0300
++++ blender-2.63a/source/blender/imbuf/intern/indexer.c 2012-07-10 18:38:25.737051891 -0300
+@@ -533,13 +533,6 @@
+ rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ }
+
+- if (av_set_parameters(rv->of, NULL) < 0) {
+- fprintf(stderr, "Couldn't set output parameters? "
+- "Proxy not built!\n");
+- av_free(rv->of);
+- return 0;
+- }
+-
+ if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) {
+ fprintf(stderr, "Couldn't open outputfile! "
+ "Proxy not built!\n");
+@@ -576,7 +569,12 @@
+ NULL, NULL, NULL);
+ }
+
+- av_write_header(rv->of);
++ if (avformat_write_header(rv->of, NULL) < 0) {
++ fprintf(stderr, "Couldn't set output parameters? "
++ "Proxy not built!\n");
++ av_free(rv->of);
++ return 0;
++ }
+
+ return rv;
+ }
+@@ -739,7 +737,7 @@
+ memset(context->proxy_ctx, 0, sizeof(context->proxy_ctx));
+ memset(context->indexer, 0, sizeof(context->indexer));
+
+- if (av_open_input_file(&context->iFormatCtx, anim->name, NULL, 0, NULL) != 0) {
++ if (avformat_open_input(&context->iFormatCtx, anim->name, NULL, NULL) != 0) {
+ MEM_freeN(context);
+ return NULL;
+ }
+diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/util.c blender-2.63a/source/blender/imbuf/intern/util.c
+--- blender-2.63a.orig/source/blender/imbuf/intern/util.c 2012-05-10 11:50:59.000000000 -0300
++++ blender-2.63a/source/blender/imbuf/intern/util.c 2012-07-10 18:40:49.950377886 -0300
+@@ -243,7 +243,7 @@
+
+ static int isffmpeg (const char *filename)
+ {
+- AVFormatContext *pFormatCtx;
++ AVFormatContext *pFormatCtx = NULL;
+ unsigned int i;
+ int videoStream;
+ AVCodec *pCodec;
+@@ -261,7 +261,7 @@
+ BLI_testextensie(filename, ".cin") ||
+ BLI_testextensie(filename, ".wav")) return 0;
+
+- if (av_open_input_file(&pFormatCtx, filename, NULL, 0, NULL)!=0) {
++ if (avformat_open_input(&pFormatCtx, filename, NULL, NULL)!=0) {
+ if (UTIL_DEBUG) fprintf(stderr, "isffmpeg: av_open_input_file failed\n");
+ return 0;
+ }
+diff -Naur blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.cpp blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.cpp
+--- blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2012-05-10 11:48:50.000000000 -0300
++++ blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2012-07-10 18:56:03.696998071 -0300
+@@ -162,14 +162,14 @@
+ }
+
+
+-int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams)
++int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary **formatParams)
+ {
+- AVFormatContext *formatCtx;
++ AVFormatContext *formatCtx = NULL;
+ int i, videoStream;
+ AVCodec *codec;
+ AVCodecContext *codecCtx;
+
+- if (av_open_input_file(&formatCtx, filename, inputFormat, 0, formatParams)!=0)
++ if (avformat_open_input(&formatCtx, filename, inputFormat, formatParams)!=0)
+ return -1;
+
+ if (av_find_stream_info(formatCtx)<0)
+@@ -545,11 +545,7 @@
+ // but it is really not desirable to seek on http file, so force streaming.
+ // It would be good to find this information from the context but there are no simple indication
+ !strncmp(filename, "http://", 7) ||
+-#ifdef FFMPEG_PB_IS_POINTER
+- (m_formatCtx->pb && m_formatCtx->pb->is_streamed)
+-#else
+- m_formatCtx->pb.is_streamed
+-#endif
++ (m_formatCtx->pb && !m_formatCtx->pb->seekable)
+ )
+ {
+ // the file is in fact a streaming source, treat as cam to prevent seeking
+@@ -586,13 +582,11 @@
+ {
+ // open camera source
+ AVInputFormat *inputFormat;
+- AVFormatParameters formatParams;
+- AVRational frameRate;
++ AVDictionary *formatParams = NULL;
+ char *p, filename[28], rateStr[20];
+
+ do_init_ffmpeg();
+
+- memset(&formatParams, 0, sizeof(formatParams));
+ #ifdef WIN32
+ // video capture on windows only through Video For Windows driver
+ inputFormat = av_find_input_format("vfwcap");
+@@ -622,7 +616,13 @@
+ sprintf(filename, "/dev/dv1394/%d", camIdx);
+ } else
+ {
+- inputFormat = av_find_input_format("video4linux");
++ const char *formats[] = {"video4linux2,v4l2", "video4linux2", "video4linux"};
++ int i, formatsCount = sizeof(formats) / sizeof(char*);
++ for (i = 0; i < formatsCount; i++) {
++ inputFormat = av_find_input_format(formats[i]);
++ if (inputFormat)
++ break;
++ }
+ sprintf(filename, "/dev/video%d", camIdx);
+ }
+ if (!inputFormat)
+@@ -636,20 +636,22 @@
+ if ((p = strchr(filename, ':')) != 0)
+ *p = 0;
+ }
+- if (file && (p = strchr(file, ':')) != NULL)
+- formatParams.standard = p+1;
++ if (file && (p = strchr(file, ':')) != NULL) {
++ av_dict_set(&formatParams, "standard", p+1, 0);
++ }
+ #endif
+ //frame rate
+ if (m_captRate <= 0.f)
+ m_captRate = defFrameRate;
+ sprintf(rateStr, "%f", m_captRate);
+- av_parse_video_rate(&frameRate, rateStr);
+- // populate format parameters
+- // need to specify the time base = inverse of rate
+- formatParams.time_base.num = frameRate.den;
+- formatParams.time_base.den = frameRate.num;
+- formatParams.width = m_captWidth;
+- formatParams.height = m_captHeight;
++
++ av_dict_set(&formatParams, "framerate", rateStr, 0);
++
++ if (m_captWidth > 0 && m_captHeight > 0) {
++ char video_size[64];
++ BLI_snprintf(video_size, sizeof(video_size), "%dx%d", m_captWidth, m_captHeight);
++ av_dict_set(&formatParams, "video_size", video_size, 0);
++ }
+
+ if (openStream(filename, inputFormat, &formatParams) != 0)
+ return;
+@@ -664,6 +666,8 @@
+ // no need to thread if the system has a single core
+ m_isThreaded = true;
+ }
++
++ av_dict_free(&formatParams);
+ }
+
+ // play video
+diff -Naur blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.h blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.h
+--- blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.h 2012-05-10 11:48:50.000000000 -0300
++++ blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.h 2012-07-10 18:57:21.710327435 -0300
+@@ -46,10 +46,6 @@
+ # define FFMPEG_CODEC_IS_POINTER 1
+ #endif
+
+-#if LIBAVFORMAT_VERSION_INT >= (52 << 16)
+-# define FFMPEG_PB_IS_POINTER 1
+-#endif
+-
+ #ifdef FFMPEG_CODEC_IS_POINTER
+ static inline AVCodecContext* get_codec_from_stream(AVStream* stream)
+ {
+@@ -172,7 +168,7 @@
+ double actFrameRate (void) { return m_frameRate * m_baseFrameRate; }
+
+ /// common function to video file and capture
+- int openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams);
++ int openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary **formatParams);
+
+ /// check if a frame is available and load it in pFrame, return true if a frame could be retrieved
+ AVFrame* grabFrame(long frame);
diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD
index c5718a9fd..c5718a9fd 100644..100755
--- a/libre/bogofilter-libre/PKGBUILD
+++ b/libre/bogofilter-libre/PKGBUILD
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
new file mode 100644
index 000000000..e39dfc88a
--- /dev/null
+++ b/libre/cdfs-libre/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_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)
+url="http://www.elis.UGent.be/~ronsse/cdfs/"
+license=('GPL')
+makedepends=('linux-libre-headers')
+replaces=('cdfs')
+conflicts=('cdfs')
+provides=("cdfs=${pkgver}")
+install=cdfs.install
+source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$_pkgname-$pkgver.tar.bz2"
+ "cdfs-3.0.patch"
+ "cdfs-3.2.patch"
+ "cdfs-3.4.patch")
+md5sums=('ac64c014a90e3c488394832ea29605b3'
+ 'aba7da94a9dcbb8a93ea423cb6958fef'
+ 'e934407b3460257a301822ffc4ab3933'
+ '9215e7bdac728bd2f889fb525e543454')
+
+build() {
+ _kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -`
+ depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`")
+ _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version`
+
+ cd $srcdir/$_pkgname-$pkgver
+ patch -p1 <$srcdir/cdfs-3.0.patch
+ patch -p1 <$srcdir/cdfs-3.2.patch
+ patch -p1 <$srcdir/cdfs-3.4.patch
+ make KDIR=/usr/lib/modules/${_kernverfull}/build
+ install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko
+ sed -i "s|extramodules-.*-LIBRE|extramodules-3.${_kernver}-LIBRE|" $startdir/cdfs.install
+}
diff --git a/libre/cdfs-libre/cdfs-3.0.patch b/libre/cdfs-libre/cdfs-3.0.patch
new file mode 100644
index 000000000..20194b848
--- /dev/null
+++ b/libre/cdfs-libre/cdfs-3.0.patch
@@ -0,0 +1,274 @@
+diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
+--- cdfs-2.6.27/cddata.c 2009-12-21 17:04:03.000000000 +0300
++++ cdfs-2.6.27.my/cddata.c 2011-07-24 21:18:44.000000000 +0400
+@@ -83,7 +83,7 @@
+ #else
+ .mmap = generic_file_readonly_mmap,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
+- .sendfile = generic_file_sendfile
++// .sendfile = generic_file_sendfile
+ #else
+ .splice_read = generic_file_splice_read
+ #endif
+diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
+--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300
++++ cdfs-2.6.27.my/root.c 2011-07-25 13:16:59.000000000 +0400
+@@ -32,19 +30,14 @@
+ * Added code to transform /proc/cdfs into a sequential synthetic file. *
+ *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+
+-
+ #include <linux/seq_file.h>
+-
+-#ifndef OLD_KERNEL
+ #include <linux/statfs.h>
+-#endif
++#include <linux/sched.h>
+
+ extern struct seq_operations cdfs_operations;
+ extern struct _track_info *dummy_track_p;
+
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ struct inode *cdfs_iget(struct super_block *sp, unsigned long ino);
+-#endif
+ /*============================================================================*
+ * cdfs_open() *
+ * Description: *
+@@ -115,15 +108,8 @@
+
+ /********************************************************************/
+
+-#ifdef OLD_KERNEL
+-static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
+- kdev_t dev = sb->s_dev;
+- int i, j, t;
+- struct cdrom_tochdr hdr;
+-#else
+ static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
+ int i, t;
+-#endif
+ struct cdrom_tocentry entry;
+ int no_audio=0, no_data=0;
+ cd * this_cd;
+@@ -131,24 +117,13 @@
+
+ PRINT("cdfs_mount\n");
+
+-#ifdef OLD_KERNEL
+- MOD_INC_USE_COUNT;
+-
+- set_blocksize(dev, CD_FRAMESIZE); // voor bread met ide-cd
+-#else
+ sb_set_blocksize(sb, CD_FRAMESIZE); // voor bread met ide-cd
+-#endif
+
+ sb->s_blocksize = CD_FRAMESIZE;
+ sb->s_blocksize_bits = 11;
+
+ if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ return -ENOMEM;
+-#endif
+ }
+
+ this_cd->mode = MODE;
+@@ -160,13 +135,8 @@
+
+ // Initialize cache for maximum sector size
+ if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ kfree(cdfs_info(sb));
+ return -ENOMEM;
+-#endif
+ }
+
+ // Cache is still invalid
+@@ -183,23 +153,13 @@
+ if (this_cd->toc_scsi){
+ if (cdfs_toc_read_full(sb)){
+ printk("TOC read failed\n");
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ goto invalid;
+-#endif
+ }
+ } else {
+ //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
+ if (cdfs_toc_read(sb)){
+ printk("cdfs_toc_read failed\n");
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+- return NULL;
+-#else
+ goto invalid;
+-#endif
+ }
+ }
+
+@@ -365,11 +325,7 @@
+ sb->s_flags |= MS_RDONLY;
+ sb->s_op = &cdfs_ops;
+ /* always get inode status */
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ retinode=cdfs_iget(sb, 0);
+-#else
+- retinode=iget(sb, 0);
+-#endif
+ if ( IS_ERR(retinode) )
+ return PTR_ERR(retinode);
+
+@@ -379,16 +335,12 @@
+
+ cdfs_proc_cd = this_cd;
+
+-#ifdef OLD_KERNEL
+- return sb;
+-#else
+ return 0;
+
+ invalid:
+ kfree(this_cd->cache);
+ kfree(cdfs_info(sb));
+ return -EINVAL;
+-#endif
+ }
+
+ /************************************************************************/
+@@ -410,27 +362,12 @@
+ // Remove /proc entry
+ cdfs_proc_cd = NULL;
+ kfree(cdfs_info(sb));
+-
+-#ifdef OLD_KERNEL
+- MOD_DEC_USE_COUNT;
+-#endif
+-
+ }
+
+ /************************************************************************/
+
+-#ifdef OLD_KERNEL
+-static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
+- cd * this_cd = cdfs_info(sb);
+-#else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+ static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
+ cd * this_cd = cdfs_info(d->d_sb);
+-#else
+-static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
+- cd * this_cd = cdfs_info(sb);
+-#endif
+-#endif
+ PRINT("rmfs_statfs\n");
+
+ buf->f_type = CDFS_MAGIC;
+@@ -460,11 +397,7 @@
+
+ /************************************************************************/
+
+-#ifdef OLD_KERNEL
+-static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
+-#else
+ static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
+-#endif
+ struct inode * inode;
+ int i;
+ cd * this_cd = cdfs_info(dir->i_sb);
+@@ -480,15 +413,9 @@
+ /* Use goto and read inode with iget()/cdfs_iget() */
+ /* Thanks to David Howells for patch and Master class in his mail */
+ found:
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
+ inode = cdfs_iget(dir->i_sb, i);
+ if (IS_ERR(inode))
+ return ERR_CAST(inode);
+-#else
+- inode = iget(dir->i_sb, i);
+- if (!inode)
+- return ERR_PTR(-ENOMEM);
+-#endif
+ d_add(dentry, inode);
+ return NULL;
+ }
+@@ -529,12 +456,8 @@
+ i->i_fop = &cdfs_dir_operations;
+ } else { /* file */
+ i->i_size = this_cd->track[i->i_ino].size;
+-#ifdef OLD_KERNEL
+- i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
+-#else
+ i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
+ i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
+-#endif
+ i->i_mode = this_cd->mode;
+ if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
+ i->i_fop = &cdfs_cddata_file_operations;
+@@ -587,33 +510,21 @@
+ /******************************************************************/
+
+ static struct super_operations cdfs_ops = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+- .read_inode = cdfs_read_inode,
+-#endif
+ .put_super = cdfs_umount,
+ .statfs = cdfs_statfs
+ };
+
+-#ifdef OLD_KERNEL
+-static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
+-#else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+-static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
+- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
+-#else
+-static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
+- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
+-#endif
+-}
++//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
++// return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
++//}
+
+ static struct file_system_type cdfs_fs_type = {
+ .owner = THIS_MODULE,
+ .name = "cdfs",
+- .get_sb = cdfs_get_sb,
++// .get_sb = cdfs_get_sb,
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV
+ };
+-#endif
+
+ /******************************************************/
+
+@@ -621,10 +532,6 @@
+ MODULE_DESCRIPTION("CDfs: a CD filesystem");
+ MODULE_LICENSE("GPL");
+
+-#ifdef OLD_KERNEL
+-EXPORT_NO_SYMBOLS;
+-#endif
+-
+ /******************************************************************/
+
+ static int __init cdfs_init(void) {
+@@ -676,11 +583,7 @@
+
+ if (!options) return;
+
+-#ifdef OLD_KERNEL
+- for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
+-#else
+ while ((this_char = strsep(&options,",")) != NULL) {
+-#endif
+
+ if (!strcmp(this_char,"single"))
+ this_cd->single=TRUE;
diff --git a/libre/cdfs-libre/cdfs-3.2.patch b/libre/cdfs-libre/cdfs-3.2.patch
new file mode 100644
index 000000000..d3300bdbc
--- /dev/null
+++ b/libre/cdfs-libre/cdfs-3.2.patch
@@ -0,0 +1,12 @@
+diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
+--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300
++++ cdfs-2.6.27.my/root.c 2012-01-18 11:23:03.000000000 +0400
+@@ -517,7 +517,7 @@
+
+ i->i_uid = this_cd->uid;
+ i->i_gid = this_cd->gid;
+- i->i_nlink = 1;
++ i->__i_nlink = 1;
+ i->i_op = &cdfs_inode_operations;
+ i->i_fop = NULL;
+ i->i_data.a_ops = NULL;
diff --git a/libre/cdfs-libre/cdfs-3.4.patch b/libre/cdfs-libre/cdfs-3.4.patch
new file mode 100644
index 000000000..5c2cb9b24
--- /dev/null
+++ b/libre/cdfs-libre/cdfs-3.4.patch
@@ -0,0 +1,12 @@
+diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
+--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300
++++ cdfs-2.6.27.my/root.c 2012-06-15 17:09:27.000000000 +0400
+@@ -375,7 +375,7 @@
+
+ PRINT("retinode = %ld\n", retinode->i_ino);
+
+- sb->s_root = d_alloc_root(retinode);
++ sb->s_root = d_make_root(retinode);
+
+ cdfs_proc_cd = this_cd;
+
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
new file mode 100644
index 000000000..aa71a92ac
--- /dev/null
+++ b/libre/cdfs-libre/cdfs.install
@@ -0,0 +1,14 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.6-LIBRE'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.6-LIBRE'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.6-LIBRE'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
index 5e71171f9..5e71171f9 100644..100755
--- a/libre/cdrkit-libre/PKGBUILD
+++ b/libre/cdrkit-libre/PKGBUILD
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index defa4ae57..c0a063e95 100644..100755
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -2,21 +2,21 @@
#Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
#Contributor: BlackEagle <ike.devolder@gmail.com>
#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-#Maintainer (Parabola): Kete <kete@ninthfloor.org>
-#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+#Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+#Contributor (Parabola): Kete <kete@ninthfloor.org>
_pkgname=clementine
pkgname=clementine-libre
-pkgver=1.0.1
-pkgrel=3.1
+pkgver=1.1.0
+pkgrel=2
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'
- 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl')
-makedepends=('cmake' 'boost')
+ 'qjson' 'libcdio' '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'
'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries'
@@ -25,34 +25,28 @@ replaces=('clementine')
conflicts=('clementine')
provides=("clementine=$pkgver")
source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
- clementine-fix-albumcoverfetch-crash.patch
- clementine-fresh-start.patch
- remove-and-disable-spotify.patch
- remove-nonfree-references-on-translations.patch)
-sha1sums=('e05320da689e2fad744fd3e68518bc4103ecf0fd'
- 'fddd2e784181ce1dcc7809e7122cbade0af7b01f'
- 'd8abab4b8fb2d5284a2f43107505325e62d4af5f'
- '2fef46eaffa7b5cd61afbf19b1dc909d11972a34'
- '745bc4fd639d7ef3230592c6275fb43b8956f3d5')
+ remove-and-disable-spotify.patch)
+sha1sums=('af446aba5ca89edd1541871969b3b6738ffbd05f'
+ '3980a00c02e406226f0d08ae9b7e581702c89838')
install=clementine.install
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
- # https://bugs.gentoo.org/401713?id=401713
- patch -Np1 -i ../clementine-fresh-start.patch
-
- # http://code.google.com/p/clementine-player/issues/detail?id=2752
- patch -Np1 -i ../clementine-fix-albumcoverfetch-crash.patch
-
- # https://labs.parabola.nu/issues/99
+ # Remove nonfree spotify references on files
patch -Np1 -i ../remove-and-disable-spotify.patch
- patch -Np1 -i ../remove-nonfree-references-on-translations.patch
- # Remove nonfree spotifyblob folder
- rm -Rf "./spotifyblob"
+ # Remove nonfree spotifyblob folders
+ rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob}
+
+ # Remove nonfree spotify files
+ rm -v cmake/SpotifyVersion.cmake
+ rm -v data/icons/svg/spotify.svg
+ rm -v data/schema/schema-30.sql
+ rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}}
+
- cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_REMOTE=ON
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
make
}
diff --git a/libre/clementine-libre/clementine-fix-albumcoverfetch-crash.patch b/libre/clementine-libre/clementine-fix-albumcoverfetch-crash.patch
deleted file mode 100644
index d7e64388c..000000000
--- a/libre/clementine-libre/clementine-fix-albumcoverfetch-crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rupN clementine-1.0.1.old/src/covers/albumcoverfetcher.cpp clementine-1.0.1/src/covers/albumcoverfetcher.cpp
---- clementine-1.0.1.old/src/covers/albumcoverfetcher.cpp 2011-12-02 16:24:44.000000000 -0500
-+++ clementine-1.0.1/src/covers/albumcoverfetcher.cpp 2012-02-26 11:37:56.351044572 -0500
-@@ -108,12 +108,16 @@ void AlbumCoverFetcher::StartRequests()
-
- void AlbumCoverFetcher::SingleSearchFinished(quint64 request_id, CoverSearchResults results) {
- AlbumCoverFetcherSearch* search = active_requests_.take(request_id);
-+ if (!search)
-+ return;
- search->deleteLater();
- emit SearchFinished(request_id, results, search->statistics());
- }
-
- void AlbumCoverFetcher::SingleCoverFetched(quint64 request_id, const QImage& image) {
- AlbumCoverFetcherSearch* search = active_requests_.take(request_id);
-+ if (!search)
-+ return;
- search->deleteLater();
- emit AlbumCoverFetched(request_id, image, search->statistics());
- }
diff --git a/libre/clementine-libre/clementine-fresh-start.patch b/libre/clementine-libre/clementine-fresh-start.patch
deleted file mode 100644
index 9bf12973d..000000000
--- a/libre/clementine-libre/clementine-fresh-start.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -rupN clementine-0.7.1.old/data/schema/schema.sql clementine-0.7.1/data/schema/schema.sql
---- clementine-0.7.1.old/data/schema/schema.sql 2011-03-29 15:16:12.000000000 -0400
-+++ clementine-0.7.1/data/schema/schema.sql 2012-01-12 19:15:39.889374607 -0500
-@@ -35,4 +35,5 @@ CREATE TABLE songs (
- CREATE TABLE schema_version (
- version INTEGER NOT NULL
- );
-+
- INSERT INTO schema_version (version) VALUES (0);
diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install
index 2f0338d8a..2f0338d8a 100644..100755
--- 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 9cfc3092a..e006e14c5 100644..100755
--- a/libre/clementine-libre/remove-and-disable-spotify.patch
+++ b/libre/clementine-libre/remove-and-disable-spotify.patch
@@ -9,46 +9,28 @@ diff -rauN clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m clementine-li
@"com.apple.iTunes",
@"com.apple.QuickTimePlayerX",
@"com.apple.quicktimeplayer",
-diff -rauN clementine-1.0.1/Changelog clementine-libre-1.0.1/Changelog
---- clementine-1.0.1/Changelog 2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/Changelog 2012-05-28 13:50:10.422664725 -0300
-@@ -1,3 +1,7 @@
-+Version 1.0.1 (libre version):
-+ Major features:
-+ * Disabled and removed Spotify.
-+
- Version 1.0.1:
- Bugfixes:
- * Use Chromaprinter and Acoustid instead of Echoprint and MusicDNS.
-diff -rauN clementine-1.0.1/cmake/SpotifyVersion.cmake /dev/null
---- clementine-1.0.1/cmake/SpotifyVersion.cmake 2011-12-02 19:24:43.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,3 +0,0 @@
--# Increment this whenever the user needs to download a new blob
--# Remember to upload and sign the new version of the blob.
--set(SPOTIFY_BLOB_VERSION 11)
-diff -rauN clementine-1.0.1/CMakeLists.txt clementine-libre-1.0.1/CMakeLists.txt
---- clementine-1.0.1/CMakeLists.txt 2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/CMakeLists.txt 2012-05-28 17:32:48.690568781 -0300
-@@ -6,7 +6,6 @@
+diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
+--- clementine-1.1.0/CMakeLists.txt 2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/CMakeLists.txt 2012-10-26 01:58:08.725496264 -0200
+@@ -7,7 +7,6 @@
include(cmake/Version.cmake)
include(cmake/Deb.cmake)
include(cmake/Rpm.cmake)
-include(cmake/SpotifyVersion.cmake)
include(cmake/OptionalSource.cmake)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- if (UNIX AND NOT APPLE)
-@@ -66,7 +65,6 @@
+@@ -55,7 +54,6 @@
pkg_check_modules(USBMUXD libusbmuxd)
pkg_check_modules(LIBMTP libmtp>=1.0)
pkg_check_modules(INDICATEQT indicate-qt)
--pkg_check_modules(SPOTIFY libspotify>=10.1.16)
+-pkg_check_modules(SPOTIFY libspotify>=12.1.45)
pkg_check_modules(CDIO libcdio)
pkg_check_modules(QCA qca2)
pkg_check_modules(CHROMAPRINT libchromaprint)
-@@ -90,13 +88,6 @@
- set(HAVE_SPARKLE ON)
- endif (ENABLE_SPARKLE AND SPARKLE)
+@@ -81,13 +79,6 @@
+ find_library(GROWL Growl)
+ find_library(SPARKLE Sparkle)
- find_library(SPOTIFY libspotify)
- if (SPOTIFY)
@@ -60,468 +42,137 @@ diff -rauN clementine-1.0.1/CMakeLists.txt clementine-libre-1.0.1/CMakeLists.txt
add_subdirectory(3rdparty/SPMediaKeyTap)
set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
-@@ -191,8 +182,8 @@
- option(ENABLE_LIBLASTFM "Use liblastfm for fetching song info, scrobbling and radio streams" ON)
- option(ENABLE_REMOTE "Enable support for using remote controls with Clementine" OFF)
- option(ENABLE_BREAKPAD "Enable crash reporting" OFF)
--option(ENABLE_SPOTIFY_BLOB "Build the spotify non-GPL binary" ON)
--option(ENABLE_SPOTIFY "Enable spotify support" ON)
-+option(ENABLE_SPOTIFY_BLOB "Build the spotify non-GPL binary" OFF)
-+option(ENABLE_SPOTIFY "Enable spotify support" OFF)
- option(ENABLE_PLASMARUNNER "Enable plasma krunner global search" OFF)
+@@ -224,26 +215,16 @@
+ DEPENDS "D-Bus support" HAVE_DBUS
+ )
- if(WIN32)
-@@ -235,24 +226,6 @@
- set(HAVE_BREAKPAD ON)
- endif(ENABLE_BREAKPAD)
+-optional_component(SPOTIFY ON "Spotify support: core code"
++optional_component(SPOTIFY OFF "Spotify support: core code"
+ DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
+ )
--if(ENABLE_SPOTIFY AND PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE)
-- set(HAVE_SPOTIFY ON)
--endif(ENABLE_SPOTIFY AND PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE)
--
--if(ENABLE_SPOTIFY_BLOB AND PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE AND SPOTIFY_FOUND)
-- set(HAVE_SPOTIFY_BLOB ON)
--endif(ENABLE_SPOTIFY_BLOB AND PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE AND SPOTIFY_FOUND)
--
--if((NOT HAVE_SPOTIFY_BLOB) AND (NOT QCA_FOUND))
-- # If we're not bundling the spotify blob then we must ensure QCA is available
-- # so we can verify the blob we download at runtime.
-- unset(HAVE_SPOTIFY)
--endif((NOT HAVE_SPOTIFY_BLOB) AND (NOT QCA_FOUND))
+-optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper"
++optional_component(SPOTIFY_BLOB OFF "Spotify support: non-GPL binary helper"
+ DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
+ DEPENDS "libspotify" SPOTIFY_FOUND
+ DEPENDS "Spotify support: core code" HAVE_SPOTIFY
+ )
+
+-set(NEED_SPOTIFY_DOWNLOADER OFF)
+-if(HAVE_SPOTIFY AND NOT HAVE_SPOTIFY_BLOB)
+- set(NEED_SPOTIFY_DOWNLOADER ON)
+-endif()
-
--if(QCA_FOUND AND HAVE_SPOTIFY)
-- set(HAVE_QCA ON)
--endif(QCA_FOUND AND HAVE_SPOTIFY)
+-optional_component(SPOTIFY_DOWNLOADER
+- ${NEED_SPOTIFY_DOWNLOADER} "Spotify support: blob downloader"
+- DEPENDS "qca2" QCA_FOUND
+-)
-
-
- if(ENABLE_VISUALISATIONS)
- # When/if upstream accepts our patches then these options can be used to link
-@@ -391,14 +364,6 @@
+ optional_component(MOODBAR ON "Moodbar support"
+ DEPENDS "fftw3" FFTW3_FOUND
+ )
+@@ -411,14 +392,6 @@
add_subdirectory(3rdparty/google-breakpad)
endif(HAVE_BREAKPAD)
-if(HAVE_SPOTIFY)
-- add_subdirectory(spotifyblob/common)
+- add_subdirectory(ext/libclementine-spotifyblob)
-endif(HAVE_SPOTIFY)
-
-if(HAVE_SPOTIFY_BLOB)
-- add_subdirectory(spotifyblob/blob)
+- add_subdirectory(ext/clementine-spotifyblob)
-endif(HAVE_SPOTIFY_BLOB)
-
- # This goes after everything else because KDE fucks everything else up with its
- # cmake includes.
- find_package(KDE4 4.3.60)
-@@ -430,8 +395,6 @@
- summary_add("Devices: GIO backend" HAVE_GIO)
- summary_add("Gnome sound menu integration" HAVE_LIBINDICATE)
- summary_add("Last.fm support" HAVE_LIBLASTFM)
--summary_add("Spotify support: core code" HAVE_SPOTIFY)
--summary_add("Spotify support: non-GPL binary helper" HAVE_SPOTIFY_BLOB)
- summary_add("Visualisations" ENABLE_VISUALISATIONS)
- summary_add("Wiimote support" HAVE_WIIMOTEDEV)
- summary_add("(KDE) Plasma global search" HAVE_PLASMARUNNER)
-diff -rauN clementine-1.0.1/data/data.qrc clementine-libre-1.0.1/data/data.qrc
---- clementine-1.0.1/data/data.qrc 2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/data/data.qrc 2012-05-28 17:50:22.768352061 -0300
-@@ -49,9 +49,6 @@
- <file>providers/magnatune.png</file>
- <file>schema/schema-8.sql</file>
- <file>schema/schema-9.sql</file>
+ if(HAVE_MOODBAR)
+ add_subdirectory(gst/moodbar)
+ endif()
+diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc
+--- clementine-1.1.0/data/data.qrc 2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/data/data.qrc 2012-10-26 01:59:52.333078474 -0200
+@@ -1,7 +1,6 @@
+ <RCC>
+ <qresource prefix="/">
+ <file>blank.ttf</file>
+- <file>clementine-spotify-public.pem</file>
+ <file>currenttrack_bar_left.png</file>
+ <file>currenttrack_bar_mid.png</file>
+ <file>currenttrack_bar_right.png</file>
+@@ -76,7 +75,6 @@
+ <file>icons/22x22/phone-nokia-n900.png</file>
+ <file>icons/22x22/phone-palm-pre.png</file>
+ <file>icons/22x22/phone.png</file>
- <file>icons/22x22/spotify.png</file>
+ <file>icons/22x22/user-away.png</file>
+ <file>icons/22x22/view-choose.png</file>
+ <file>icons/22x22/view-fullscreen.png</file>
+@@ -153,7 +151,6 @@
+ <file>icons/32x32/phone-palm-pre.png</file>
+ <file>icons/32x32/phone.png</file>
+ <file>icons/32x32/search.png</file>
- <file>icons/32x32/spotify.png</file>
+ <file>icons/32x32/tools-wizard.png</file>
+ <file>icons/32x32/view-choose.png</file>
+ <file>icons/32x32/view-fullscreen.png</file>
+@@ -229,7 +226,6 @@
+ <file>icons/48x48/phone-nokia-n900.png</file>
+ <file>icons/48x48/phone-palm-pre.png</file>
+ <file>icons/48x48/phone.png</file>
- <file>icons/48x48/spotify.png</file>
- <file>icons/22x22/application-exit.png</file>
- <file>icons/22x22/applications-internet.png</file>
- <file>icons/22x22/configure.png</file>
-@@ -320,7 +317,6 @@
- <file>icons/32x32/edit-find.png</file>
- <file>icons/48x48/edit-find.png</file>
+ <file>icons/48x48/view-choose.png</file>
+ <file>icons/48x48/view-fullscreen.png</file>
+ <file>icons/48x48/view-media-equalizer.png</file>
+@@ -318,7 +314,6 @@
+ <file>schema/schema-28.sql</file>
+ <file>schema/schema-29.sql</file>
+ <file>schema/schema-2.sql</file>
+- <file>schema/schema-30.sql</file>
+ <file>schema/schema-31.sql</file>
+ <file>schema/schema-32.sql</file>
<file>schema/schema-33.sql</file>
+@@ -339,7 +334,6 @@
+ <file>smartplaylistsearchterm.css</file>
+ <file>songinfo.css</file>
+ <file>spinner.gif</file>
- <file>spotify-core-logo-128x128.png</file>
- <file>icons/22x22/dialog-warning.png</file>
- <file>icons/22x22/dialog-ok-apply.png</file>
- <file>schema/schema-34.sql</file>
-@@ -331,7 +327,6 @@
- <file>providers/grooveshark.png</file>
- <file>allthethings.png</file>
- <file>globalsearch.css</file>
-- <file>clementine-spotify-public.pem</file>
- <file>icons/22x22/user-away.png</file>
- <file>icons/32x32/search.png</file>
- <file>schema/schema-35.sql</file>
-diff -rauN clementine-1.0.1/data/icons/svg/spotify.svg /dev/null
---- clementine-1.0.1/data/icons/svg/spotify.svg 2011-12-02 19:24:43.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,285 +0,0 @@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg
-- xmlns:dc="http://purl.org/dc/elements/1.1/"
-- xmlns:cc="http://creativecommons.org/ns#"
-- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:svg="http://www.w3.org/2000/svg"
-- xmlns="http://www.w3.org/2000/svg"
-- xmlns:xlink="http://www.w3.org/1999/xlink"
-- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-- width="48"
-- height="48"
-- id="svg2"
-- sodipodi:version="0.32"
-- inkscape:version="0.46"
-- version="1.0"
-- sodipodi:docname="spotify.svg"
-- inkscape:output_extension="org.inkscape.output.svg.inkscape">
-- <defs
-- id="defs4">
-- <linearGradient
-- inkscape:collect="always"
-- id="linearGradient7729">
-- <stop
-- style="stop-color:#467700;stop-opacity:1"
-- offset="0"
-- id="stop7731" />
-- <stop
-- style="stop-color:#518900;stop-opacity:1"
-- offset="1"
-- id="stop7733" />
-- </linearGradient>
-- <linearGradient
-- inkscape:collect="always"
-- id="linearGradient7721">
-- <stop
-- style="stop-color:#1a4300;stop-opacity:1"
-- offset="0"
-- id="stop7723" />
-- <stop
-- style="stop-color:#215300;stop-opacity:1"
-- offset="1"
-- id="stop7725" />
-- </linearGradient>
-- <linearGradient
-- inkscape:collect="always"
-- id="linearGradient7713">
-- <stop
-- style="stop-color:#193d00;stop-opacity:1"
-- offset="0"
-- id="stop7715" />
-- <stop
-- style="stop-color:#1f4b00;stop-opacity:1"
-- offset="1"
-- id="stop7717" />
-- </linearGradient>
-- <linearGradient
-- inkscape:collect="always"
-- id="linearGradient6355">
-- <stop
-- style="stop-color:#23371c;stop-opacity:1"
-- offset="0"
-- id="stop6357" />
-- <stop
-- style="stop-color:#004100;stop-opacity:1"
-- offset="1"
-- id="stop6359" />
-- </linearGradient>
-- <linearGradient
-- inkscape:collect="always"
-- id="linearGradient6347">
-- <stop
-- style="stop-color:#abd033;stop-opacity:1"
-- offset="0"
-- id="stop6349" />
-- <stop
-- style="stop-color:#9ec02d;stop-opacity:0;"
-- offset="1"
-- id="stop6351" />
-- </linearGradient>
-- <linearGradient
-- id="linearGradient5519">
-- <stop
-- style="stop-color:#88ae04;stop-opacity:1"
-- offset="0"
-- id="stop5521" />
-- <stop
-- style="stop-color:#73a400;stop-opacity:1"
-- offset="1"
-- id="stop5523" />
-- </linearGradient>
-- <inkscape:perspective
-- sodipodi:type="inkscape:persp3d"
-- inkscape:vp_x="0 : 526.18109 : 1"
-- inkscape:vp_y="0 : 1000 : 0"
-- inkscape:vp_z="744.09448 : 526.18109 : 1"
-- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-- id="perspective10" />
-- <inkscape:perspective
-- id="perspective5505"
-- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-- inkscape:vp_z="744.09448 : 526.18109 : 1"
-- inkscape:vp_y="0 : 1000 : 0"
-- inkscape:vp_x="0 : 526.18109 : 1"
-- sodipodi:type="inkscape:persp3d" />
-- <linearGradient
-- inkscape:collect="always"
-- xlink:href="#linearGradient5519"
-- id="linearGradient6853"
-- gradientUnits="userSpaceOnUse"
-- x1="119.5"
-- y1="91.362183"
-- x2="102.5"
-- y2="128.36218" />
-- <radialGradient
-- inkscape:collect="always"
-- xlink:href="#linearGradient6355"
-- id="radialGradient6855"
-- gradientUnits="userSpaceOnUse"
-- gradientTransform="matrix(1.1318093,0.197699,-0.1703116,0.9750189,-125.44033,-100.50883)"
-- cx="147.76869"
-- cy="120.16964"
-- fx="147.76869"
-- fy="120.16964"
-- r="14.451495" />
-- <linearGradient
-- inkscape:collect="always"
-- xlink:href="#linearGradient6347"
-- id="linearGradient6857"
-- gradientUnits="userSpaceOnUse"
-- gradientTransform="translate(-125.45979,-77.491488)"
-- x1="149.09062"
-- y1="85.104187"
-- x2="139.1649"
-- y2="106.61218" />
-- <filter
-- inkscape:collect="always"
-- id="filter7655"
-- x="-1.0712544"
-- width="3.1425087"
-- y="-1.0712544"
-- height="3.1425087">
-- <feGaussianBlur
-- inkscape:collect="always"
-- stdDeviation="20.086019"
-- id="feGaussianBlur7657" />
-- </filter>
-- <linearGradient
-- inkscape:collect="always"
-- xlink:href="#linearGradient7713"
-- id="linearGradient7719"
-- x1="38.714096"
-- y1="17.417631"
-- x2="31.1127"
-- y2="15.165503"
-- gradientUnits="userSpaceOnUse"
-- gradientTransform="matrix(0.999924,1.232938e-2,-1.232938e-2,0.999924,0.2587749,-0.2864042)" />
-- <linearGradient
-- inkscape:collect="always"
-- xlink:href="#linearGradient7721"
-- id="linearGradient7727"
-- x1="35.708893"
-- y1="25.90625"
-- x2="27.400389"
-- y2="22.312458"
-- gradientUnits="userSpaceOnUse"
-- gradientTransform="matrix(0.965063,1.1899533e-2,-1.232938e-2,0.999924,1.1112913,-0.2758924)" />
-- <linearGradient
-- inkscape:collect="always"
-- xlink:href="#linearGradient7729"
-- id="linearGradient7735"
-- x1="35.607697"
-- y1="31.414557"
-- x2="23.13369"
-- y2="26.433243"
-- gradientUnits="userSpaceOnUse"
-- gradientTransform="matrix(0.8596429,1.059967e-2,-1.232938e-2,0.999924,3.5039934,-0.2463897)" />
-- <filter
-- inkscape:collect="always"
-- id="filter7785"
-- x="-0.089479765"
-- width="1.1789595"
-- y="-0.14834692"
-- height="1.2966938">
-- <feGaussianBlur
-- inkscape:collect="always"
-- stdDeviation="1.5684595"
-- id="feGaussianBlur7787" />
-- </filter>
-- </defs>
-- <sodipodi:namedview
-- id="base"
-- pagecolor="#ffffff"
-- bordercolor="#666666"
-- borderopacity="1.0"
-- gridtolerance="10000"
-- guidetolerance="10"
-- objecttolerance="10"
-- inkscape:pageopacity="0.0"
-- inkscape:pageshadow="2"
-- inkscape:zoom="5.6568542"
-- inkscape:cx="-0.10040691"
-- inkscape:cy="47.355194"
-- inkscape:document-units="px"
-- inkscape:current-layer="layer1"
-- showgrid="false"
-- inkscape:snap-bbox="true"
-- inkscape:snap-nodes="false"
-- inkscape:window-width="1440"
-- inkscape:window-height="853"
-- inkscape:window-x="0"
-- inkscape:window-y="25">
-- <inkscape:grid
-- type="xygrid"
-- id="grid5511"
-- visible="true"
-- enabled="true" />
-- </sodipodi:namedview>
-- <metadata
-- id="metadata7">
-- <rdf:RDF>
-- <cc:Work
-- rdf:about="">
-- <dc:format>image/svg+xml</dc:format>
-- <dc:type
-- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-- </cc:Work>
-- </rdf:RDF>
-- </metadata>
-- <g
-- inkscape:label="Layer 1"
-- inkscape:groupmode="layer"
-- id="layer1">
-- <g
-- id="g6847"
-- transform="translate(-0.29021,-0.7456946)">
-- <path
-- sodipodi:type="arc"
-- style="opacity:0.64566926;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter7655);enable-background:accumulate"
-- id="path6363"
-- sodipodi:cx="112.5"
-- sodipodi:cy="109.86218"
-- sodipodi:rx="22.5"
-- sodipodi:ry="22.5"
-- d="M 135,109.86218 A 22.5,22.5 0 1 1 90,109.86218 A 22.5,22.5 0 1 1 135,109.86218 z"
-- transform="matrix(0.4666666,0,0,0.111111,-28.709782,33.038802)" />
-- <path
-- transform="translate(-88.70979,-85.616488)"
-- d="M 135,109.86218 A 22.5,22.5 0 1 1 90,109.86218 A 22.5,22.5 0 1 1 135,109.86218 z"
-- sodipodi:ry="22.5"
-- sodipodi:rx="22.5"
-- sodipodi:cy="109.86218"
-- sodipodi:cx="112.5"
-- id="path5513"
-- style="opacity:1;fill:url(#linearGradient6853);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-- sodipodi:type="arc" />
-- <path
-- sodipodi:nodetypes="csccscc"
-- id="path5529"
-- d="M 7.6378996,39.420202 C 8.1682296,39.420202 11.29843,32.092852 23.23086,33.507062 C 35.16329,34.921272 36.54089,42.778952 36.54089,42.778952 C 34.49039,44.179572 32.3092,45.405922 29.55821,45.872552 C 29.55821,45.872552 26.55929,40.325532 21.1676,40.679082 C 15.77591,41.032632 13.91347,44.193172 13.91347,44.193172 C 11.14188,43.198092 8.9957096,41.593432 7.6378996,39.420202 z"
-- style="fill:url(#radialGradient6855);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-- <path
-- sodipodi:nodetypes="cccc"
-- id="path5531"
-- d="M 2.6652096,29.120692 C 35.315841,10.631207 30.66521,27.370692 44.66521,26.495692 C 44.14296,15.562843 35.20292,3.7456934 23.66521,3.7456934 C 6.6997296,4.3119254 1.9479196,20.58416 2.6652096,29.120692 z"
-- style="fill:url(#linearGradient6857);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter7785)" />
-- </g>
-- <path
-- style="opacity:1;fill:url(#linearGradient7719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-- d="M 10.300245,11.619555 C 8.241027,12.012805 7.9425774,15.355405 10.765465,15.313073 C 21.977063,13.20149 31.048724,15.49889 39.670046,19.826041 C 40.808245,20.378971 42.647611,18.028703 41.02047,16.758511 C 31.316836,11.614062 19.960975,9.8780472 10.300245,11.619555 z"
-- id="path7661"
-- sodipodi:nodetypes="ccccc" />
-- <path
-- style="opacity:1;fill:url(#linearGradient7727);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-- d="M 12.303532,19.144827 C 10.172718,19.381037 9.829391,22.969311 12.56196,22.64828 C 21.903655,21.50982 27.85363,22.62879 35.683323,25.808592 C 37.647192,26.873264 38.724998,23.482585 36.929338,22.604961 C 28.133565,18.889799 21.412131,18.726151 12.303532,19.144827 z"
-- id="path7666"
-- sodipodi:nodetypes="ccccc" />
-- <path
-- style="opacity:1;fill:url(#linearGradient7735);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-- d="M 14.447653,25.703011 C 12.75416,26.30833 13.053805,29.148649 14.863112,29.052139 C 17.870832,28.722372 20.153948,28.706138 23.615532,29.097554 C 27.126432,29.494545 29.233258,30.435974 32.157356,31.453048 C 33.350406,31.961876 34.447173,29.764482 33.187538,28.528027 C 29.966426,27.274723 27.415802,26.174879 23.388506,25.719498 C 20.084015,25.348048 17.755584,25.371512 14.447653,25.703011 z"
-- id="path7668"
-- sodipodi:nodetypes="ccscccc" />
-- </g>
--</svg>
-diff -rauN clementine-1.0.1/data/schema/schema-30.sql clementine-libre-1.0.1/data/schema/schema-30.sql
---- clementine-1.0.1/data/schema/schema-30.sql 2011-12-02 19:24:43.000000000 -0200
-+++ clementine-libre-1.0.1/data/schema/schema-30.sql 2012-05-28 17:55:40.840489308 -0300
-@@ -1,45 +1 @@
--CREATE TABLE spotify_search_songs (
-- title TEXT,
-- album TEXT,
-- artist TEXT,
-- albumartist TEXT,
-- composer TEXT,
-- track INTEGER,
-- disc INTEGER,
-- bpm REAL,
-- year INTEGER,
-- genre TEXT,
-- comment TEXT,
-- compilation INTEGER,
--
-- length INTEGER,
-- bitrate INTEGER,
-- samplerate INTEGER,
--
-- directory INTEGER NOT NULL,
-- filename TEXT NOT NULL,
-- mtime INTEGER NOT NULL,
-- ctime INTEGER NOT NULL,
-- filesize INTEGER NOT NULL,
-- sampler INTEGER NOT NULL DEFAULT 0,
-- art_automatic TEXT,
-- art_manual TEXT,
-- filetype INTEGER NOT NULL DEFAULT 0,
-- playcount INTEGER NOT NULL DEFAULT 0,
-- lastplayed INTEGER,
-- rating INTEGER,
-- forced_compilation_on INTEGER NOT NULL DEFAULT 0,
-- forced_compilation_off INTEGER NOT NULL DEFAULT 0,
-- effective_compilation NOT NULL DEFAULT 0,
-- skipcount INTEGER NOT NULL DEFAULT 0,
-- score INTEGER NOT NULL DEFAULT 0,
-- beginning INTEGER NOT NULL DEFAULT 0,
-- cue_path TEXT
--);
--
--CREATE VIRTUAL TABLE spotify_search_songs_fts USING fts3 (
-- ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsgenre, ftscomment,
-- tokenize=unicode
--);
--
- UPDATE schema_version SET version=30;
-diff -rauN clementine-1.0.1/dist/macdeploy.py clementine-libre-1.0.1/dist/macdeploy.py
---- clementine-1.0.1/dist/macdeploy.py 2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/dist/macdeploy.py 2012-05-28 17:58:29.937662793 -0300
-@@ -367,11 +367,6 @@
-
- FixPlugin(FindGstreamerPlugin('gst-plugin-scanner'), '.')
-
--try:
+ <file>star-off.png</file>
+ <file>star-on.png</file>
+ <file>tiny-pause.png</file>
+diff -rauN clementine-1.1.0/dist/macdeploy.py clementine-libre-1.1.0/dist/macdeploy.py
+--- clementine-1.1.0/dist/macdeploy.py 2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/dist/macdeploy.py 2012-10-26 02:06:12.781965350 -0200
+@@ -387,10 +387,7 @@
+ FixPlugin(FindGioModule('libgiolibproxy.so'), 'gio-modules')
+
+ try:
- FixPlugin('clementine-spotifyblob', '.')
+ FixPlugin('clementine-tagreader', '.')
-except:
-- print 'Failed to find spotify blob'
--
+- print 'Failed to find blob: %s' % traceback.format_exc()
+
for plugin in QT_PLUGINS:
FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
-
-diff -rauN clementine-1.0.1/dist/windows/clementine.nsi clementine-libre-1.0.1/dist/windows/clementine.nsi
---- clementine-1.0.1/dist/windows/clementine.nsi 2012-01-22 10:43:46.000000000 -0200
-+++ clementine-libre-1.0.1/dist/windows/clementine.nsi 2012-05-28 18:06:56.812551755 -0300
-@@ -95,7 +95,6 @@
+diff -rauN clementine-1.1.0/dist/windows/clementine.nsi clementine-libre-1.1.0/dist/windows/clementine.nsi
+--- clementine-1.1.0/dist/windows/clementine.nsi 2012-10-22 04:27:00.000000000 -0200
++++ clementine-libre-1.1.0/dist/windows/clementine.nsi 2012-10-26 02:07:20.551540003 -0200
+@@ -94,9 +94,6 @@
+ Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
- ; 1.0 prerelease
+- ; 1.0 prerelease
- Delete "$INSTDIR\spotify.dll"
-
+-
; 1.0
Delete "$INSTDIR\libofa.dll"
-@@ -109,7 +108,6 @@
- File "avformat-52.dll"
+ Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll"
+@@ -110,7 +107,6 @@
File "avutil-50.dll"
File "clementine.exe"
+ File "clementine-tagreader.exe"
- File "clementine-spotifyblob.exe"
File "clementine.ico"
File "glew32.dll"
File "intl.dll"
-@@ -163,7 +161,6 @@
+@@ -164,7 +160,6 @@
File "libqjson.dll"
File "libsoup-2.4-1.dll"
File "libspeex-1.dll"
@@ -529,15 +180,15 @@ diff -rauN clementine-1.0.1/dist/windows/clementine.nsi clementine-libre-1.0.1/d
File "libtag.dll"
File "libtasn1-3.dll"
File "libusbmuxd.dll"
-@@ -949,7 +946,6 @@
- Delete "$INSTDIR\avutil-50.dll"
+@@ -957,7 +952,6 @@
Delete "$INSTDIR\clementine.ico"
Delete "$INSTDIR\clementine.exe"
+ Delete "$INSTDIR\clementine-tagreader.exe"
- Delete "$INSTDIR\clementine-spotifyblob.exe"
Delete "$INSTDIR\glew32.dll"
Delete "$INSTDIR\intl.dll"
Delete "$INSTDIR\libcdio-12.dll"
-@@ -1002,7 +998,6 @@
+@@ -1010,7 +1004,6 @@
Delete "$INSTDIR\libqjson.dll"
Delete "$INSTDIR\libsoup-2.4-1.dll"
Delete "$INSTDIR\libspeex-1.dll"
@@ -545,26 +196,28 @@ diff -rauN clementine-1.0.1/dist/windows/clementine.nsi clementine-libre-1.0.1/d
Delete "$INSTDIR\libtag.dll"
Delete "$INSTDIR\libtasn1-3.dll"
Delete "$INSTDIR\libusbmuxd.dll"
-diff -rauN clementine-1.0.1/dist/windows/clementine.nsi.in clementine-libre-1.0.1/dist/windows/clementine.nsi.in
---- clementine-1.0.1/dist/windows/clementine.nsi.in 2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/dist/windows/clementine.nsi.in 2012-05-28 18:09:14.664818947 -0300
-@@ -95,7 +95,6 @@
+diff -rauN clementine-1.1.0/dist/windows/clementine.nsi.in clementine-libre-1.1.0/dist/windows/clementine.nsi.in
+--- clementine-1.1.0/dist/windows/clementine.nsi.in 2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/dist/windows/clementine.nsi.in 2012-10-26 02:08:02.052572234 -0200
+@@ -94,9 +94,6 @@
+ Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
- ; 1.0 prerelease
+- ; 1.0 prerelease
- Delete "$INSTDIR\spotify.dll"
-
+-
; 1.0
Delete "$INSTDIR\libofa.dll"
-@@ -109,7 +108,6 @@
- File "avformat-52.dll"
+ Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll"
+@@ -110,7 +107,6 @@
File "avutil-50.dll"
File "clementine.exe"
+ File "clementine-tagreader.exe"
- File "clementine-spotifyblob.exe"
File "clementine.ico"
File "glew32.dll"
File "intl.dll"
-@@ -163,7 +161,6 @@
+@@ -164,7 +160,6 @@
File "libqjson.dll"
File "libsoup-2.4-1.dll"
File "libspeex-1.dll"
@@ -572,15 +225,15 @@ diff -rauN clementine-1.0.1/dist/windows/clementine.nsi.in clementine-libre-1.0.
File "libtag.dll"
File "libtasn1-3.dll"
File "libusbmuxd.dll"
-@@ -949,7 +946,6 @@
- Delete "$INSTDIR\avutil-50.dll"
+@@ -957,7 +952,6 @@
Delete "$INSTDIR\clementine.ico"
Delete "$INSTDIR\clementine.exe"
+ Delete "$INSTDIR\clementine-tagreader.exe"
- Delete "$INSTDIR\clementine-spotifyblob.exe"
Delete "$INSTDIR\glew32.dll"
Delete "$INSTDIR\intl.dll"
Delete "$INSTDIR\libcdio-12.dll"
-@@ -1002,7 +998,6 @@
+@@ -1010,7 +1004,6 @@
Delete "$INSTDIR\libqjson.dll"
Delete "$INSTDIR\libsoup-2.4-1.dll"
Delete "$INSTDIR\libspeex-1.dll"
@@ -588,18 +241,18 @@ diff -rauN clementine-1.0.1/dist/windows/clementine.nsi.in clementine-libre-1.0.
Delete "$INSTDIR\libtag.dll"
Delete "$INSTDIR\libtasn1-3.dll"
Delete "$INSTDIR\libusbmuxd.dll"
-diff -rauN clementine-1.0.1/src/CMakeLists.txt clementine-libre-1.0.1/src/CMakeLists.txt
---- clementine-1.0.1/src/CMakeLists.txt 2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/src/CMakeLists.txt 2012-05-30 02:50:15.725755468 -0300
-@@ -552,7 +552,6 @@
- internet/internetviewcontainer.ui
+diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeLists.txt
+--- clementine-1.1.0/src/CMakeLists.txt 2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/src/CMakeLists.txt 2012-10-26 02:09:29.994361873 -0200
+@@ -630,7 +630,6 @@
internet/magnatunedownloaddialog.ui
internet/magnatunesettingspage.ui
+ internet/searchboxwidget.ui
- internet/spotifysettingspage.ui
library/groupbydialog.ui
library/libraryfilterwidget.ui
-@@ -690,23 +689,6 @@
+@@ -774,32 +773,6 @@
internet/lastfmstationdialog.ui
)
@@ -607,38 +260,52 @@ diff -rauN clementine-1.0.1/src/CMakeLists.txt clementine-libre-1.0.1/src/CMakeL
-optional_source(HAVE_SPOTIFY
- SOURCES
- globalsearch/spotifysearchprovider.cpp
-- internet/spotifyblobdownloader.cpp
-- internet/spotifysearchplaylisttype.cpp
- internet/spotifyserver.cpp
- internet/spotifyservice.cpp
- internet/spotifysettingspage.cpp
- HEADERS
- globalsearch/spotifysearchprovider.h
-- internet/spotifyblobdownloader.h
- internet/spotifyserver.h
- internet/spotifyservice.h
- internet/spotifysettingspage.h
+- INCLUDE_DIRECTORIES
+- ${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob
+- ${CMAKE_BINARY_DIR}/ext/libclementine-spotifyblob
+-)
+-
+-optional_source(HAVE_SPOTIFY_DOWNLOADER
+- SOURCES
+- internet/spotifyblobdownloader.cpp
+- HEADERS
+- internet/spotifyblobdownloader.h
+- INCLUDE_DIRECTORIES
+- ${QCA_INCLUDE_DIRS}
-)
-
- optional_source(HAVE_QCA INCLUDE_DIRECTORIES ${QCA_INCLUDE_DIRS})
-
# Platform specific - OS X
-@@ -1037,14 +1019,6 @@
+ optional_source(APPLE
+ INCLUDE_DIRECTORIES
+@@ -1141,19 +1114,6 @@
endif (LINUX)
endif(HAVE_BREAKPAD)
-if(HAVE_SPOTIFY)
- target_link_libraries(clementine_lib
- clementine-spotifyblob-messages
+- )
+-endif(HAVE_SPOTIFY)
+-
+-if(HAVE_SPOTIFY_DOWNLOADER)
+- target_link_libraries(clementine_lib
- ${QCA_LIBRARIES}
- )
- link_directories(${QCA_LIBRARY_DIRS})
--endif(HAVE_SPOTIFY)
+-endif(HAVE_SPOTIFY_DOWNLOADER)
-
if (APPLE)
target_link_libraries(clementine_lib
${GROWL}
-@@ -1118,11 +1092,6 @@
+@@ -1231,16 +1191,6 @@
clementine_lib
)
@@ -646,25 +313,31 @@ diff -rauN clementine-1.0.1/src/CMakeLists.txt clementine-libre-1.0.1/src/CMakeL
-if(HAVE_SPOTIFY_BLOB)
- add_dependencies(clementine clementine-spotifyblob)
-endif(HAVE_SPOTIFY_BLOB)
+-add_dependencies(clementine clementine-tagreader)
-
- set_target_properties(clementine PROPERTIES
- MACOSX_BUNDLE_INFO_PLIST "../dist/Info.plist"
- )
-diff -rauN clementine-1.0.1/src/config.h.in clementine-libre-1.0.1/src/config.h.in
---- clementine-1.0.1/src/config.h.in 2011-12-02 19:24:43.000000000 -0200
-+++ clementine-libre-1.0.1/src/config.h.in 2012-05-28 18:17:13.027993639 -0300
-@@ -35,7 +35,6 @@
+-set_target_properties(clementine PROPERTIES
+- MACOSX_BUNDLE_INFO_PLIST "../dist/Info.plist"
+-)
+-
+ if (APPLE)
+ install(FILES ../dist/clementine.icns
+ DESTINATION "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources")
+diff -rauN clementine-1.1.0/src/config.h.in clementine-libre-1.1.0/src/config.h.in
+--- clementine-1.1.0/src/config.h.in 2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/src/config.h.in 2012-10-26 02:10:01.735935822 -0200
+@@ -38,8 +38,6 @@
#cmakedefine HAVE_QCA
- #cmakedefine HAVE_REMOTE
+ #cmakedefine HAVE_SAC
#cmakedefine HAVE_SPARKLE
-#cmakedefine HAVE_SPOTIFY
+-#cmakedefine HAVE_SPOTIFY_DOWNLOADER
#cmakedefine HAVE_STATIC_SQLITE
#cmakedefine HAVE_WIIMOTEDEV
- #cmakedefine LEOPARD
-diff -rauN clementine-1.0.1/src/core/utilities.cpp clementine-libre-1.0.1/src/core/utilities.cpp
---- clementine-1.0.1/src/core/utilities.cpp 2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/src/core/utilities.cpp 2012-05-28 18:25:43.252728803 -0300
-@@ -277,9 +277,6 @@
+ #cmakedefine IMOBILEDEVICE_USES_UDIDS
+diff -rauN clementine-1.1.0/src/core/utilities.cpp clementine-libre-1.1.0/src/core/utilities.cpp
+--- clementine-1.1.0/src/core/utilities.cpp 2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/src/core/utilities.cpp 2012-10-26 02:10:38.303908540 -0200
+@@ -310,9 +310,6 @@
return QDir::homePath();
#endif
@@ -674,21 +347,21 @@ diff -rauN clementine-1.0.1/src/core/utilities.cpp clementine-libre-1.0.1/src/co
default:
qFatal("%s", Q_FUNC_INFO);
return QString::null;
-diff -rauN clementine-1.0.1/src/core/utilities.h clementine-libre-1.0.1/src/core/utilities.h
---- clementine-1.0.1/src/core/utilities.h 2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/src/core/utilities.h 2012-05-28 18:27:31.686659381 -0300
-@@ -88,7 +88,6 @@
+diff -rauN clementine-1.1.0/src/core/utilities.h clementine-libre-1.1.0/src/core/utilities.h
+--- clementine-1.1.0/src/core/utilities.h 2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/src/core/utilities.h 2012-10-26 02:11:04.965764358 -0200
+@@ -108,7 +108,6 @@
Path_NetworkCache,
Path_GstreamerRegistry,
Path_DefaultMusicLibrary,
- Path_LocalSpotifyBlob,
+ Path_MoodbarCache,
};
QString GetConfigPath(ConfigPath config);
-
-diff -rauN clementine-1.0.1/src/covers/albumcoverloader.cpp clementine-libre-1.0.1/src/covers/albumcoverloader.cpp
---- clementine-1.0.1/src/covers/albumcoverloader.cpp 2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/covers/albumcoverloader.cpp 2012-05-28 18:34:26.543457483 -0300
-@@ -28,10 +28,6 @@
+diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1.0/src/covers/albumcoverloader.cpp
+--- clementine-1.1.0/src/covers/albumcoverloader.cpp 2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/src/covers/albumcoverloader.cpp 2012-10-26 03:59:14.488394050 -0200
+@@ -29,17 +29,12 @@
#include <QUrl>
#include <QNetworkReply>
@@ -699,17 +372,15 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.cpp clementine-libre-1.0
AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
: QObject(parent),
-@@ -40,8 +36,7 @@
- scale_(true),
- padding_(true),
- next_id_(0),
+ stop_requested_(false),
+ next_id_(1),
- network_(new NetworkAccessManager(this)),
- connected_spotify_(false)
+ network_(new NetworkAccessManager(this))
{
}
-@@ -148,46 +143,12 @@
+@@ -167,30 +162,6 @@
remote_tasks_.insert(reply, task);
return TryLoadResult(true, false, QImage());
@@ -740,7 +411,8 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.cpp clementine-libre-1.0
}
QImage image(filename);
- return TryLoadResult(false, !image.isNull(), image.isNull() ? default_ : image);
+@@ -198,16 +169,6 @@
+ image.isNull() ? task.options.default_output_image_: image);
}
-void AlbumCoverLoader::SpotifyImageLoaded(const QString& id, const QImage& image) {
@@ -748,7 +420,7 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.cpp clementine-libre-1.0
- return;
-
- Task task = remote_spotify_tasks_.take(id);
-- QImage scaled = ScaleAndPad(image);
+- QImage scaled = ScaleAndPad(task.options, image);
- emit ImageLoaded(task.id, scaled);
- emit ImageLoaded(task.id, scaled, image);
-}
@@ -756,10 +428,10 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.cpp clementine-libre-1.0
void AlbumCoverLoader::RemoteFetchFinished() {
QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
if (!reply)
-diff -rauN clementine-1.0.1/src/covers/albumcoverloader.h clementine-libre-1.0.1/src/covers/albumcoverloader.h
---- clementine-1.0.1/src/covers/albumcoverloader.h 2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/covers/albumcoverloader.h 2012-05-28 18:38:03.228006474 -0300
-@@ -65,7 +65,6 @@
+diff -rauN clementine-1.1.0/src/covers/albumcoverloader.h clementine-libre-1.1.0/src/covers/albumcoverloader.h
+--- clementine-1.1.0/src/covers/albumcoverloader.h 2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/src/covers/albumcoverloader.h 2012-10-26 02:13:19.304984280 -0200
+@@ -62,7 +62,6 @@
protected slots:
void ProcessTasks();
void RemoteFetchFinished();
@@ -767,7 +439,7 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.h clementine-libre-1.0.1
protected:
enum State {
-@@ -108,13 +107,10 @@
+@@ -102,13 +101,10 @@
QMutex mutex_;
QQueue<Task> tasks_;
QMap<QNetworkReply*, Task> remote_tasks_;
@@ -781,10 +453,10 @@ diff -rauN clementine-1.0.1/src/covers/albumcoverloader.h clementine-libre-1.0.1
static const int kMaxRedirects = 3;
};
-diff -rauN clementine-1.0.1/src/engines/gstenginepipeline.cpp clementine-libre-1.0.1/src/engines/gstenginepipeline.cpp
---- clementine-1.0.1/src/engines/gstenginepipeline.cpp 2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/engines/gstenginepipeline.cpp 2012-05-28 18:51:35.779395089 -0300
-@@ -26,11 +26,6 @@
+diff -rauN clementine-1.1.0/src/engines/gstenginepipeline.cpp clementine-libre-1.1.0/src/engines/gstenginepipeline.cpp
+--- clementine-1.1.0/src/engines/gstenginepipeline.cpp 2012-10-25 03:04:21.000000000 -0200
++++ clementine-libre-1.1.0/src/engines/gstenginepipeline.cpp 2012-10-26 02:14:35.834075631 -0200
+@@ -30,11 +30,6 @@
#include "core/utilities.h"
#include "internet/internetmodel.h"
@@ -793,10 +465,10 @@ diff -rauN clementine-1.0.1/src/engines/gstenginepipeline.cpp clementine-libre-1
-# include "internet/spotifyservice.h"
-#endif
-
- #include <QtConcurrentRun>
-
const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
-@@ -131,36 +126,6 @@
+ const int GstEnginePipeline::kFaderFudgeMsec = 2000;
+
+@@ -139,42 +134,11 @@
bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) {
GstElement* new_bin = NULL;
@@ -832,2349 +504,36 @@ diff -rauN clementine-1.0.1/src/engines/gstenginepipeline.cpp clementine-libre-1
- } else {
new_bin = engine_->CreateElement("uridecodebin");
g_object_set(G_OBJECT(new_bin), "uri", url.toEncoded().constData(), NULL);
- g_object_set(G_OBJECT(new_bin), "buffer-duration", buffer_duration_nanosec_, NULL);
-@@ -169,7 +134,6 @@
- g_signal_connect(G_OBJECT(new_bin), "drained", G_CALLBACK(SourceDrainedCallback), this);
- g_signal_connect(G_OBJECT(new_bin), "pad-added", G_CALLBACK(NewPadCallback), this);
- g_signal_connect(G_OBJECT(new_bin), "notify::source", G_CALLBACK(SourceSetupCallback), this);
+ CHECKED_GCONNECT(G_OBJECT(new_bin), "drained", &SourceDrainedCallback, this);
+ CHECKED_GCONNECT(G_OBJECT(new_bin), "pad-added", &NewPadCallback, this);
+ CHECKED_GCONNECT(G_OBJECT(new_bin), "notify::source", &SourceSetupCallback, this);
- }
return ReplaceDecodeBin(new_bin);
}
-diff -rauN clementine-1.0.1/src/globalsearch/spotifysearchprovider.cpp /dev/null
---- clementine-1.0.1/src/globalsearch/spotifysearchprovider.cpp 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,208 +0,0 @@
--/* This file is part of Clementine.
-- Copyright 2010, David Sansome <me@davidsansome.com>
--
-- Clementine 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 3 of the License, or
-- (at your option) any later version.
--
-- Clementine 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 Clementine. If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#include "spotifysearchprovider.h"
--#include "core/logging.h"
--#include "internet/internetmodel.h"
--#include "internet/spotifyserver.h"
--#include "internet/spotifyservice.h"
--#include "playlist/songmimedata.h"
--#include "spotifyblob/common/spotifymessagehandler.h"
--
--SpotifySearchProvider::SpotifySearchProvider(QObject* parent)
-- : SearchProvider(parent),
-- server_(NULL),
-- service_(NULL)
--{
-- Init("Spotify", "spotify", QIcon(":icons/32x32/spotify.png"),
-- WantsDelayedQueries | WantsSerialisedArtQueries | ArtIsProbablyRemote |
-- CanShowConfig);
--}
--
--SpotifyServer* SpotifySearchProvider::server() {
-- if (server_)
-- return server_;
--
-- if (!service_)
-- service_ = InternetModel::Service<SpotifyService>();
--
-- if (service_->login_state() != SpotifyService::LoginState_LoggedIn)
-- return NULL;
--
-- server_ = service_->server();
-- connect(server_, SIGNAL(SearchResults(spotify_pb::SearchResponse)),
-- SLOT(SearchFinishedSlot(spotify_pb::SearchResponse)));
-- connect(server_, SIGNAL(ImageLoaded(QString,QImage)),
-- SLOT(ArtLoadedSlot(QString,QImage)));
-- connect(server_, SIGNAL(AlbumBrowseResults(spotify_pb::BrowseAlbumResponse)),
-- SLOT(AlbumBrowseResponse(spotify_pb::BrowseAlbumResponse)));
-- connect(server_, SIGNAL(destroyed()), SLOT(ServerDestroyed()));
--
-- return server_;
--}
--
--void SpotifySearchProvider::ServerDestroyed() {
-- server_ = NULL;
--}
--
--void SpotifySearchProvider::SearchAsync(int id, const QString& query) {
-- SpotifyServer* s = server();
-- if (!s) {
-- emit SearchFinished(id);
-- return;
-- }
--
-- PendingState state;
-- state.orig_id_ = id;
-- state.tokens_ = TokenizeQuery(query);
--
-- const QString query_string = state.tokens_.join(" ");
-- s->Search(query_string, 5, 5);
-- queries_[query_string] = state;
--}
--
--void SpotifySearchProvider::SearchFinishedSlot(const spotify_pb::SearchResponse& response) {
-- QString query_string = QString::fromUtf8(response.request().query().c_str());
-- QMap<QString, PendingState>::iterator it = queries_.find(query_string);
-- if (it == queries_.end())
-- return;
--
-- PendingState state = it.value();
-- queries_.erase(it);
--
-- ResultList ret;
-- for (int i=0; i < response.result_size() ; ++i) {
-- const spotify_pb::Track& track = response.result(i);
--
-- Result result(this);
-- result.type_ = globalsearch::Type_Track;
-- SpotifyService::SongFromProtobuf(track, &result.metadata_);
-- result.match_quality_ = MatchQuality(state.tokens_, result.metadata_.title());
--
-- ret << result;
-- }
--
-- for (int i=0 ; i<response.album_size() ; ++i) {
-- const spotify_pb::Album& album = response.album(i);
--
-- Result result(this);
-- result.type_ = globalsearch::Type_Album;
-- SpotifyService::SongFromProtobuf(album.metadata(), &result.metadata_);
-- result.match_quality_ =
-- qMin(MatchQuality(state.tokens_, result.metadata_.album()),
-- MatchQuality(state.tokens_, result.metadata_.artist()));
-- result.album_size_ = album.metadata().track();
--
-- for (int j=0; j < album.track_size() ; ++j) {
-- Song track_song;
-- SpotifyService::SongFromProtobuf(album.track(j), &track_song);
-- result.album_songs_ << track_song;
-- }
--
-- ret << result;
-- }
--
-- emit ResultsAvailable(state.orig_id_, ret);
-- emit SearchFinished(state.orig_id_);
--}
--
--void SpotifySearchProvider::LoadArtAsync(int id, const Result& result) {
-- SpotifyServer* s = server();
-- if (!s) {
-- emit ArtLoaded(id, QImage());
-- return;
-- }
--
-- QString image_id = QUrl(result.metadata_.art_automatic()).path();
-- if (image_id.startsWith('/'))
-- image_id.remove(0, 1);
--
-- pending_art_[image_id] = id;
-- s->LoadImage(image_id);
--}
--
--void SpotifySearchProvider::ArtLoadedSlot(const QString& id, const QImage& image) {
-- QMap<QString, int>::iterator it = pending_art_.find(id);
-- if (it == pending_art_.end())
-- return;
--
-- const int orig_id = it.value();
-- pending_art_.erase(it);
--
-- emit ArtLoaded(orig_id, ScaleAndPad(image));
--}
--
--void SpotifySearchProvider::LoadTracksAsync(int id, const Result& result) {
-- switch (result.type_) {
-- case globalsearch::Type_Track: {
-- SongMimeData* mime_data = new SongMimeData;
-- mime_data->songs = SongList() << result.metadata_;
-- emit TracksLoaded(id, mime_data);
-- break;
-- }
--
-- case globalsearch::Type_Album: {
-- SpotifyServer* s = server();
-- if (!s) {
-- emit TracksLoaded(id, NULL);
-- return;
-- }
--
-- QString uri = result.metadata_.url().toString();
--
-- pending_tracks_[uri] = id;
-- s->AlbumBrowse(uri);
-- break;
-- }
--
-- default:
-- break;
-- }
--}
--
--void SpotifySearchProvider::AlbumBrowseResponse(const spotify_pb::BrowseAlbumResponse& response) {
-- QString uri = QStringFromStdString(response.uri());
-- QMap<QString, int>::iterator it = pending_tracks_.find(uri);
-- if (it == pending_tracks_.end())
-- return;
--
-- const int orig_id = it.value();
-- pending_tracks_.erase(it);
--
-- SongMimeData* mime_data = new SongMimeData;
--
-- for (int i=0 ; i<response.track_size() ; ++i) {
-- Song song;
-- SpotifyService::SongFromProtobuf(response.track(i), &song);
-- mime_data->songs << song;
-- }
--
-- emit TracksLoaded(orig_id, mime_data);
--}
--
--bool SpotifySearchProvider::IsLoggedIn() {
-- if (server()) {
-- return service_->IsLoggedIn();
-- }
-- return false;
--}
--
--void SpotifySearchProvider::ShowConfig() {
-- if (service_) {
-- return service_->ShowConfig();
-- }
--}
-diff -rauN clementine-1.0.1/src/globalsearch/spotifysearchprovider.h /dev/null
---- clementine-1.0.1/src/globalsearch/spotifysearchprovider.h 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,60 +0,0 @@
--/* This file is part of Clementine.
-- Copyright 2010, David Sansome <me@davidsansome.com>
--
-- Clementine 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 3 of the License, or
-- (at your option) any later version.
--
-- Clementine 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 Clementine. If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#ifndef SPOTIFYSEARCHPROVIDER_H
--#define SPOTIFYSEARCHPROVIDER_H
--
--#include "searchprovider.h"
--#include "spotifyblob/common/spotifymessages.pb.h"
--
--class SpotifyServer;
--class SpotifyService;
--
--
--class SpotifySearchProvider : public SearchProvider {
-- Q_OBJECT
--
--public:
-- SpotifySearchProvider(QObject* parent = 0);
--
-- void SearchAsync(int id, const QString& query);
-- void LoadArtAsync(int id, const Result& result);
-- void LoadTracksAsync(int id, const Result& result);
--
-- bool IsLoggedIn();
-- void ShowConfig();
--
--private slots:
-- void ServerDestroyed();
-- void SearchFinishedSlot(const spotify_pb::SearchResponse& response);
-- void ArtLoadedSlot(const QString& id, const QImage& image);
--
-- void AlbumBrowseResponse(const spotify_pb::BrowseAlbumResponse& response);
--
--private:
-- SpotifyServer* server();
--
--private:
-- SpotifyServer* server_;
-- SpotifyService* service_;
--
-- QMap<QString, PendingState> queries_;
-- QMap<QString, int> pending_art_;
-- QMap<QString, int> pending_tracks_;
--};
--
--#endif // SPOTIFYSEARCHPROVIDER_H
-diff -rauN clementine-1.0.1/src/internet/internetmodel.cpp clementine-libre-1.0.1/src/internet/internetmodel.cpp
---- clementine-1.0.1/src/internet/internetmodel.cpp 2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/internet/internetmodel.cpp 2012-05-28 18:56:58.934758916 -0300
-@@ -32,9 +32,6 @@
+diff -rauN clementine-1.1.0/src/internet/internetmodel.cpp clementine-libre-1.1.0/src/internet/internetmodel.cpp
+--- clementine-1.1.0/src/internet/internetmodel.cpp 2012-10-22 04:24:28.000000000 -0200
++++ clementine-libre-1.1.0/src/internet/internetmodel.cpp 2012-10-26 02:15:18.005072563 -0200
+@@ -34,9 +34,6 @@
#ifdef HAVE_LIBLASTFM
#include "lastfmservice.h"
#endif
-#ifdef HAVE_SPOTIFY
- #include "spotifyservice.h"
-#endif
-
- #include <QMimeData>
- #include <QtDebug>
-@@ -75,9 +72,6 @@
- AddService(new SavedRadio(this));
- AddService(new SkyFmService(this));
- AddService(new SomaFMService(this));
+ #ifdef HAVE_GOOGLE_DRIVE
+ #include "googledriveservice.h"
+ #endif
+@@ -79,9 +76,6 @@
+ AddService(new SkyFmService(app, this));
+ AddService(new SomaFMService(app, this));
+ AddService(new SoundCloudService(app, this));
-#ifdef HAVE_SPOTIFY
-- AddService(new SpotifyService(this));
+- AddService(new SpotifyService(app, this));
-#endif
}
void InternetModel::AddService(InternetService *service) {
-diff -rauN clementine-1.0.1/src/internet/spotifyblobdownloader.cpp /dev/null
---- clementine-1.0.1/src/internet/spotifyblobdownloader.cpp 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,222 +0,0 @@
--/* This file is part of Clementine.
-- Copyright 2010, David Sansome <me@davidsansome.com>
--
-- Clementine 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 3 of the License, or
-- (at your option) any later version.
--
-- Clementine 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 Clementine. If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#include "config.h"
--#include "spotifyblobdownloader.h"
--#include "spotifyservice.h"
--#include "core/logging.h"
--#include "core/network.h"
--#include "core/utilities.h"
--
--#include <QDir>
--#include <QMessageBox>
--#include <QNetworkReply>
--#include <QProgressDialog>
--
--#ifdef HAVE_QCA
-- #include <QtCrypto>
--#endif // HAVE_QCA
--
--const char* SpotifyBlobDownloader::kSignatureSuffix = ".sha1";
--
--
--SpotifyBlobDownloader::SpotifyBlobDownloader(
-- const QString& version, const QString& path, QObject* parent)
-- : QObject(parent),
-- version_(version),
-- path_(path),
-- network_(new NetworkAccessManager(this)),
-- progress_(new QProgressDialog(tr("Downloading Spotify plugin"), tr("Cancel"), 0, 0))
--{
-- progress_->setWindowTitle(QCoreApplication::applicationName());
-- connect(progress_, SIGNAL(canceled()), SLOT(Cancel()));
--}
--
--SpotifyBlobDownloader::~SpotifyBlobDownloader() {
-- qDeleteAll(replies_);
-- replies_.clear();
--
-- delete progress_;
--}
--
--bool SpotifyBlobDownloader::Prompt() {
-- QMessageBox::StandardButton ret = QMessageBox::question(NULL,
-- tr("Spotify plugin not installed"),
-- tr("An additional plugin is required to use Spotify in Clementine. Would you like to download and install it now?"),
-- QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
-- return ret == QMessageBox::Yes;
--}
--
--void SpotifyBlobDownloader::Start() {
-- qDeleteAll(replies_);
-- replies_.clear();
--
-- const QStringList filenames = QStringList()
-- << "blob"
-- << "blob" + QString(kSignatureSuffix)
-- << "libspotify.so.10.1.16"
-- << "libspotify.so.10.1.16" + QString(kSignatureSuffix);
--
-- foreach (const QString& filename, filenames) {
-- const QUrl url(SpotifyService::kBlobDownloadUrl + version_ + "/" + filename);
-- qLog(Info) << "Downloading" << url;
--
-- QNetworkReply* reply = network_->get(QNetworkRequest(url));
-- connect(reply, SIGNAL(finished()), SLOT(ReplyFinished()));
-- connect(reply, SIGNAL(downloadProgress(qint64,qint64)), SLOT(ReplyProgress()));
--
-- replies_ << reply;
-- }
--
-- progress_->show();
--}
--
--void SpotifyBlobDownloader::ReplyFinished() {
-- QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-- if (reply->error() != QNetworkReply::NoError) {
-- // Handle network errors
-- ShowError(reply->errorString());
-- return;
-- }
--
-- // Is everything finished?
-- foreach (QNetworkReply* reply, replies_) {
-- if (!reply->isFinished()) {
-- return;
-- }
-- }
--
-- // Read files into memory first.
-- QMap<QString, QByteArray> file_data;
-- QStringList signature_filenames;
--
-- foreach (QNetworkReply* reply, replies_) {
-- const QString filename = reply->url().path().section('/', -1, -1);
--
-- if (filename.endsWith(kSignatureSuffix)) {
-- signature_filenames << filename;
-- }
--
-- file_data[filename] = reply->readAll();
-- }
--
--#ifdef HAVE_QCA
-- // Load the public key
-- QCA::ConvertResult conversion_result;
-- QCA::PublicKey key = QCA::PublicKey::fromPEMFile(":/clementine-spotify-public.pem",
-- &conversion_result);
-- if (QCA::ConvertGood != conversion_result) {
-- ShowError("Failed to load Spotify public key");
-- return;
-- }
--
-- // Verify signatures
-- foreach (const QString& signature_filename, signature_filenames) {
-- QString actual_filename = signature_filename;
-- actual_filename.remove(kSignatureSuffix);
--
-- qLog(Debug) << "Verifying" << actual_filename << "against" << signature_filename;
--
-- if (!key.verifyMessage(file_data[actual_filename],
-- file_data[signature_filename],
-- QCA::EMSA3_SHA1)) {
-- ShowError("Invalid signature: " + actual_filename);
-- return;
-- }
-- }
--#endif // HAVE_QCA
--
-- // Make the destination directory and write the files into it
-- QDir().mkpath(path_);
--
-- foreach (const QString& filename, file_data.keys()) {
-- const QString dest_path = path_ + "/" + filename;
--
-- if (filename.endsWith(kSignatureSuffix))
-- continue;
--
-- qLog(Info) << "Writing" << dest_path;
--
-- QFile file(dest_path);
-- if (!file.open(QIODevice::WriteOnly)) {
-- ShowError("Failed to open " + dest_path + " for writing");
-- return;
-- }
--
-- file.write(file_data[filename]);
-- file.close();
-- file.setPermissions(QFile::Permissions(0x7755));
--
--#ifdef Q_OS_UNIX
-- const int so_pos = filename.lastIndexOf(".so.");
-- if (so_pos != -1) {
-- QString link_path = path_ + "/" + filename.left(so_pos + 3);
-- QStringList version_parts = filename.mid(so_pos + 4).split('.');
--
-- while (!version_parts.isEmpty()) {
-- qLog(Debug) << "Linking" << dest_path << "to" << link_path;
-- int ret = symlink(dest_path.toLocal8Bit().constData(),
-- link_path.toLocal8Bit().constData());
--
-- if (ret != 0) {
-- qLog(Warning) << "Creating symlink failed with return code" << ret;
-- }
--
-- link_path += "." + version_parts.takeFirst();
-- }
-- }
--#endif // Q_OS_UNIX
-- }
--
-- EmitFinished();
--}
--
--void SpotifyBlobDownloader::ReplyProgress() {
-- int progress = 0;
-- int total = 0;
--
-- foreach (QNetworkReply* reply, replies_) {
-- progress += reply->bytesAvailable();
-- total += reply->rawHeader("Content-Length").toInt();
-- }
--
-- progress_->setMaximum(total);
-- progress_->setValue(progress);
--}
--
--void SpotifyBlobDownloader::Cancel() {
-- deleteLater();
--}
--
--void SpotifyBlobDownloader::ShowError(const QString& message) {
-- // Stop any remaining replies before showing the dialog so they don't
-- // carry on in the background
-- foreach (QNetworkReply* reply, replies_) {
-- disconnect(reply, 0, this, 0);
-- reply->abort();
-- }
--
-- qLog(Warning) << message;
-- QMessageBox::warning(NULL, tr("Error downloading Spotify plugin"), message,
-- QMessageBox::Close);
-- deleteLater();
--}
--
--void SpotifyBlobDownloader::EmitFinished() {
-- emit Finished();
-- deleteLater();
--}
-diff -rauN clementine-1.0.1/src/internet/spotifyblobdownloader.h /dev/null
---- clementine-1.0.1/src/internet/spotifyblobdownloader.h 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,63 +0,0 @@
--/* This file is part of Clementine.
-- Copyright 2010, David Sansome <me@davidsansome.com>
--
-- Clementine 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 3 of the License, or
-- (at your option) any later version.
--
-- Clementine 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 Clementine. If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#ifndef SPOTIFYBLOBDOWNLOADER_H
--#define SPOTIFYBLOBDOWNLOADER_H
--
--#include <QObject>
--
--class QNetworkAccessManager;
--class QNetworkReply;
--class QProgressDialog;
--
--class SpotifyBlobDownloader : public QObject {
-- Q_OBJECT
--
--public:
-- SpotifyBlobDownloader(const QString& version, const QString& path,
-- QObject* parent = 0);
-- ~SpotifyBlobDownloader();
--
-- static const char* kSignatureSuffix;
--
-- static bool Prompt();
--
-- void Start();
--
--signals:
-- void Finished();
--
--private slots:
-- void ReplyFinished();
-- void ReplyProgress();
-- void Cancel();
--
--private:
-- void ShowError(const QString& message);
-- void EmitFinished();
--
--private:
-- QString version_;
-- QString path_;
--
-- QNetworkAccessManager* network_;
-- QList<QNetworkReply*> replies_;
--
-- QProgressDialog* progress_;
--};
--
--#endif // SPOTIFYBLOBDOWNLOADER_H
-diff -rauN clementine-1.0.1/src/internet/spotifysearchplaylisttype.cpp /dev/null
---- clementine-1.0.1/src/internet/spotifysearchplaylisttype.cpp 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,49 +0,0 @@
--/* This file is part of Clementine.
-- Copyright 2010, David Sansome <me@davidsansome.com>
--
-- Clementine 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 3 of the License, or
-- (at your option) any later version.
--
-- Clementine 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 Clementine. If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#include "spotifysearchplaylisttype.h"
--#include "spotifyservice.h"
--
--const char* SpotifySearchPlaylistType::kName = "spotify-search";
--
--SpotifySearchPlaylistType::SpotifySearchPlaylistType(SpotifyService* service)
-- : service_(service) {
--}
--
--QIcon SpotifySearchPlaylistType::icon(Playlist* playlist) const {
-- return QIcon(":icons/32x32/spotify.png");
--}
--
--QString SpotifySearchPlaylistType::search_hint_text(Playlist* playlist) const {
-- return QObject::tr("Search Spotify");
--}
--
--QString SpotifySearchPlaylistType::empty_playlist_text(Playlist* playlist) const {
-- return QObject::tr("Start typing in the search box above to find music on %1.").arg("Spotify");
--}
--
--bool SpotifySearchPlaylistType::has_special_search_behaviour(Playlist* playlist) const {
-- return true;
--}
--
--void SpotifySearchPlaylistType::Search(const QString& text, Playlist* playlist) {
-- service_->Search(text, playlist);
--}
--
--void SpotifySearchPlaylistType::DidYouMeanClicked(const QString& text, Playlist* playlist) {
-- service_->Search(text, playlist, true);
--}
-diff -rauN clementine-1.0.1/src/internet/spotifysearchplaylisttype.h /dev/null
---- clementine-1.0.1/src/internet/spotifysearchplaylisttype.h 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,44 +0,0 @@
--/* This file is part of Clementine.
-- Copyright 2010, David Sansome <me@davidsansome.com>
--
-- Clementine 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 3 of the License, or
-- (at your option) any later version.
--
-- Clementine 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 Clementine. If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#ifndef SPOTIFYSEARCHPLAYLISTTYPE_H
--#define SPOTIFYSEARCHPLAYLISTTYPE_H
--
--#include "playlist/specialplaylisttype.h"
--
--class SpotifyService;
--
--class SpotifySearchPlaylistType : public SpecialPlaylistType {
--public:
-- SpotifySearchPlaylistType(SpotifyService* service);
--
-- static const char* kName;
-- virtual QString name() const { return kName; }
--
-- virtual QIcon icon(Playlist* playlist) const;
-- virtual QString search_hint_text(Playlist* playlist) const;
-- virtual QString empty_playlist_text(Playlist* playlist) const;
--
-- virtual bool has_special_search_behaviour(Playlist* playlist) const;
-- virtual void Search(const QString& text, Playlist* playlist);
-- virtual void DidYouMeanClicked(const QString& text, Playlist* playlist);
--
--private:
-- SpotifyService* service_;
--};
--
--#endif // SPOTIFYSEARCHPLAYLISTTYPE_H
-diff -rauN clementine-1.0.1/src/internet/spotifyserver.cpp /dev/null
---- clementine-1.0.1/src/internet/spotifyserver.cpp 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,261 +0,0 @@
--/* This file is part of Clementine.
-- Copyright 2010, David Sansome <me@davidsansome.com>
--
-- Clementine 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 3 of the License, or
-- (at your option) any later version.
--
-- Clementine 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 Clementine. If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#include "spotifyserver.h"
--#include "core/closure.h"
--#include "core/logging.h"
--
--#include "spotifyblob/common/spotifymessages.pb.h"
--#include "spotifyblob/common/spotifymessagehandler.h"
--
--#include <QTcpServer>
--#include <QTcpSocket>
--#include <QTimer>
--
--SpotifyServer::SpotifyServer(QObject* parent)
-- : QObject(parent),
-- server_(new QTcpServer(this)),
-- protocol_socket_(NULL),
-- handler_(NULL),
-- logged_in_(false)
--{
-- connect(server_, SIGNAL(newConnection()), SLOT(NewConnection()));
--}
--
--void SpotifyServer::Init() {
-- if (!server_->listen(QHostAddress::LocalHost)) {
-- qLog(Error) << "Couldn't open server socket" << server_->errorString();
-- }
--}
--
--int SpotifyServer::server_port() const {
-- return server_->serverPort();
--}
--
--void SpotifyServer::NewConnection() {
-- delete protocol_socket_;
-- delete handler_;
--
-- protocol_socket_ = server_->nextPendingConnection();
-- handler_ = new SpotifyMessageHandler(protocol_socket_, this);
-- connect(handler_, SIGNAL(MessageArrived(spotify_pb::SpotifyMessage)),
-- SLOT(HandleMessage(spotify_pb::SpotifyMessage)));
--
-- qLog(Info) << "Connection from port" << protocol_socket_->peerPort();
--
-- // Send any login messages that were queued before the client connected
-- foreach (const spotify_pb::SpotifyMessage& message, queued_login_messages_) {
-- SendMessage(message);
-- }
-- queued_login_messages_.clear();
--}
--
--void SpotifyServer::SendMessage(const spotify_pb::SpotifyMessage& message) {
-- const bool is_login_message = message.has_login_request();
--
-- QList<spotify_pb::SpotifyMessage>* queue =
-- is_login_message ? &queued_login_messages_ : &queued_messages_;
--
-- if (!protocol_socket_ || (!is_login_message && !logged_in_)) {
-- queue->append(message);
-- } else {
-- handler_->SendMessage(message);
-- }
--}
--
--void SpotifyServer::Login(const QString& username, const QString& password,
-- spotify_pb::Bitrate bitrate, bool volume_normalisation) {
-- spotify_pb::SpotifyMessage message;
--
-- spotify_pb::LoginRequest* request = message.mutable_login_request();
-- request->set_username(DataCommaSizeFromQString(username));
-- if (!password.isEmpty()) {
-- request->set_password(DataCommaSizeFromQString(password));
-- }
-- request->mutable_playback_settings()->set_bitrate(bitrate);
-- request->mutable_playback_settings()->set_volume_normalisation(volume_normalisation);
--
-- SendMessage(message);
--}
--
--void SpotifyServer::SetPlaybackSettings(spotify_pb::Bitrate bitrate, bool volume_normalisation) {
-- spotify_pb::SpotifyMessage message;
--
-- spotify_pb::PlaybackSettings* request = message.mutable_set_playback_settings_request();
-- request->set_bitrate(bitrate);
-- request->set_volume_normalisation(volume_normalisation);
--
-- SendMessage(message);
--}
--
--void SpotifyServer::HandleMessage(const spotify_pb::SpotifyMessage& message) {
-- if (message.has_login_response()) {
-- const spotify_pb::LoginResponse& response = message.login_response();
-- logged_in_ = response.success();
--
-- if (response.success()) {
-- // Send any messages that were queued before the client logged in
-- foreach (const spotify_pb::SpotifyMessage& message, queued_messages_) {
-- SendMessage(message);
-- }
-- queued_messages_.clear();
-- }
--
-- emit LoginCompleted(response.success(), QStringFromStdString(response.error()),
-- response.error_code());
-- } else if (message.has_playlists_updated()) {
-- emit PlaylistsUpdated(message.playlists_updated());
-- } else if (message.has_load_playlist_response()) {
-- const spotify_pb::LoadPlaylistResponse& response = message.load_playlist_response();
--
-- switch (response.request().type()) {
-- case spotify_pb::Inbox:
-- emit InboxLoaded(response);
-- break;
--
-- case spotify_pb::Starred:
-- emit StarredLoaded(response);
-- break;
--
-- case spotify_pb::UserPlaylist:
-- emit UserPlaylistLoaded(response);
-- break;
-- }
-- } else if (message.has_playback_error()) {
-- emit PlaybackError(QStringFromStdString(message.playback_error().error()));
-- } else if (message.has_search_response()) {
-- emit SearchResults(message.search_response());
-- } else if (message.has_image_response()) {
-- const spotify_pb::ImageResponse& response = message.image_response();
-- const QString id = QStringFromStdString(response.id());
--
-- if (response.has_data()) {
-- emit ImageLoaded(id, QImage::fromData(QByteArray(
-- response.data().data(), response.data().size())));
-- } else {
-- emit ImageLoaded(id, QImage());
-- }
-- } else if (message.has_sync_playlist_progress()) {
-- emit SyncPlaylistProgress(message.sync_playlist_progress());
-- } else if (message.has_browse_album_response()) {
-- emit AlbumBrowseResults(message.browse_album_response());
-- }
--}
--
--void SpotifyServer::LoadPlaylist(spotify_pb::PlaylistType type, int index) {
-- spotify_pb::SpotifyMessage message;
-- spotify_pb::LoadPlaylistRequest* req = message.mutable_load_playlist_request();
--
-- req->set_type(type);
-- if (index != -1) {
-- req->set_user_playlist_index(index);
-- }
--
-- SendMessage(message);
--}
--
--void SpotifyServer::SyncPlaylist(
-- spotify_pb::PlaylistType type, int index, bool offline) {
-- spotify_pb::SpotifyMessage message;
-- spotify_pb::SyncPlaylistRequest* req = message.mutable_sync_playlist_request();
-- req->mutable_request()->set_type(type);
-- if (index != -1) {
-- req->mutable_request()->set_user_playlist_index(index);
-- }
-- req->set_offline_sync(offline);
--
-- SendMessage(message);
--}
--
--void SpotifyServer::SyncInbox() {
-- SyncPlaylist(spotify_pb::Inbox, -1, true);
--}
--
--void SpotifyServer::SyncStarred() {
-- SyncPlaylist(spotify_pb::Starred, -1, true);
--}
--
--void SpotifyServer::SyncUserPlaylist(int index) {
-- Q_ASSERT(index >= 0);
-- SyncPlaylist(spotify_pb::UserPlaylist, index, true);
--}
--
--void SpotifyServer::LoadInbox() {
-- LoadPlaylist(spotify_pb::Inbox);
--}
--
--void SpotifyServer::LoadStarred() {
-- LoadPlaylist(spotify_pb::Starred);
--}
--
--void SpotifyServer::LoadUserPlaylist(int index) {
-- Q_ASSERT(index >= 0);
-- LoadPlaylist(spotify_pb::UserPlaylist, index);
--}
--
--void SpotifyServer::StartPlaybackLater(const QString& uri, quint16 port) {
-- QTimer* timer = new QTimer(this);
-- connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater()));
--
-- timer->start(100); // lol
-- NewClosure(timer, SIGNAL(timeout()),
-- this, SLOT(StartPlayback(QString,quint16)),
-- uri, port);
--}
--
--void SpotifyServer::StartPlayback(const QString& uri, quint16 port) {
-- spotify_pb::SpotifyMessage message;
-- spotify_pb::PlaybackRequest* req = message.mutable_playback_request();
--
-- req->set_track_uri(DataCommaSizeFromQString(uri));
-- req->set_media_port(port);
-- SendMessage(message);
--}
--
--void SpotifyServer::Seek(qint64 offset_bytes) {
-- spotify_pb::SpotifyMessage message;
-- spotify_pb::SeekRequest* req = message.mutable_seek_request();
--
-- req->set_offset_bytes(offset_bytes);
-- SendMessage(message);
--}
--
--void SpotifyServer::Search(const QString& text, int limit, int limit_album) {
-- spotify_pb::SpotifyMessage message;
-- spotify_pb::SearchRequest* req = message.mutable_search_request();
--
-- req->set_query(DataCommaSizeFromQString(text));
-- req->set_limit(limit);
-- req->set_limit_album(limit_album);
-- SendMessage(message);
--}
--
--void SpotifyServer::LoadImage(const QString& id) {
-- spotify_pb::SpotifyMessage message;
-- spotify_pb::ImageRequest* req = message.mutable_image_request();
--
-- req->set_id(DataCommaSizeFromQString(id));
-- SendMessage(message);
--}
--
--void SpotifyServer::AlbumBrowse(const QString& uri) {
-- spotify_pb::SpotifyMessage message;
-- spotify_pb::BrowseAlbumRequest* req = message.mutable_browse_album_request();
--
-- req->set_uri(DataCommaSizeFromQString(uri));
-- SendMessage(message);
--}
-diff -rauN clementine-1.0.1/src/internet/spotifyserver.h /dev/null
---- clementine-1.0.1/src/internet/spotifyserver.h 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,91 +0,0 @@
--/* This file is part of Clementine.
-- Copyright 2010, David Sansome <me@davidsansome.com>
--
-- Clementine 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 3 of the License, or
-- (at your option) any later version.
--
-- Clementine 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 Clementine. If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#ifndef SPOTIFYSERVER_H
--#define SPOTIFYSERVER_H
--
--#include "spotifyblob/common/spotifymessages.pb.h"
--
--#include <QImage>
--#include <QObject>
--
--class SpotifyMessageHandler;
--
--class QTcpServer;
--class QTcpSocket;
--
--class SpotifyServer : public QObject {
-- Q_OBJECT
--
--public:
-- SpotifyServer(QObject* parent = 0);
--
-- void Init();
-- void Login(const QString& username, const QString& password,
-- spotify_pb::Bitrate bitrate, bool volume_normalisation);
--
-- void LoadStarred();
-- void SyncStarred();
-- void LoadInbox();
-- void SyncInbox();
-- void LoadUserPlaylist(int index);
-- void SyncUserPlaylist(int index);
-- void StartPlaybackLater(const QString& uri, quint16 port);
-- void Search(const QString& text, int limit, int limit_album = 0);
-- void LoadImage(const QString& id);
-- void AlbumBrowse(const QString& uri);
-- void SetPlaybackSettings(spotify_pb::Bitrate bitrate, bool volume_normalisation);
--
-- int server_port() const;
--
--public slots:
-- void StartPlayback(const QString& uri, quint16 port);
-- void Seek(qint64 offset_bytes);
--
--signals:
-- void LoginCompleted(bool success, const QString& error,
-- spotify_pb::LoginResponse_Error error_code);
-- void PlaylistsUpdated(const spotify_pb::Playlists& playlists);
--
-- void StarredLoaded(const spotify_pb::LoadPlaylistResponse& response);
-- void InboxLoaded(const spotify_pb::LoadPlaylistResponse& response);
-- void UserPlaylistLoaded(const spotify_pb::LoadPlaylistResponse& response);
-- void PlaybackError(const QString& message);
-- void SearchResults(const spotify_pb::SearchResponse& response);
-- void ImageLoaded(const QString& id, const QImage& image);
-- void SyncPlaylistProgress(const spotify_pb::SyncPlaylistProgress& progress);
-- void AlbumBrowseResults(const spotify_pb::BrowseAlbumResponse& response);
--
--private slots:
-- void NewConnection();
-- void HandleMessage(const spotify_pb::SpotifyMessage& message);
--
--private:
-- void LoadPlaylist(spotify_pb::PlaylistType type, int index = -1);
-- void SyncPlaylist(spotify_pb::PlaylistType type, int index, bool offline);
-- void SendMessage(const spotify_pb::SpotifyMessage& message);
--
-- QTcpServer* server_;
-- QTcpSocket* protocol_socket_;
-- SpotifyMessageHandler* handler_;
-- bool logged_in_;
--
-- QList<spotify_pb::SpotifyMessage> queued_login_messages_;
-- QList<spotify_pb::SpotifyMessage> queued_messages_;
--};
--
--#endif // SPOTIFYSERVER_H
-diff -rauN clementine-1.0.1/src/internet/spotifyservice.cpp /dev/null
---- clementine-1.0.1/src/internet/spotifyservice.cpp 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,669 +0,0 @@
--#include "config.h"
--#include "internetmodel.h"
--#include "spotifyblobdownloader.h"
--#include "spotifyserver.h"
--#include "spotifyservice.h"
--#include "spotifysearchplaylisttype.h"
--#include "core/database.h"
--#include "core/logging.h"
--#include "core/player.h"
--#include "core/taskmanager.h"
--#include "core/timeconstants.h"
--#include "core/utilities.h"
--#include "globalsearch/globalsearch.h"
--#include "globalsearch/spotifysearchprovider.h"
--#include "playlist/playlist.h"
--#include "playlist/playlistcontainer.h"
--#include "playlist/playlistmanager.h"
--#include "spotifyblob/common/blobversion.h"
--#include "spotifyblob/common/spotifymessagehandler.h"
--#include "widgets/didyoumean.h"
--#include "ui/iconloader.h"
--
--#include <QCoreApplication>
--#include <QFile>
--#include <QFileInfo>
--#include <QMenu>
--#include <QMessageBox>
--#include <QProcess>
--#include <QSettings>
--#include <QVariant>
--
--Q_DECLARE_METATYPE(QStandardItem*);
--
--const char* SpotifyService::kServiceName = "Spotify";
--const char* SpotifyService::kSettingsGroup = "Spotify";
--const char* SpotifyService::kBlobDownloadUrl = "http://spotify.clementine-player.org/";
--const int SpotifyService::kSearchDelayMsec = 400;
--
--SpotifyService::SpotifyService(InternetModel* parent)
-- : InternetService(kServiceName, parent, parent),
-- server_(NULL),
-- blob_process_(NULL),
-- root_(NULL),
-- search_(NULL),
-- starred_(NULL),
-- inbox_(NULL),
-- login_task_id_(0),
-- pending_search_playlist_(NULL),
-- context_menu_(NULL),
-- search_delay_(new QTimer(this)),
-- login_state_(LoginState_OtherError),
-- bitrate_(spotify_pb::Bitrate320k),
-- volume_normalisation_(false)
--{
-- // Build the search path for the binary blob.
-- // Look for one distributed alongside clementine first, then check in the
-- // user's home directory for any that have been downloaded.
--#ifdef Q_OS_MAC
-- system_blob_path_ = QCoreApplication::applicationDirPath() +
-- "/../PlugIns/clementine-spotifyblob";
--#else
-- system_blob_path_ = QCoreApplication::applicationDirPath() +
-- "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
--#endif
--
-- local_blob_version_ = QString("version%1-%2bit").arg(SPOTIFY_BLOB_VERSION).arg(sizeof(void*) * 8);
-- local_blob_path_ = Utilities::GetConfigPath(Utilities::Path_LocalSpotifyBlob) +
-- "/" + local_blob_version_ + "/blob";
--
-- qLog(Debug) << "Spotify system blob path:" << system_blob_path_;
-- qLog(Debug) << "Spotify local blob path:" << local_blob_path_;
--
-- model()->player()->playlists()->RegisterSpecialPlaylistType(
-- new SpotifySearchPlaylistType(this));
--
-- model()->global_search()->AddProvider(new SpotifySearchProvider(this));
--
-- search_delay_->setInterval(kSearchDelayMsec);
-- search_delay_->setSingleShot(true);
-- connect(search_delay_, SIGNAL(timeout()), SLOT(DoSearch()));
--}
--
--SpotifyService::~SpotifyService() {
-- if (blob_process_ && blob_process_->state() == QProcess::Running) {
-- qLog(Info) << "Terminating blob process...";
-- blob_process_->terminate();
-- blob_process_->waitForFinished(1000);
-- }
--}
--
--QStandardItem* SpotifyService::CreateRootItem() {
-- root_ = new QStandardItem(QIcon(":icons/22x22/spotify.png"), kServiceName);
-- root_->setData(true, InternetModel::Role_CanLazyLoad);
-- return root_;
--}
--
--void SpotifyService::LazyPopulate(QStandardItem* item) {
-- switch (item->data(InternetModel::Role_Type).toInt()) {
-- case InternetModel::Type_Service:
-- EnsureServerCreated();
-- break;
--
-- case Type_SearchResults:
-- break;
--
-- case Type_InboxPlaylist:
-- EnsureServerCreated();
-- server_->LoadInbox();
-- break;
--
-- case Type_StarredPlaylist:
-- EnsureServerCreated();
-- server_->LoadStarred();
-- break;
--
-- case InternetModel::Type_UserPlaylist:
-- EnsureServerCreated();
-- server_->LoadUserPlaylist(item->data(Role_UserPlaylistIndex).toInt());
-- break;
--
-- default:
-- break;
-- }
--
-- return;
--}
--
--QModelIndex SpotifyService::GetCurrentIndex() {
-- return QModelIndex();
--}
--
--void SpotifyService::Login(const QString& username, const QString& password) {
-- Logout();
-- EnsureServerCreated(username, password);
--}
--
--void SpotifyService::LoginCompleted(bool success, const QString& error,
-- spotify_pb::LoginResponse_Error error_code) {
-- if (login_task_id_) {
-- model()->task_manager()->SetTaskFinished(login_task_id_);
-- login_task_id_ = 0;
-- }
--
-- if (!success) {
-- bool show_error_dialog = true;
-- QString error_copy(error);
--
-- switch (error_code) {
-- case spotify_pb::LoginResponse_Error_BadUsernameOrPassword:
-- login_state_ = LoginState_BadCredentials;
-- break;
--
-- case spotify_pb::LoginResponse_Error_UserBanned:
-- login_state_ = LoginState_Banned;
-- break;
--
-- case spotify_pb::LoginResponse_Error_UserNeedsPremium:
-- login_state_ = LoginState_NoPremium;
-- break;
--
-- case spotify_pb::LoginResponse_Error_ReloginFailed:
-- if (login_state_ == LoginState_LoggedIn) {
-- // This is the first time the relogin has failed - show a message this
-- // time only.
-- error_copy = tr("You have been logged out of Spotify, please re-enter your password in the Settings dialog.");
-- } else {
-- show_error_dialog = false;
-- }
--
-- login_state_ = LoginState_ReloginFailed;
-- break;
--
-- default:
-- login_state_ = LoginState_OtherError;
-- break;
-- }
--
-- if (show_error_dialog) {
-- QMessageBox::warning(NULL, tr("Spotify login error"), error_copy, QMessageBox::Close);
-- }
-- } else {
-- login_state_ = LoginState_LoggedIn;
-- }
--
-- QSettings s;
-- s.beginGroup(kSettingsGroup);
-- s.setValue("login_state", login_state_);
--
-- emit LoginFinished(success);
--}
--
--void SpotifyService::BlobProcessError(QProcess::ProcessError error) {
-- qLog(Error) << "Spotify blob process failed:" << error;
-- blob_process_->deleteLater();
-- blob_process_ = NULL;
--
-- if (login_task_id_) {
-- model()->task_manager()->SetTaskFinished(login_task_id_);
-- }
--}
--
--void SpotifyService::ReloadSettings() {
-- QSettings s;
-- s.beginGroup(kSettingsGroup);
--
-- login_state_ = LoginState(s.value("login_state", LoginState_OtherError).toInt());
-- bitrate_ = static_cast<spotify_pb::Bitrate>(
-- s.value("bitrate", spotify_pb::Bitrate320k).toInt());
-- volume_normalisation_ = s.value("volume_normalisation", false).toBool();
--
-- if (server_ && blob_process_) {
-- server_->SetPlaybackSettings(bitrate_, volume_normalisation_);
-- }
--}
--
--void SpotifyService::EnsureServerCreated(const QString& username,
-- const QString& password) {
-- if (server_ && blob_process_) {
-- return;
-- }
--
-- delete server_;
-- server_ = new SpotifyServer(this);
--
-- connect(server_, SIGNAL(LoginCompleted(bool,QString,spotify_pb::LoginResponse_Error)),
-- SLOT(LoginCompleted(bool,QString,spotify_pb::LoginResponse_Error)));
-- connect(server_, SIGNAL(PlaylistsUpdated(spotify_pb::Playlists)),
-- SLOT(PlaylistsUpdated(spotify_pb::Playlists)));
-- connect(server_, SIGNAL(InboxLoaded(spotify_pb::LoadPlaylistResponse)),
-- SLOT(InboxLoaded(spotify_pb::LoadPlaylistResponse)));
-- connect(server_, SIGNAL(StarredLoaded(spotify_pb::LoadPlaylistResponse)),
-- SLOT(StarredLoaded(spotify_pb::LoadPlaylistResponse)));
-- connect(server_, SIGNAL(UserPlaylistLoaded(spotify_pb::LoadPlaylistResponse)),
-- SLOT(UserPlaylistLoaded(spotify_pb::LoadPlaylistResponse)));
-- connect(server_, SIGNAL(PlaybackError(QString)),
-- SIGNAL(StreamError(QString)));
-- connect(server_, SIGNAL(SearchResults(spotify_pb::SearchResponse)),
-- SLOT(SearchResults(spotify_pb::SearchResponse)));
-- connect(server_, SIGNAL(ImageLoaded(QString,QImage)),
-- SIGNAL(ImageLoaded(QString,QImage)));
-- connect(server_, SIGNAL(SyncPlaylistProgress(spotify_pb::SyncPlaylistProgress)),
-- SLOT(SyncPlaylistProgress(spotify_pb::SyncPlaylistProgress)));
--
-- server_->Init();
--
-- login_task_id_ = model()->task_manager()->StartTask(tr("Connecting to Spotify"));
--
-- QString login_username = username;
-- QString login_password = password;
--
-- if (username.isEmpty()) {
-- QSettings s;
-- s.beginGroup(kSettingsGroup);
--
-- login_username = s.value("username").toString();
-- login_password = QString();
-- }
--
-- server_->Login(login_username, login_password, bitrate_, volume_normalisation_);
--
-- StartBlobProcess();
--}
--
--void SpotifyService::StartBlobProcess() {
-- // Try to find an executable to run
-- QString blob_path;
-- QProcessEnvironment env(QProcessEnvironment::systemEnvironment());
--
-- // Look in the system search path first
-- if (QFile::exists(system_blob_path_)) {
-- blob_path = system_blob_path_;
-- }
--
-- // Next look in the local path
-- if (blob_path.isEmpty()) {
-- if (QFile::exists(local_blob_path_)) {
-- blob_path = local_blob_path_;
-- env.insert("LD_LIBRARY_PATH", QFileInfo(local_blob_path_).path());
-- }
-- }
--
-- if (blob_path.isEmpty()) {
-- // If the blob still wasn't found then we'll prompt the user to download one
-- if (login_task_id_) {
-- model()->task_manager()->SetTaskFinished(login_task_id_);
-- }
--
-- #ifdef Q_OS_LINUX
-- if (SpotifyBlobDownloader::Prompt()) {
-- InstallBlob();
-- }
-- #endif
--
-- return;
-- }
--
-- delete blob_process_;
-- blob_process_ = new QProcess(this);
-- blob_process_->setProcessChannelMode(QProcess::ForwardedChannels);
-- blob_process_->setProcessEnvironment(env);
--
-- connect(blob_process_,
-- SIGNAL(error(QProcess::ProcessError)),
-- SLOT(BlobProcessError(QProcess::ProcessError)));
--
-- qLog(Info) << "Starting" << blob_path;
-- blob_process_->start(
-- blob_path, QStringList() << QString::number(server_->server_port()));
--}
--
--bool SpotifyService::IsBlobInstalled() const {
-- return QFile::exists(system_blob_path_) ||
-- QFile::exists(local_blob_path_);
--}
--
--void SpotifyService::InstallBlob() {
-- // The downloader deletes itself when it finishes
-- SpotifyBlobDownloader* downloader = new SpotifyBlobDownloader(
-- local_blob_version_, QFileInfo(local_blob_path_).path(), this);
-- connect(downloader, SIGNAL(Finished()), SLOT(BlobDownloadFinished()));
-- connect(downloader, SIGNAL(Finished()), SIGNAL(BlobStateChanged()));
-- downloader->Start();
--}
--
--void SpotifyService::BlobDownloadFinished() {
-- EnsureServerCreated();
--}
--
--void SpotifyService::PlaylistsUpdated(const spotify_pb::Playlists& response) {
-- if (login_task_id_) {
-- model()->task_manager()->SetTaskFinished(login_task_id_);
-- login_task_id_ = 0;
-- }
--
-- // Create starred and inbox playlists if they're not here already
-- if (!search_) {
-- search_ = new QStandardItem(IconLoader::Load("edit-find"),
-- tr("Search Spotify (opens a new tab)"));
-- search_->setData(Type_SearchResults, InternetModel::Role_Type);
-- search_->setData(InternetModel::PlayBehaviour_DoubleClickAction,
-- InternetModel::Role_PlayBehaviour);
--
-- starred_ = new QStandardItem(QIcon(":/star-on.png"), tr("Starred"));
-- starred_->setData(Type_StarredPlaylist, InternetModel::Role_Type);
-- starred_->setData(true, InternetModel::Role_CanLazyLoad);
--
-- inbox_ = new QStandardItem(IconLoader::Load("mail-message"), tr("Inbox"));
-- inbox_->setData(Type_InboxPlaylist, InternetModel::Role_Type);
-- inbox_->setData(true, InternetModel::Role_CanLazyLoad);
--
-- root_->appendRow(search_);
-- root_->appendRow(starred_);
-- root_->appendRow(inbox_);
-- }
--
-- // Don't do anything if the playlists haven't changed since last time.
-- if (!DoPlaylistsDiffer(response)) {
-- qLog(Debug) << "Playlists haven't changed - not updating";
-- return;
-- }
--
-- // Remove and recreate the other playlists
-- foreach (QStandardItem* item, playlists_) {
-- item->parent()->removeRow(item->row());
-- }
-- playlists_.clear();
--
-- for (int i=0 ; i<response.playlist_size() ; ++i) {
-- const spotify_pb::Playlists::Playlist& msg = response.playlist(i);
--
-- QStandardItem* item = new QStandardItem(QStringFromStdString(msg.name()));
-- item->setData(InternetModel::Type_UserPlaylist, InternetModel::Role_Type);
-- item->setData(true, InternetModel::Role_CanLazyLoad);
-- item->setData(msg.index(), Role_UserPlaylistIndex);
-- item->setData(InternetModel::PlayBehaviour_SingleItem, InternetModel::Role_PlayBehaviour);
--
-- root_->appendRow(item);
-- playlists_ << item;
--
-- // Preload the playlist items so that drag & drop works immediately.
-- LazyPopulate(item);
-- }
--}
--
--bool SpotifyService::DoPlaylistsDiffer(const spotify_pb::Playlists& response) const {
-- if (playlists_.count() != response.playlist_size()) {
-- return true;
-- }
--
-- for (int i=0 ; i<response.playlist_size() ; ++i) {
-- const spotify_pb::Playlists::Playlist& msg = response.playlist(i);
-- const QStandardItem* item = PlaylistBySpotifyIndex(msg.index());
--
-- if (!item) {
-- return true;
-- }
--
-- if (QStringFromStdString(msg.name()) != item->text()) {
-- return true;
-- }
-- }
--
-- return false;
--}
--
--void SpotifyService::InboxLoaded(const spotify_pb::LoadPlaylistResponse& response) {
-- FillPlaylist(inbox_, response);
--}
--
--void SpotifyService::StarredLoaded(const spotify_pb::LoadPlaylistResponse& response) {
-- FillPlaylist(starred_, response);
--}
--
--QStandardItem* SpotifyService::PlaylistBySpotifyIndex(int index) const {
-- foreach (QStandardItem* item, playlists_) {
-- if (item->data(Role_UserPlaylistIndex).toInt() == index) {
-- return item;
-- }
-- }
-- return NULL;
--}
--
--void SpotifyService::UserPlaylistLoaded(const spotify_pb::LoadPlaylistResponse& response) {
-- // Find a playlist with this index
-- QStandardItem* item = PlaylistBySpotifyIndex(response.request().user_playlist_index());
-- if (item) {
-- FillPlaylist(item, response);
-- }
--}
--
--void SpotifyService::FillPlaylist(QStandardItem* item, const spotify_pb::LoadPlaylistResponse& response) {
-- qLog(Debug) << "Filling playlist:" << item->text();
-- if (item->hasChildren())
-- item->removeRows(0, item->rowCount());
--
-- for (int i=0 ; i<response.track_size() ; ++i) {
-- Song song;
-- SongFromProtobuf(response.track(i), &song);
--
-- QStandardItem* child = new QStandardItem(song.PrettyTitleWithArtist());
-- child->setData(Type_Track, InternetModel::Role_Type);
-- child->setData(QVariant::fromValue(song), InternetModel::Role_SongMetadata);
-- child->setData(InternetModel::PlayBehaviour_SingleItem, InternetModel::Role_PlayBehaviour);
-- child->setData(song.url(), InternetModel::Role_Url);
--
-- item->appendRow(child);
-- }
--}
--
--void SpotifyService::SongFromProtobuf(const spotify_pb::Track& track, Song* song) {
-- song->set_rating(track.starred() ? 1.0 : 0.0);
-- song->set_title(QStringFromStdString(track.title()));
-- song->set_album(QStringFromStdString(track.album()));
-- song->set_length_nanosec(track.duration_msec() * kNsecPerMsec);
-- song->set_score(track.popularity());
-- song->set_disc(track.disc());
-- song->set_track(track.track());
-- song->set_year(track.year());
-- song->set_url(QUrl(QStringFromStdString(track.uri())));
-- song->set_art_automatic("spotify://image/" + QStringFromStdString(track.album_art_id()));
--
-- QStringList artists;
-- for (int i=0 ; i<track.artist_size() ; ++i) {
-- artists << QStringFromStdString(track.artist(i));
-- }
--
-- song->set_artist(artists.join(", "));
--
-- song->set_filetype(Song::Type_Stream);
-- song->set_valid(true);
-- song->set_directory_id(0);
-- song->set_mtime(0);
-- song->set_ctime(0);
-- song->set_filesize(0);
--}
--
--PlaylistItem::Options SpotifyService::playlistitem_options() const {
-- return PlaylistItem::PauseDisabled | PlaylistItem::SeekDisabled;
--}
--
--void SpotifyService::EnsureMenuCreated() {
-- if (context_menu_)
-- return;
--
-- context_menu_ = new QMenu;
--
-- context_menu_->addActions(GetPlaylistActions());
-- context_menu_->addSeparator();
-- context_menu_->addAction(IconLoader::Load("edit-find"), tr("Search Spotify (opens a new tab)..."), this, SLOT(OpenSearchTab()));
-- context_menu_->addSeparator();
-- context_menu_->addAction(IconLoader::Load("configure"), tr("Configure Spotify..."), this, SLOT(ShowConfig()));
--
-- playlist_context_menu_ = new QMenu;
-- playlist_sync_action_ = playlist_context_menu_->addAction(
-- IconLoader::Load("view-refresh"),
-- tr("Make playlist available offline"),
-- this,
-- SLOT(SyncPlaylist()));
--}
--
--void SpotifyService::SyncPlaylist() {
-- QStandardItem* item = playlist_sync_action_->data().value<QStandardItem*>();
-- Q_ASSERT(item);
--
-- switch (item->data(InternetModel::Role_Type).toInt()) {
-- case InternetModel::Type_UserPlaylist: {
-- int index = item->data(Role_UserPlaylistIndex).toInt();
-- server_->SyncUserPlaylist(index);
-- playlist_sync_ids_[index] =
-- model()->task_manager()->StartTask(tr("Syncing Spotify playlist"));
-- break;
-- }
-- case Type_InboxPlaylist:
-- server_->SyncInbox();
-- inbox_sync_id_ = model()->task_manager()->StartTask(tr("Syncing Spotify inbox"));
-- break;
-- case Type_StarredPlaylist:
-- server_->SyncStarred();
-- starred_sync_id_ = model()->task_manager()->StartTask(tr("Syncing Spotify starred tracks"));
-- break;
-- default:
-- break;
-- }
--}
--
--void SpotifyService::Search(const QString& text, Playlist* playlist, bool now) {
-- EnsureServerCreated();
--
-- pending_search_ = text;
-- pending_search_playlist_ = playlist;
--
-- if (now) {
-- search_delay_->stop();
-- DoSearch();
-- } else {
-- search_delay_->start();
-- }
--}
--
--void SpotifyService::DoSearch() {
-- if (!pending_search_.isEmpty()) {
-- server_->Search(pending_search_, 200);
-- }
--}
--
--void SpotifyService::SearchResults(const spotify_pb::SearchResponse& response) {
-- if (QStringFromStdString(response.request().query()) != pending_search_) {
-- qLog(Debug) << "Old search result for"
-- << QStringFromStdString(response.request().query())
-- << "expecting" << pending_search_;
-- return;
-- }
-- pending_search_.clear();
--
-- SongList songs;
-- for (int i=0 ; i<response.result_size() ; ++i) {
-- Song song;
-- SongFromProtobuf(response.result(i), &song);
-- songs << song;
-- }
--
-- qLog(Debug) << "Got" << songs.count() << "results";
--
-- pending_search_playlist_->Clear();
-- pending_search_playlist_->InsertSongs(songs);
--
-- const QString did_you_mean = QStringFromStdString(response.did_you_mean());
-- if (!did_you_mean.isEmpty()) {
-- model()->player()->playlists()->playlist_container()->did_you_mean()->Show(did_you_mean);
-- }
--}
--
--SpotifyServer* SpotifyService::server() const {
-- SpotifyService* nonconst_this = const_cast<SpotifyService*>(this);
--
-- if (QThread::currentThread() != thread()) {
-- metaObject()->invokeMethod(nonconst_this, "EnsureServerCreated",
-- Qt::BlockingQueuedConnection);
-- } else {
-- nonconst_this->EnsureServerCreated();
-- }
--
-- return server_;
--}
--
--void SpotifyService::ShowContextMenu(const QModelIndex& index, const QPoint& global_pos) {
-- EnsureMenuCreated();
-- QStandardItem* item = model()->itemFromIndex(index);
-- if (item) {
-- int type = item->data(InternetModel::Role_Type).toInt();
-- if (type == Type_InboxPlaylist ||
-- type == Type_StarredPlaylist ||
-- type == InternetModel::Type_UserPlaylist) {
-- playlist_sync_action_->setData(qVariantFromValue(item));
-- playlist_context_menu_->popup(global_pos);
-- return;
-- }
-- }
--
-- context_menu_->popup(global_pos);
--}
--
--void SpotifyService::OpenSearchTab() {
-- model()->player()->playlists()->New(tr("Search Spotify"), SongList(),
-- SpotifySearchPlaylistType::kName);
--}
--
--void SpotifyService::ItemDoubleClicked(QStandardItem* item) {
-- if (item == search_) {
-- OpenSearchTab();
-- }
--}
--
--void SpotifyService::LoadImage(const QString& id) {
-- EnsureServerCreated();
-- server_->LoadImage(id);
--}
--
--void SpotifyService::SyncPlaylistProgress(
-- const spotify_pb::SyncPlaylistProgress& progress) {
-- qLog(Debug) << "Sync progress:" << progress.sync_progress();
-- int task_id = -1;
-- switch (progress.request().type()) {
-- case spotify_pb::Inbox:
-- task_id = inbox_sync_id_;
-- break;
-- case spotify_pb::Starred:
-- task_id = starred_sync_id_;
-- break;
-- case spotify_pb::UserPlaylist: {
-- QMap<int, int>::const_iterator it = playlist_sync_ids_.constFind(
-- progress.request().user_playlist_index());
-- if (it != playlist_sync_ids_.constEnd()) {
-- task_id = it.value();
-- }
-- break;
-- }
-- default:
-- break;
-- }
-- if (task_id == -1) {
-- qLog(Warning) << "Received sync progress for unknown playlist";
-- return;
-- }
-- model()->task_manager()->SetTaskProgress(task_id, progress.sync_progress(), 100);
-- if (progress.sync_progress() == 100) {
-- model()->task_manager()->SetTaskFinished(task_id);
-- if (progress.request().type() == spotify_pb::UserPlaylist) {
-- playlist_sync_ids_.remove(task_id);
-- }
-- }
--}
--
--void SpotifyService::ShowConfig() {
-- emit OpenSettingsAtPage(SettingsDialog::Page_Spotify);
--}
--
--void SpotifyService::Logout() {
-- delete server_;
-- delete blob_process_;
-- server_ = NULL;
-- blob_process_ = NULL;
--
-- login_state_ = LoginState_OtherError;
--
-- QSettings s;
-- s.beginGroup(kSettingsGroup);
-- s.setValue("login_state", login_state_);
--}
-diff -rauN clementine-1.0.1/src/internet/spotifyservice.h /dev/null
---- clementine-1.0.1/src/internet/spotifyservice.h 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,147 +0,0 @@
--#ifndef SPOTIFYSERVICE_H
--#define SPOTIFYSERVICE_H
--
--#include "internetmodel.h"
--#include "internetservice.h"
--#include "spotifyblob/common/spotifymessages.pb.h"
--
--#include <QProcess>
--#include <QTimer>
--
--#include <boost/shared_ptr.hpp>
--
--class Playlist;
--class SpotifyServer;
--
--class QMenu;
--
--class SpotifyService : public InternetService {
-- Q_OBJECT
--
--public:
-- SpotifyService(InternetModel* parent);
-- ~SpotifyService();
--
-- enum Type {
-- Type_SearchResults = InternetModel::TypeCount,
-- Type_StarredPlaylist,
-- Type_InboxPlaylist,
-- Type_Track,
-- };
--
-- enum Role {
-- Role_UserPlaylistIndex = InternetModel::RoleCount,
-- };
--
-- // Values are persisted - don't change.
-- enum LoginState {
-- LoginState_LoggedIn = 1,
-- LoginState_Banned = 2,
-- LoginState_BadCredentials = 3,
-- LoginState_NoPremium = 4,
-- LoginState_OtherError = 5,
-- LoginState_ReloginFailed = 6
-- };
--
-- static const char* kServiceName;
-- static const char* kSettingsGroup;
-- static const char* kBlobDownloadUrl;
-- static const int kSearchDelayMsec;
--
-- void ReloadSettings();
--
-- QStandardItem* CreateRootItem();
-- void LazyPopulate(QStandardItem* parent);
-- void ShowContextMenu(const QModelIndex& index, const QPoint& global_pos);
-- void ItemDoubleClicked(QStandardItem* item);
-- PlaylistItem::Options playlistitem_options() const;
--
-- void Logout();
-- void Login(const QString& username, const QString& password);
-- void Search(const QString& text, Playlist* playlist, bool now = false);
-- Q_INVOKABLE void LoadImage(const QString& id);
--
-- SpotifyServer* server() const;
--
-- bool IsBlobInstalled() const;
-- void InstallBlob();
--
-- // Persisted in the settings and updated on each Login().
-- LoginState login_state() const { return login_state_; }
-- bool IsLoggedIn() const { return login_state_ == LoginState_LoggedIn; }
--
-- static void SongFromProtobuf(const spotify_pb::Track& track, Song* song);
--
--signals:
-- void BlobStateChanged();
-- void LoginFinished(bool success);
-- void ImageLoaded(const QString& id, const QImage& image);
--
--public slots:
-- void ShowConfig();
--
--protected:
-- virtual QModelIndex GetCurrentIndex();
--
--private:
-- void StartBlobProcess();
-- void FillPlaylist(QStandardItem* item, const spotify_pb::LoadPlaylistResponse& response);
-- void EnsureMenuCreated();
--
-- QStandardItem* PlaylistBySpotifyIndex(int index) const;
-- bool DoPlaylistsDiffer(const spotify_pb::Playlists& response) const;
--
--private slots:
-- void EnsureServerCreated(const QString& username = QString(),
-- const QString& password = QString());
-- void BlobProcessError(QProcess::ProcessError error);
-- void LoginCompleted(bool success, const QString& error,
-- spotify_pb::LoginResponse_Error error_code);
-- void PlaylistsUpdated(const spotify_pb::Playlists& response);
-- void InboxLoaded(const spotify_pb::LoadPlaylistResponse& response);
-- void StarredLoaded(const spotify_pb::LoadPlaylistResponse& response);
-- void UserPlaylistLoaded(const spotify_pb::LoadPlaylistResponse& response);
-- void SearchResults(const spotify_pb::SearchResponse& response);
-- void SyncPlaylistProgress(const spotify_pb::SyncPlaylistProgress& progress);
--
-- void OpenSearchTab();
-- void DoSearch();
--
-- void SyncPlaylist();
-- void BlobDownloadFinished();
--
--private:
-- SpotifyServer* server_;
--
-- QString system_blob_path_;
-- QString local_blob_version_;
-- QString local_blob_path_;
-- QProcess* blob_process_;
--
-- QStandardItem* root_;
-- QStandardItem* search_;
-- QStandardItem* starred_;
-- QStandardItem* inbox_;
-- QList<QStandardItem*> playlists_;
--
-- int login_task_id_;
-- QString pending_search_;
-- Playlist* pending_search_playlist_;
--
-- QMenu* context_menu_;
-- QMenu* playlist_context_menu_;
-- QAction* playlist_sync_action_;
-- QModelIndex context_item_;
--
-- QTimer* search_delay_;
--
-- int inbox_sync_id_;
-- int starred_sync_id_;
-- QMap<int, int> playlist_sync_ids_;
--
-- LoginState login_state_;
-- spotify_pb::Bitrate bitrate_;
-- bool volume_normalisation_;
--};
--
--#endif
-diff -rauN clementine-1.0.1/src/internet/spotifysettingspage.cpp /dev/null
---- clementine-1.0.1/src/internet/spotifysettingspage.cpp 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,172 +0,0 @@
--/* This file is part of Clementine.
-- Copyright 2010, David Sansome <me@davidsansome.com>
--
-- Clementine 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 3 of the License, or
-- (at your option) any later version.
--
-- Clementine 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 Clementine. If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#include "spotifysettingspage.h"
--
--#include "spotifyservice.h"
--#include "internetmodel.h"
--#include "ui_spotifysettingspage.h"
--#include "core/network.h"
--#include "spotifyblob/common/spotifymessages.pb.h"
--#include "ui/iconloader.h"
--
--#include <QMessageBox>
--#include <QNetworkReply>
--#include <QNetworkRequest>
--#include <QSettings>
--#include <QtDebug>
--
--SpotifySettingsPage::SpotifySettingsPage(SettingsDialog* dialog)
-- : SettingsPage(dialog),
-- network_(new NetworkAccessManager(this)),
-- ui_(new Ui_SpotifySettingsPage),
-- service_(InternetModel::Service<SpotifyService>()),
-- validated_(false)
--{
-- ui_->setupUi(this);
--
-- setWindowIcon(QIcon(":/icons/48x48/spotify.png"));
--
-- QFont bold_font(font());
-- bold_font.setBold(true);
-- ui_->blob_status->setFont(bold_font);
--
-- connect(ui_->download_blob, SIGNAL(clicked()), SLOT(DownloadBlob()));
-- connect(ui_->login, SIGNAL(clicked()), SLOT(Login()));
-- connect(ui_->login_state, SIGNAL(LogoutClicked()), SLOT(Logout()));
-- connect(ui_->login_state, SIGNAL(LoginClicked()), SLOT(Login()));
--
-- connect(service_, SIGNAL(LoginFinished(bool)), SLOT(LoginFinished(bool)));
-- connect(service_, SIGNAL(BlobStateChanged()), SLOT(BlobStateChanged()));
--
-- ui_->login_state->AddCredentialField(ui_->username);
-- ui_->login_state->AddCredentialField(ui_->password);
-- ui_->login_state->AddCredentialGroup(ui_->account_group);
--
-- ui_->bitrate->addItem("96 " + tr("kbps"), spotify_pb::Bitrate96k);
-- ui_->bitrate->addItem("160 " + tr("kbps"), spotify_pb::Bitrate160k);
-- ui_->bitrate->addItem("320 " + tr("kbps"), spotify_pb::Bitrate320k);
--
-- BlobStateChanged();
--}
--
--SpotifySettingsPage::~SpotifySettingsPage() {
-- delete ui_;
--}
--
--void SpotifySettingsPage::BlobStateChanged() {
-- const bool installed = service_->IsBlobInstalled();
--
-- ui_->account_group->setEnabled(installed);
-- ui_->blob_status->setText(installed ? tr("Installed") : tr("Not installed"));
--
--#ifdef Q_OS_LINUX
-- ui_->download_blob->setEnabled(!installed);
--#else
-- ui_->download_blob->setEnabled(false);
--#endif
--}
--
--void SpotifySettingsPage::DownloadBlob() {
-- service_->InstallBlob();
--}
--
--void SpotifySettingsPage::Login() {
-- if (!service_->IsBlobInstalled()) {
-- return;
-- }
--
-- if (ui_->username->text() == original_username_ &&
-- ui_->password->text() == original_password_ &&
-- service_->login_state() == SpotifyService::LoginState_LoggedIn) {
-- return;
-- }
--
-- ui_->login_state->SetLoggedIn(LoginStateWidget::LoginInProgress);
-- service_->Login(ui_->username->text(), ui_->password->text());
--}
--
--void SpotifySettingsPage::Load() {
-- QSettings s;
-- s.beginGroup(SpotifyService::kSettingsGroup);
--
-- original_username_ = s.value("username").toString();
--
-- ui_->username->setText(original_username_);
-- validated_ = false;
--
-- ui_->bitrate->setCurrentIndex(ui_->bitrate->findData(
-- s.value("bitrate", spotify_pb::Bitrate320k).toInt()));
-- ui_->volume_normalisation->setChecked(
-- s.value("volume_normalisation", false).toBool());
--
-- UpdateLoginState();
--}
--
--void SpotifySettingsPage::Save() {
-- QSettings s;
-- s.beginGroup(SpotifyService::kSettingsGroup);
--
-- s.setValue("username", ui_->username->text());
-- s.setValue("password", ui_->password->text());
--
-- s.setValue("bitrate", ui_->bitrate->itemData(ui_->bitrate->currentIndex()).toInt());
-- s.setValue("volume_normalisation", ui_->volume_normalisation->isChecked());
--}
--
--void SpotifySettingsPage::LoginFinished(bool success) {
-- validated_ = success;
--
-- Save();
-- UpdateLoginState();
--}
--
--void SpotifySettingsPage::UpdateLoginState() {
-- const bool logged_in =
-- service_->login_state() == SpotifyService::LoginState_LoggedIn;
--
-- ui_->login_state->SetLoggedIn(logged_in ? LoginStateWidget::LoggedIn
-- : LoginStateWidget::LoggedOut,
-- ui_->username->text());
-- ui_->login_state->SetAccountTypeVisible(!logged_in);
--
-- switch (service_->login_state()) {
-- case SpotifyService::LoginState_NoPremium:
-- ui_->login_state->SetAccountTypeText(tr("You do not have a Spotify Premium account."));
-- break;
--
-- case SpotifyService::LoginState_Banned:
-- case SpotifyService::LoginState_BadCredentials:
-- ui_->login_state->SetAccountTypeText(tr("Your username or password was incorrect."));
-- break;
--
-- case SpotifyService::LoginState_ReloginFailed:
-- ui_->login_state->SetAccountTypeText(tr("You have been logged out of Spotify, please re-enter your password."));
-- break;
--
-- default:
-- ui_->login_state->SetAccountTypeText(tr("A Spotify Premium account is required."));
-- break;
-- }
--}
--
--void SpotifySettingsPage::Logout() {
-- service_->Logout();
-- UpdateLoginState();
--
-- ui_->username->clear();
--}
-diff -rauN clementine-1.0.1/src/internet/spotifysettingspage.h /dev/null
---- clementine-1.0.1/src/internet/spotifysettingspage.h 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,59 +0,0 @@
--/* This file is part of Clementine.
-- Copyright 2010, David Sansome <me@davidsansome.com>
--
-- Clementine 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 3 of the License, or
-- (at your option) any later version.
--
-- Clementine 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 Clementine. If not, see <http://www.gnu.org/licenses/>.
--*/
--
--#ifndef SPOTIFYSETTINGSPAGE_H
--#define SPOTIFYSETTINGSPAGE_H
--
--#include "ui/settingspage.h"
--
--class NetworkAccessManager;
--class Ui_SpotifySettingsPage;
--class SpotifyService;
--
--class SpotifySettingsPage : public SettingsPage {
-- Q_OBJECT
--
--public:
-- SpotifySettingsPage(SettingsDialog* dialog);
-- ~SpotifySettingsPage();
--
-- void Load();
-- void Save();
--
--public slots:
-- void BlobStateChanged();
-- void DownloadBlob();
--
--private slots:
-- void Login();
-- void LoginFinished(bool success);
-- void Logout();
--
--private:
-- void UpdateLoginState();
--
--private:
-- NetworkAccessManager* network_;
-- Ui_SpotifySettingsPage* ui_;
-- SpotifyService* service_;
--
-- bool validated_;
-- QString original_username_;
-- QString original_password_;
--};
--
--#endif // SPOTIFYSETTINGSPAGE_H
-diff -rauN clementine-1.0.1/src/internet/spotifysettingspage.ui /dev/null
---- clementine-1.0.1/src/internet/spotifysettingspage.ui 2011-12-02 19:24:44.000000000 -0200
-+++ /dev/null 2012-05-28 12:50:04.796939473 -0300
-@@ -1,214 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<ui version="4.0">
-- <class>SpotifySettingsPage</class>
-- <widget class="QWidget" name="SpotifySettingsPage">
-- <property name="geometry">
-- <rect>
-- <x>0</x>
-- <y>0</y>
-- <width>545</width>
-- <height>458</height>
-- </rect>
-- </property>
-- <property name="windowTitle">
-- <string>Spotify</string>
-- </property>
-- <layout class="QVBoxLayout" name="verticalLayout_2">
-- <item>
-- <widget class="LoginStateWidget" name="login_state" native="true"/>
-- </item>
-- <item>
-- <widget class="QGroupBox" name="account_group">
-- <property name="title">
-- <string>Account details</string>
-- </property>
-- <layout class="QVBoxLayout" name="verticalLayout_3">
-- <item>
-- <widget class="QWidget" name="login_container" native="true">
-- <property name="enabled">
-- <bool>true</bool>
-- </property>
-- <layout class="QGridLayout" name="gridLayout">
-- <property name="margin">
-- <number>0</number>
-- </property>
-- <item row="1" column="0">
-- <widget class="QLabel" name="username_label">
-- <property name="text">
-- <string>Username</string>
-- </property>
-- </widget>
-- </item>
-- <item row="1" column="1">
-- <widget class="QLineEdit" name="username"/>
-- </item>
-- <item row="2" column="0">
-- <widget class="QLabel" name="password_label">
-- <property name="text">
-- <string>Password</string>
-- </property>
-- </widget>
-- </item>
-- <item row="2" column="1" colspan="2">
-- <widget class="QLineEdit" name="password">
-- <property name="echoMode">
-- <enum>QLineEdit::Password</enum>
-- </property>
-- </widget>
-- </item>
-- <item row="1" column="2">
-- <widget class="QPushButton" name="login">
-- <property name="text">
-- <string>Login</string>
-- </property>
-- </widget>
-- </item>
-- </layout>
-- </widget>
-- </item>
-- </layout>
-- </widget>
-- </item>
-- <item>
-- <widget class="QGroupBox" name="groupBox_2">
-- <property name="title">
-- <string>Spotify plugin</string>
-- </property>
-- <layout class="QVBoxLayout" name="verticalLayout">
-- <item>
-- <widget class="QLabel" name="label">
-- <property name="text">
-- <string>For licensing reasons Spotify support is in a separate plugin.</string>
-- </property>
-- </widget>
-- </item>
-- <item>
-- <layout class="QHBoxLayout" name="horizontalLayout_2">
-- <item>
-- <widget class="QLabel" name="label_2">
-- <property name="text">
-- <string>Plugin status:</string>
-- </property>
-- </widget>
-- </item>
-- <item>
-- <widget class="QLabel" name="blob_status"/>
-- </item>
-- <item>
-- <spacer name="horizontalSpacer">
-- <property name="orientation">
-- <enum>Qt::Horizontal</enum>
-- </property>
-- <property name="sizeHint" stdset="0">
-- <size>
-- <width>40</width>
-- <height>20</height>
-- </size>
-- </property>
-- </spacer>
-- </item>
-- <item>
-- <widget class="QPushButton" name="download_blob">
-- <property name="text">
-- <string>Download...</string>
-- </property>
-- </widget>
-- </item>
-- </layout>
-- </item>
-- </layout>
-- </widget>
-- </item>
-- <item>
-- <widget class="QGroupBox" name="groupBox">
-- <property name="title">
-- <string>Preferences</string>
-- </property>
-- <layout class="QFormLayout" name="formLayout">
-- <item row="0" column="0">
-- <widget class="QLabel" name="label_4">
-- <property name="text">
-- <string>Preferred bitrate</string>
-- </property>
-- </widget>
-- </item>
-- <item row="0" column="1">
-- <widget class="QComboBox" name="bitrate"/>
-- </item>
-- <item row="1" column="0" colspan="2">
-- <widget class="QCheckBox" name="volume_normalisation">
-- <property name="text">
-- <string>Use volume normalisation</string>
-- </property>
-- </widget>
-- </item>
-- </layout>
-- </widget>
-- </item>
-- <item>
-- <spacer name="verticalSpacer">
-- <property name="orientation">
-- <enum>Qt::Vertical</enum>
-- </property>
-- <property name="sizeHint" stdset="0">
-- <size>
-- <width>20</width>
-- <height>30</height>
-- </size>
-- </property>
-- </spacer>
-- </item>
-- <item>
-- <layout class="QHBoxLayout" name="horizontalLayout_3">
-- <item>
-- <spacer name="horizontalSpacer_2">
-- <property name="orientation">
-- <enum>Qt::Horizontal</enum>
-- </property>
-- <property name="sizeHint" stdset="0">
-- <size>
-- <width>40</width>
-- <height>20</height>
-- </size>
-- </property>
-- </spacer>
-- </item>
-- <item>
-- <widget class="QLabel" name="label_3">
-- <property name="minimumSize">
-- <size>
-- <width>64</width>
-- <height>64</height>
-- </size>
-- </property>
-- <property name="maximumSize">
-- <size>
-- <width>64</width>
-- <height>64</height>
-- </size>
-- </property>
-- <property name="pixmap">
-- <pixmap resource="../../data/data.qrc">:/spotify-core-logo-128x128.png</pixmap>
-- </property>
-- <property name="scaledContents">
-- <bool>true</bool>
-- </property>
-- </widget>
-- </item>
-- </layout>
-- </item>
-- </layout>
-- </widget>
-- <customwidgets>
-- <customwidget>
-- <class>LoginStateWidget</class>
-- <extends>QWidget</extends>
-- <header>widgets/loginstatewidget.h</header>
-- <container>1</container>
-- </customwidget>
-- </customwidgets>
-- <resources>
-- <include location="../../data/data.qrc"/>
-- </resources>
-- <connections/>
--</ui>
diff -rauN clementine-1.0.1/src/ui/about.cpp clementine-libre-1.0.1/src/ui/about.cpp
--- clementine-1.0.1/src/ui/about.cpp 2012-01-22 10:43:26.000000000 -0200
+++ clementine-libre-1.0.1/src/ui/about.cpp 2012-05-28 19:44:38.760244927 -0300
@@ -3191,23 +550,23 @@ diff -rauN clementine-1.0.1/src/ui/about.cpp clementine-libre-1.0.1/src/ui/about
return ret;
}
-diff -rauN clementine-1.0.1/src/ui/settingsdialog.cpp clementine-libre-1.0.1/src/ui/settingsdialog.cpp
---- clementine-1.0.1/src/ui/settingsdialog.cpp 2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/ui/settingsdialog.cpp 2012-05-28 19:46:49.506369764 -0300
+diff -rauN clementine-1.1.0/src/ui/settingsdialog.cpp clementine-libre-1.1.0/src/ui/settingsdialog.cpp
+--- clementine-1.1.0/src/ui/settingsdialog.cpp 2012-10-11 09:16:40.000000000 -0200
++++ clementine-libre-1.1.0/src/ui/settingsdialog.cpp 2012-10-26 02:16:32.400950434 -0200
@@ -55,10 +55,6 @@
- # include "remote/remotesettingspage.h"
+ # include "wiimotedev/wiimotesettingspage.h"
#endif
-#ifdef HAVE_SPOTIFY
-# include "internet/spotifysettingspage.h"
-#endif
-
- #include <QDesktopWidget>
- #include <QPainter>
- #include <QPushButton>
-@@ -140,10 +136,6 @@
-
- AddPage(Page_Grooveshark, new GroovesharkSettingsPage(this), providers);
+ #ifdef HAVE_GOOGLE_DRIVE
+ # include "internet/googledrivesettingspage.h"
+ #endif
+@@ -147,10 +143,6 @@
+ AddPage(Page_GoogleDrive, new GoogleDriveSettingsPage(this), providers);
+ #endif
-#ifdef HAVE_SPOTIFY
- AddPage(Page_Spotify, new SpotifySettingsPage(this), providers);
@@ -3216,10 +575,10 @@ diff -rauN clementine-1.0.1/src/ui/settingsdialog.cpp clementine-libre-1.0.1/src
AddPage(Page_Magnatune, new MagnatuneSettingsPage(this), providers);
AddPage(Page_DigitallyImported, new DigitallyImportedSettingsPage(this), providers);
AddPage(Page_BackgroundStreams, new BackgroundStreamsSettingsPage(this), providers);
-diff -rauN clementine-1.0.1/src/ui/settingsdialog.h clementine-libre-1.0.1/src/ui/settingsdialog.h
---- clementine-1.0.1/src/ui/settingsdialog.h 2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/ui/settingsdialog.h 2012-05-28 19:48:55.399426104 -0300
-@@ -65,7 +65,6 @@
+diff -rauN clementine-1.1.0/src/ui/settingsdialog.h clementine-libre-1.1.0/src/ui/settingsdialog.h
+--- clementine-1.1.0/src/ui/settingsdialog.h 2012-10-11 09:16:40.000000000 -0200
++++ clementine-libre-1.1.0/src/ui/settingsdialog.h 2012-10-26 02:16:56.596276994 -0200
+@@ -67,7 +67,6 @@
Page_Library,
Page_Lastfm,
Page_Grooveshark,
@@ -3227,8 +586,9 @@ diff -rauN clementine-1.0.1/src/ui/settingsdialog.h clementine-libre-1.0.1/src/u
Page_Magnatune,
Page_DigitallyImported,
Page_BackgroundStreams,
---- clementine-1.0.1/src/core/logging.cpp 2011-12-02 19:24:43.000000000 -0200
-+++ clementine-libre-1.0.1/src/core/logging.cpp 2012-05-30 03:09:25.554790760 -0300
+diff -rauN clementine-1.1.0/ext/libclementine-common/core/logging.cpp clementine-libre-1.1.0/ext/libclementine-common/core/logging.cpp
+--- clementine-1.1.0/ext/libclementine-common/core/logging.cpp 2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/ext/libclementine-common/core/logging.cpp 2012-10-26 02:20:08.682299778 -0200
@@ -14,10 +14,6 @@
limitations under the License.
*/
@@ -3237,12 +597,13 @@ diff -rauN clementine-1.0.1/src/ui/settingsdialog.h clementine-libre-1.0.1/src/u
-// it is used by the Spotify blob which links against libspotify and is not GPL
-// compatible.
-
+ #include <QtGlobal>
- #include <QCoreApplication>
- #include <QDateTime>
---- clementine-1.0.1/src/core/logging.h 2011-12-02 19:24:43.000000000 -0200
-+++ clementine-libre-1.0.1/src/core/logging.h 2012-05-30 03:09:44.390404481 -0300
-@@ -14,10 +14,6 @@
+ #include <cxxabi.h>
+diff -rauN clementine-1.1.0/ext/libclementine-common/core/logging.h clementine-libre-1.1.0/ext/libclementine-common/core/logging.h
+--- clementine-1.1.0/ext/libclementine-common/core/logging.h 2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.0/ext/libclementine-common/core/logging.h 2012-10-26 02:20:34.937511945 -0200
+@@ -14,11 +14,6 @@
limitations under the License.
*/
@@ -3250,9 +611,11 @@ diff -rauN clementine-1.0.1/src/ui/settingsdialog.h clementine-libre-1.0.1/src/u
-// it is used by the Spotify blob which links against libspotify and is not GPL
-// compatible.
-
-
+-
#ifndef LOGGING_H
#define LOGGING_H
+
+diff -rauN clementine-1.0.1/src/core/timeconstants.h clementine-libre-1.0.1/src/core/timeconstants.h
--- clementine-1.0.1/src/core/timeconstants.h 2011-12-02 19:24:44.000000000 -0200
+++ clementine-libre-1.0.1/src/core/timeconstants.h 2012-05-30 03:10:10.338953893 -0300
@@ -14,10 +14,6 @@
diff --git a/libre/clementine-libre/remove-nonfree-references-on-translations.patch b/libre/clementine-libre/remove-nonfree-references-on-translations.patch
deleted file mode 100644
index f80e7f5a7..000000000
--- a/libre/clementine-libre/remove-nonfree-references-on-translations.patch
+++ /dev/null
@@ -1,20088 +0,0 @@
-diff -rauN clementine-1.0.1/src/translations/ar.po clementine-libre-1.0.1/src/translations/ar.po
---- clementine-1.0.1/src/translations/ar.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ar.po 2012-05-28 22:09:35.427205715 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "ابدأ قئمة التشغيل اللتي تعمل حالياً"
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/be.po clementine-libre-1.0.1/src/translations/be.po
---- clementine-1.0.1/src/translations/be.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/be.po 2012-05-29 13:46:37.876404109 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -311,7 +307,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -584,12 +579,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -815,10 +804,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1025,10 +1010,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Наладзіць калекцыю..."
-@@ -1046,10 +1027,6 @@
- msgid "Connect device"
- msgstr "Падлучэнне прылады"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1465,10 +1442,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1481,10 +1454,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Спампаваць каталог Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1634,10 +1603,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1819,10 +1784,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2085,10 +2046,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2117,10 +2074,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2423,7 +2376,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2499,10 +2451,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2759,10 +2707,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2897,7 +2841,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -3004,10 +2947,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3038,7 +2977,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3055,10 +2993,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3449,18 +3383,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3785,30 +3707,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3818,7 +3720,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3904,18 +3805,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4273,10 +4162,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4292,7 +4177,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4516,20 +4400,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4589,7 +4459,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4678,8 +4547,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/bg.po clementine-libre-1.0.1/src/translations/bg.po
---- clementine-1.0.1/src/translations/bg.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/bg.po 2012-05-29 13:48:35.013070898 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Необходим е Grooveshark Anywhere акаунт"
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Нуждаете се от премиум регистрация в Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -316,7 +312,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Винаги да се започва възпроизвеждането"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"За да използвате Spotify в Clementine е необходима допълнителна приставка. "
--"Иската ли да я свалите и инсталирате сега?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Получи се грешка при копирането на iTunes базата данни от утройството"
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr "Поддръжка на CUE листове"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Отказ"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Смени обложката"
-@@ -1038,10 +1021,6 @@
- msgid "Configure Shortcuts"
- msgstr "Настройване на бързите клавиши"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Настройване на Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Настройване на библиотека..."
-@@ -1060,10 +1039,6 @@
- msgid "Connect device"
- msgstr "Свързване на устройство"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Свързване към Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Постоянен битов поток"
-@@ -1480,10 +1455,6 @@
- msgid "Download this album..."
- msgstr "Сваляне на този албум..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Изтегляне..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Сваляне на icecast директорията"
-@@ -1496,10 +1467,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Сваляне на каталог Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Изтегляне на приставка за Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Сваляне на метаданни"
-@@ -1654,10 +1621,6 @@
- msgid "Error deleting songs"
- msgstr "Грешка при изтриване на песни"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Грешка при изтеглянето на приставка за Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1839,12 +1802,6 @@
- msgid "Font size"
- msgstr "Размер на шрифта"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Поради причини, свързани с лицензирането, поддръжката на Spotify е като "
--"отделна приставка."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Принудително кодиране в моно"
-@@ -2117,10 +2074,6 @@
- "В динамичен режим новите песни ще бъдат избирани и добавяни към списъка с "
- "песни всеки път, когато свърши песента."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Входящи"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Включване на обложката в известяването"
-@@ -2149,10 +2102,6 @@
- msgid "Insert..."
- msgstr "Вмъкване..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Инсталирани"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Интернет"
-@@ -2459,7 +2408,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2535,10 +2483,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Списъкът с песни да е наличен в режим извън мрежа"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Грешка при отговора"
-@@ -2798,10 +2742,6 @@
- msgid "Not enough neighbors"
- msgstr "Недостатъчно съседи"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Не е инсталиран"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Не сте вписан"
-@@ -2936,7 +2876,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Парола"
-@@ -3043,10 +2982,6 @@
- msgid "Playlists"
- msgstr "Списъци с песни"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Състояние на приставката:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Поп"
-@@ -3077,7 +3012,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Настройки"
-@@ -3095,10 +3029,6 @@
- msgid "Preferred audio format"
- msgstr "Предпочитан аудио формат"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Предпочитан битов поток"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Предпочитан формат"
-@@ -3489,18 +3419,6 @@
- msgid "Search Magnatune"
- msgstr "Търси в Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Търсене в Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Търсене в Spotify (отваря нов подпрозорец)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Търсене в Spotify (отваря нов подпрозорец)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Търсене във всички източници (библиотека, интернет услуги, ...)"
-@@ -3826,30 +3744,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Грешка в вписване в Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Приставка за Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Приставката за Spotify не е инсталирана"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Стандартно"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Със звезда"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Стартиране на текущо възпроизвеждания списък с песни"
-@@ -3859,7 +3757,6 @@
- msgstr "Начало на прекодирането"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Започнете да пишете в полето за търсее за да намерите музика на %1."
-@@ -3945,18 +3842,6 @@
- msgid "Switch provider"
- msgstr "Смяна на доставчика"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Синхронизиране на входящата кутия на Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Синхронизиране на списъка с песни от Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Синхронизиране на оценените песни от Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Табовете отгоре"
-@@ -4342,10 +4227,6 @@
- msgid "Use the system proxy settings"
- msgstr "Използване на системните настройки за сървър-посредник"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Използване на нормализация на звука"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Използван"
-@@ -4361,7 +4242,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Потребителско име"
-@@ -4599,20 +4479,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Нямате Grooveshark Anywhere акаунт."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Нямате Spotify Premium акаунт."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr "Отписан сте от Spotify, моля въведете отново паролата си в Настройки."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Изписан сте от Spotify, моля въведете паролата си отново"
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Харесвате тази песен"
-@@ -4680,7 +4546,6 @@
- msgstr "Вашите слушания: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Вашето потребителско име или парола не съвпада."
-
-@@ -4769,8 +4634,6 @@
- msgstr "в последните"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "килобита/сек"
-
-diff -rauN clementine-1.0.1/src/translations/bn.po clementine-libre-1.0.1/src/translations/bn.po
---- clementine-1.0.1/src/translations/bn.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/bn.po 2012-05-29 13:50:28.419737684 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "এক্ টি স্পটীফাই অ্যাকাউন্ট প্রয়োজন"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -311,7 +307,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -584,14 +579,6 @@
- msgid "Always start playing"
- msgstr "স্থায়ী ভাবে সঙ্গীত চালু রাখুন"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"এক্ টি প্লাগ ইন প্রয়োজন। আপনি কি প্লাগ ইন টি ডাউনলোড করে ইন্সটল করতে ইচ্ছুক "
--"?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "iTune ডাটাবেস কপি করায় ত্রুটি র জন্য দুঃখিত ।"
-@@ -817,10 +804,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1021,10 +1004,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1042,10 +1021,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1455,10 +1430,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1471,10 +1442,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1624,10 +1591,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1809,10 +1772,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2075,10 +2034,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2107,10 +2062,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2413,7 +2364,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2489,10 +2439,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2749,10 +2695,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2887,7 +2829,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2994,10 +2935,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3028,7 +2965,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3045,10 +2981,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3439,18 +3371,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3775,30 +3695,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3808,7 +3708,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3894,18 +3793,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4263,10 +4150,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4282,7 +4165,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4506,20 +4388,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4579,7 +4447,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4668,8 +4535,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/br.po clementine-libre-1.0.1/src/translations/br.po
---- clementine-1.0.1/src/translations/br.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/br.po 2012-05-29 13:51:23.959737744 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Ur c'hont Grooveshark a zo dleet"
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Ret eo deoc'h kaout ur kont Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -314,7 +310,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -588,14 +583,6 @@
- msgid "Always start playing"
- msgstr "Atav kregin da lenn"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Un enlugellad a zo ezhomm a-benn implij Spotify e-barzh Clementine. C'hoant "
--"ho peus pellgargañ ha staliañ anezhañ bremañ ?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -824,10 +811,6 @@
- msgid "CUE sheet support"
- msgstr "Kemer e kont ar CUE sheet"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Nullañ"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Kemmañ golo an albom"
-@@ -1040,10 +1023,6 @@
- msgid "Configure Shortcuts"
- msgstr "Kefluniañ ar Berradennoù"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Kefluniañ Spotify"
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Kefluniañ al levraoueg..."
-@@ -1061,10 +1040,6 @@
- msgid "Connect device"
- msgstr "An drobarzhell a zo o kennaskañ"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "O kennaskañ da Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "CBR"
-@@ -1480,10 +1455,6 @@
- msgid "Download this album..."
- msgstr "Pellgkargañ an albom..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Pellgargañ"
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "O pellgargañ katalog Icecast"
-@@ -1496,10 +1467,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "O pellgargañ katalog Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "O pellgargañ enlugellad Spotify..."
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "O pellgargañ metadaveennoù"
-@@ -1653,10 +1620,6 @@
- msgid "Error deleting songs"
- msgstr "Ur gudenn a zo savet e-kerzh dilamidigezh an tonioù"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Ur gudenn a zo savet o pellgargañ enlugellad Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1841,10 +1804,6 @@
- msgid "Font size"
- msgstr "Ment an nodrezh"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Evit abegoù lañsav, meret eo Spotify gant un enlugellad distag."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forsiñ an enkodiñ mono"
-@@ -2119,10 +2078,6 @@
- "E stumm dinamek, roudennoù nevez a vo choazet hag ouzhpennet e fin al roll "
- "c'hoari bep taol ma vo echu gant un ton."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Boest degemer"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Diskouez an albom er gemenadenn"
-@@ -2151,10 +2106,6 @@
- msgid "Insert..."
- msgstr "Enlakaat..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Staliaet"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2458,7 +2409,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2534,10 +2484,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Profil pennañ (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Lakaat ar roll c'hoari da vezañ lennus ezlinenn"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Respont furmed fall"
-@@ -2798,10 +2744,6 @@
- msgid "Not enough neighbors"
- msgstr "N'eus ket trawalc'h a amezeizen"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "N'eo ket staliet"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "N'eo ket kannasket"
-@@ -2936,7 +2878,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Tremenger"
-@@ -3043,10 +2984,6 @@
- msgid "Playlists"
- msgstr "Rollioù c'hoari"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stad an enlugellad"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3077,7 +3014,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Gwellvezioù"
-@@ -3094,10 +3030,6 @@
- msgid "Preferred audio format"
- msgstr "Stumm audio gwellañ"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Bitrate gwellañ"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Stumm gwellañ"
-@@ -3488,18 +3420,6 @@
- msgid "Search Magnatune"
- msgstr "Klask Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Klask Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Klask Spotify (digeriñ un ivinel nevez)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Klask Spotify (digeriñ un ivinel nevez)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Klask e-touez holl o mammennoù (levraoueg, internet, servijoù...)"
-@@ -3824,30 +3744,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Kudenn kennaskañ gant Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Enlugellad Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Enlugellad Spotify n'eo ket staliet"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Boaz"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Gwellañ"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Kregiñ ar roll c'hoari"
-@@ -3857,7 +3757,6 @@
- msgstr "Kregin an transkodiñ"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Kregin da skrivañ er boest klask a-us evit kavout sonerezh war %1"
-@@ -3943,18 +3842,6 @@
- msgid "Switch provider"
- msgstr "Cheñch servij"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Sinkronizadur ar boest degemer Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Sinkronizadur ar roll c'hoari Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Sinkronizadur tonioù gwellañ Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Ivinelloù a-us"
-@@ -4336,10 +4223,6 @@
- msgid "Use the system proxy settings"
- msgstr "Implij dibarzhioù dre ziouer ar proksi"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Implij normalizadur an ampled"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Implijet"
-@@ -4355,7 +4238,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Lezanv"
-@@ -4592,22 +4474,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "N'ho peus ket a kont Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "N'ho peus ket a kont Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Digevreet oc'h bet eus Spotify, adskrivit ho ger-tremen e-barzh prenestr ar "
--"c'hefluniadoù."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Digevreet oc'h bet eus Spotify, adskrivit ho ger-tremen mar plij."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Karout a rit ar roadenn-mañ"
-@@ -4675,7 +4541,6 @@
- msgstr "Ho scrobble: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Ho anv implijer pe ho tremenger a zo direizh."
-
-@@ -4764,8 +4629,6 @@
- msgstr "etrezek ar re ziwezhañ"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbde"
-
-diff -rauN clementine-1.0.1/src/translations/bs.po clementine-libre-1.0.1/src/translations/bs.po
---- clementine-1.0.1/src/translations/bs.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/bs.po 2012-05-29 13:52:24.389737809 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -311,7 +307,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -584,12 +579,6 @@
- msgid "Always start playing"
- msgstr "Uvjek počni sa slušanjem"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Desila se greška prilikom kopiranja iTunes baze podataka sa uređaja"
-@@ -815,10 +804,6 @@
- msgid "CUE sheet support"
- msgstr "CUE lista podrška"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Promjeni omot"
-@@ -1029,10 +1014,6 @@
- msgid "Configure Shortcuts"
- msgstr "Podesi prečice"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Podesi biblioteku..."
-@@ -1050,10 +1031,6 @@
- msgid "Connect device"
- msgstr "Spoji uređaj"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1467,10 +1444,6 @@
- msgid "Download this album..."
- msgstr "Preuzmi ovaj album..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Preuzimam Icecast fasciklu"
-@@ -1483,10 +1456,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Preuzimam Magnatune katalog"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1636,10 +1605,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1821,10 +1786,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2087,10 +2048,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2119,10 +2076,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2425,7 +2378,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2501,10 +2453,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2761,10 +2709,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2899,7 +2843,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -3006,10 +2949,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3040,7 +2979,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3057,10 +2995,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3451,18 +3385,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3787,30 +3709,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3820,7 +3722,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3906,18 +3807,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4275,10 +4164,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4294,7 +4179,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4518,20 +4402,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4591,7 +4461,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4680,8 +4549,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/ca.po clementine-libre-1.0.1/src/translations/ca.po
---- clementine-1.0.1/src/translations/ca.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ca.po 2012-05-29 14:27:32.546406760 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Us cal un compte Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Cal un compte Premium de Spotify"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -318,7 +314,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Començar sempre reproduint"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Cal un connector addicional per utilitzar Spotify a Clementine. Voleu "
--"descarregar-lo i instaŀlar-lo ara?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -827,10 +814,6 @@
- msgid "CUE sheet support"
- msgstr "Suport per a CUE sheet"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Canceŀla"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Canviar la imatge de la portada"
-@@ -1043,10 +1026,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configura dreceres"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configura l'Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configura la llibreria..."
-@@ -1064,10 +1043,6 @@
- msgid "Connect device"
- msgstr "Connecta el dispositiu"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Connectant amb Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Taxa de bits constant"
-@@ -1483,10 +1458,6 @@
- msgid "Download this album..."
- msgstr "Descarrega aquest àlbum..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Descarrega..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Descarregant el directori d'Icecast"
-@@ -1499,10 +1470,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Descarregant el catàleg de Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Descarregant el connector d'Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Descarregant metadades"
-@@ -1654,10 +1621,6 @@
- msgid "Error deleting songs"
- msgstr "Error esborrant cançons"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1839,10 +1802,6 @@
- msgid "Font size"
- msgstr "Mida de la font"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Força la codificació mono"
-@@ -2110,10 +2069,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Safata d'entrafa"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Incloure la caràtula a la notificació"
-@@ -2142,10 +2097,6 @@
- msgid "Insert..."
- msgstr "Insereix..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instaŀlat"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2450,7 +2401,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2526,10 +2476,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Resposta malformada"
-@@ -2788,10 +2734,6 @@
- msgid "Not enough neighbors"
- msgstr "No hi ha prous veïns"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "No heu iniciat la sessió"
-@@ -2926,7 +2868,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Contrasenya"
-@@ -3033,10 +2974,6 @@
- msgid "Playlists"
- msgstr "Llistes de reproducció"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3067,7 +3004,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferències"
-@@ -3084,10 +3020,6 @@
- msgid "Preferred audio format"
- msgstr "Format d'àudio preferit"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Format preferit"
-@@ -3478,18 +3410,6 @@
- msgid "Search Magnatune"
- msgstr "Cercar a Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3814,30 +3734,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Error en iniciar sessió a Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Connector d'Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Connector d'Spotify no instaŀlat"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Estàndard"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Destacat"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Inicia la llista de reproducció que s'està reproduint"
-@@ -3847,7 +3747,6 @@
- msgstr "Inicia transcodificació"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3933,18 +3832,6 @@
- msgid "Switch provider"
- msgstr "Canvia de proveïdor"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4314,10 +4201,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Usat"
-@@ -4333,7 +4216,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nom d'usuari"
-@@ -4560,20 +4442,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4636,7 +4504,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4725,8 +4592,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/cs.po clementine-libre-1.0.1/src/translations/cs.po
---- clementine-1.0.1/src/translations/cs.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/cs.po 2012-05-29 14:53:26.439741827 -0400
-@@ -257,10 +257,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Je požadován účet Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Je požadován účet Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -321,7 +317,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -594,14 +589,6 @@
- msgid "Always start playing"
- msgstr "Vždy začít přehrávat"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Pro používání Spotify v Clementine je vyžadován přídavný modul. Chcete jej "
--"stáhnout a nainstalovat nyní?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Při kopírování databáze iTunes ze zařízení nastala chyba"
-@@ -827,10 +814,6 @@
- msgid "CUE sheet support"
- msgstr "Podpora pro list CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Zrušit"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Změnit obal"
-@@ -1041,10 +1024,6 @@
- msgid "Configure Shortcuts"
- msgstr "Nastavit klávesové zkratky"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Nastavit Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Nastavit sbírku..."
-@@ -1062,10 +1041,6 @@
- msgid "Connect device"
- msgstr "Připojit zařízení"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Připojuje se k Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Stálý datový tok"
-@@ -1481,10 +1456,6 @@
- msgid "Download this album..."
- msgstr "Stáhnout toto album..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Stáhnout..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Stahuje se adresář Icecast"
-@@ -1497,10 +1468,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Stahuje se katalog Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Stahuje se přídavný modul Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Stahují se metadata"
-@@ -1653,10 +1620,6 @@
- msgid "Error deleting songs"
- msgstr "Chyba při mazání písní"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Chyba při stahování přídavného modulu Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1838,11 +1801,6 @@
- msgid "Font size"
- msgstr "Velikost písma"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Z licenčních důvodů je podpora pro Spotify v odděleném přídavném modulu"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Vynutit monokódování"
-@@ -2115,10 +2073,6 @@
- "V dynamickém režimu budou nové skladby vybrány a přidány do seznamu skladeb "
- "pokaždé, když píseň skončí."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Doručená pošta"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Zahrnout obal alba do oznámení"
-@@ -2147,10 +2101,6 @@
- msgid "Insert..."
- msgstr "Vložit..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Nainstalován"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2456,7 +2406,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2532,12 +2481,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Hlavní profil"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--"Zajistit, že seznam skladeb bude dostupný, i když počítač nebude připojen k "
--"internetu"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Poškozená odpověď"
-@@ -2796,10 +2739,6 @@
- msgid "Not enough neighbors"
- msgstr "Nedostatek sousedů"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nenainstalován"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Nepřihlášen"
-@@ -2934,7 +2873,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Heslo"
-@@ -3041,10 +2979,6 @@
- msgid "Playlists"
- msgstr "Seznamy skladeb"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stav přídavného modulu:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3075,7 +3009,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Nastavení"
-@@ -3092,10 +3025,6 @@
- msgid "Preferred audio format"
- msgstr "Upřednostňovaný zvukový formát"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Upřednostňovaný datový tok"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Upřednostňovaný formát"
-@@ -3486,18 +3415,6 @@
- msgid "Search Magnatune"
- msgstr "Hledat na Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Hledat v Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Hledat v Spotify (otevře novou kartu)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Hledat v Spotify (otevře novou kartu)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Hledat ve všech vašich zdrojích (sbírka, internetové služby, ...)"
-@@ -3822,30 +3739,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Chyba přihlášení k Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Přídavný modul Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Přídavný modul Spotify není nainstalován"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Obvyklý"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "S hvězdičkou"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Přehrát současnou skladbu v seznamu skladeb"
-@@ -3855,7 +3752,6 @@
- msgstr "Převést"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Začněte psát ve vyhledávacím poli pro nalezení hudby na %1."
-@@ -3941,18 +3837,6 @@
- msgid "Switch provider"
- msgstr "Přepnout poskytovatele"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synchronizuje se schránka Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synchronizuje se seznam skladeb Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synchronizují se skladby označené hvězdičkou na Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Karty nahoře"
-@@ -4329,10 +4213,6 @@
- msgid "Use the system proxy settings"
- msgstr "Použít systémové nastavení proxy"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Použít normalizaci hlasitosti"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Použito"
-@@ -4348,7 +4228,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Uživatelské jméno"
-@@ -4584,22 +4463,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Nemáte účet Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Nemáte účet Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Byl jste odhlášen ze Spotify. zadejte, prosím, své heslo v dialogu pro "
--"nastavení znovu."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Byl jste odhlášen ze Spotify. zadejte, prosím, své heslo znovu."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Tato skladba patří mezi vaše oblíbené"
-@@ -4667,7 +4530,6 @@
- msgstr "Váš počet přehrání: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Uživatelské jméno nebo heslo bylo nesprávné."
-
-@@ -4756,8 +4618,6 @@
- msgstr "za posledních"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kb/s"
-
-diff -rauN clementine-1.0.1/src/translations/cy.po clementine-libre-1.0.1/src/translations/cy.po
---- clementine-1.0.1/src/translations/cy.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/cy.po 2012-05-29 14:57:59.696408611 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/da.po clementine-libre-1.0.1/src/translations/da.po
---- clementine-1.0.1/src/translations/da.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/da.po 2012-05-29 14:59:00.383075364 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "En Spotify Premium konto er påkrævet."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -315,7 +311,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -588,12 +583,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -819,10 +808,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1023,10 +1008,6 @@
- msgid "Configure Shortcuts"
- msgstr "Konfigurér Genveje"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Indstil bibliotek..."
-@@ -1044,10 +1025,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1457,10 +1434,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1473,10 +1446,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1628,10 +1597,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1813,10 +1778,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2079,10 +2040,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Inkludér albumkunst i bekendtgørelsen"
-@@ -2111,10 +2068,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2417,7 +2370,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2493,10 +2445,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Misdannet svar"
-@@ -2753,10 +2701,6 @@
- msgid "Not enough neighbors"
- msgstr "Ikke nok naboer"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2891,7 +2835,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2998,10 +2941,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3032,7 +2971,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3049,10 +2987,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3443,18 +3377,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3781,30 +3703,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Start den spilleliste der afspiller nu"
-@@ -3814,7 +3716,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3900,18 +3801,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4270,10 +4159,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4289,7 +4174,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4513,20 +4397,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4586,7 +4456,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4675,8 +4544,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/de.po clementine-libre-1.0.1/src/translations/de.po
---- clementine-1.0.1/src/translations/de.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/de.po 2012-05-29 15:03:39.899742271 -0400
-@@ -258,10 +258,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Ein Grooveshark Anywhere-Konto wird benötigt."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Ein Spotify Premium-Konto ist erforderlich."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -323,7 +319,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -597,14 +592,6 @@
- msgid "Always start playing"
- msgstr "Immer mit der Wiedergabe beginnen"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Ein zusätzlich Plugin ist benötigt, um Spotify in Clementine zu benutzen. "
--"Möchten Sie es jetzt herunterladen und installieren?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -832,10 +819,6 @@
- msgid "CUE sheet support"
- msgstr "Unterstützung von Cuesheets"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Abbrechen"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Cover ändern"
-@@ -1048,10 +1031,6 @@
- msgid "Configure Shortcuts"
- msgstr "Tastenkürzel einrichten"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Spotify konfigurieren..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Musiksammlung einrichten..."
-@@ -1069,10 +1048,6 @@
- msgid "Connect device"
- msgstr "Gerät verbinden"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Verbindung mit Spotify wird aufgebaut"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konstante Bitrate"
-@@ -1488,10 +1463,6 @@
- msgid "Download this album..."
- msgstr "Album herunterladen..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Herunterladen..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Lade Icecast-Verzeichnis herunter"
-@@ -1504,10 +1475,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Magnatune-Katalog wird geladen"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Spotify-Plugin wird heruntergeladen"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Metadaten werden heruntergeladen"
-@@ -1662,10 +1629,6 @@
- msgid "Error deleting songs"
- msgstr "Fehler beim Löschen der Titel"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Fehler beim herunterladen von Spotify-Plugin"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1847,12 +1810,6 @@
- msgid "Font size"
- msgstr "Schriftgröße"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Aus lizenzrechtlichen Gründen, ist die Spotify-Unterstützung in einem "
--"Separaten Plugin enthalten."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Mono Encoding erzwingen"
-@@ -2125,10 +2082,6 @@
- "Im dynamischen Modus werden neue Stücke automatisch ausgewählt und an die "
- "Wiedergabeliste angehängt, sobald ein Titel zu Ende ist."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Posteingang"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Cover in der Benachrichtigung anzeigen"
-@@ -2157,10 +2110,6 @@
- msgid "Insert..."
- msgstr "Einfügen..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Installiert"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2465,7 +2414,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2541,10 +2489,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Standard - Profil (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Wiedergabeliste für die Offlinebenutzung verfügbar machen"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Ungültige Antwort"
-@@ -2803,10 +2747,6 @@
- msgid "Not enough neighbors"
- msgstr "Nicht genug Nachbarn"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nicht installiert"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Nicht angemeldet"
-@@ -2941,7 +2881,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Passwort"
-@@ -3049,10 +2988,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Plugin-Status"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3083,7 +3018,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Einstellungen"
-@@ -3100,10 +3034,6 @@
- msgid "Preferred audio format"
- msgstr "Bevorzugtes Dateiformat"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Bevorzugte Bitrate"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Bevorzugtes Format"
-@@ -3494,18 +3424,6 @@
- msgid "Search Magnatune"
- msgstr "Magnatune durchsuchen"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Spotify-Suche"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Spotify-Suche (öffnet im neuen Tab)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Spotify-Suche (öffnet im neuen Tab)"
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Alle Quellen durchsuchen (Sammlung, Internetdienste, …)"
-@@ -3832,30 +3750,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Fehler beim anmelden bei Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify-Plugin"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify-Plugin nicht installiert"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Markiert"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Spiele das aktuelle Stück in der Wiedergabeliste ab"
-@@ -3865,7 +3763,6 @@
- msgstr "Konvertieren"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Benutzen Sie die Suchleiste um Musik auf %1 zu finden."
-@@ -3951,18 +3848,6 @@
- msgid "Switch provider"
- msgstr "Anbieter wechseln"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synchronisiere Spotify Postfach"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synchronisiere Spotify Wiedergabeliste"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synchronisiere markierte Stücke von Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Tabs oben"
-@@ -4345,10 +4230,6 @@
- msgid "Use the system proxy settings"
- msgstr "Verwende Proxy-Einstellungen des Betriebssystems"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Belegt"
-@@ -4364,7 +4245,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Benutzername"
-@@ -4602,20 +4482,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Sie haben kein Grooveshark Anywhere-Konto."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Sie haben kein Spotify Premium-Konto."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Sie lieben dieses Stück"
-@@ -4683,7 +4549,6 @@
- msgstr "Ihre Scrobbles: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Ihr Benutzername oder Kennwort sind ungültig."
-
-@@ -4772,8 +4637,6 @@
- msgstr "in den letzten"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "Kb/s"
-
-diff -rauN clementine-1.0.1/src/translations/el.po clementine-libre-1.0.1/src/translations/el.po
---- clementine-1.0.1/src/translations/el.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/el.po 2012-05-29 15:04:37.229742284 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Απαιτείτε ένας λογαρισμός Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Απαιτείται premium λογαριασμός Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -318,7 +314,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Έναρξη αναπαραγωγής πάντα"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Απαιτείται ένα πρόσθετο για να χρησιμοποιήσετε το Spotify. Θέλετε να το "
--"κατεβάσετε και να το εγκαταστήσετε τώρα;"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -827,10 +814,6 @@
- msgid "CUE sheet support"
- msgstr "Υποστήριξη φύλλων CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Άκυρο"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Αλλαγή εξώφυλλου καλλιτέχνη"
-@@ -1046,10 +1029,6 @@
- msgid "Configure Shortcuts"
- msgstr "Ρύθμιση συντομεύσεων"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Ρύθμιση του Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Παραμετροποίηση της βιβλιοθήκης"
-@@ -1069,10 +1048,6 @@
- msgid "Connect device"
- msgstr "Σύνδεση συσκευής"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Σύνδεση στο Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Σταθερός ρυθμός bit"
-@@ -1488,10 +1463,6 @@
- msgid "Download this album..."
- msgstr "Μεταφόρτωση αυτού του άλμπουμ..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Λήψη..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Μεταφόρτωση καταλόγου Icecast"
-@@ -1504,10 +1475,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Μεταφόρτωση καταλόγου του Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Λήψη πρόσθετου για το Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Λήψη μεταδεδομένων"
-@@ -1664,10 +1631,6 @@
- msgid "Error deleting songs"
- msgstr "Σφάλμα κατά την διαγραφή τραγουδιών"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Σφάλμα στην λήψη του πρόσθετου του Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1850,11 +1813,6 @@
- msgid "Font size"
- msgstr "Μέγεθος γραμματοσειράς"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Για λόγους αδειοδότησης η υποστήριξη για το Spotify γίνεται ξεχωριστά."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Επιβολή κωδικοποίησης mono"
-@@ -2129,10 +2087,6 @@
- "Στην δυναμική λειτουργία νέα κομμάτια θα επιλέγονται και τοποθετούνται στην "
- "λίστα κάθε φορά που ένα τραγούδι τελειώνει."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Εισερχόμενα"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Εμφάνιση του άλμπουμ (εικόνα) στην ειδοποίηση"
-@@ -2163,10 +2117,6 @@
- msgid "Insert..."
- msgstr "Εισαγωγή..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Εγκατεστημένο"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Διαδίκτυο"
-@@ -2471,7 +2421,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2547,10 +2496,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Κύριο προφίλ (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Η λίστα να είναι διαθέσιμη και εκτός σύνδεσης"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Παραμορφωμένη απάντηση"
-@@ -2812,10 +2757,6 @@
- msgid "Not enough neighbors"
- msgstr "Δεν υπάρχουν αρκετοί γείτονες"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Μη εγκατεστημένο"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Δεν είστε συνδεδεμένος"
-@@ -2950,7 +2891,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Συνθηματικό"
-@@ -3057,10 +2997,6 @@
- msgid "Playlists"
- msgstr "Λίστες"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Κατάσταση πρόσθετου:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3091,7 +3027,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Προτιμήσεις"
-@@ -3110,10 +3045,6 @@
- msgid "Preferred audio format"
- msgstr "Προτιμώμενη ηχητική διαμόρφωση"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Προτιμώμενος ρυθμός bit "
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Προτιμώμενη μορφή"
-@@ -3504,18 +3435,6 @@
- msgid "Search Magnatune"
- msgstr "Εύρεση στο Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Εύρεση Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Εύρεση Spotify (άνοιγμα νέας πινακίδας)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Εύρεση Spotify (άνοιγμα νέας πινακίδας)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Αναζήτηση σε όλες τις πηγές σας (βιβλιοθήκη, υπηρεσίες internet, ...)"
-@@ -3843,30 +3762,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Σφάλμα εισόδου στο Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Πρόσθετο Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Το πρόσθετο του Spotify μη εγκατεστημένο"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Κανονικό"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Με αστέρι"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Εκκίνηση της λίστας αναπαραγωγής που παίζει τώρα"
-@@ -3876,7 +3775,6 @@
- msgstr "Εκκίνηση επανακωδικοποίησης"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3964,18 +3862,6 @@
- msgid "Switch provider"
- msgstr "Αλλαγή παροχέα"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Συγχρονισμός εισερχομένων του Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Συγχρονισμός λίστας του Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Συγχρονισμός κομματιών επισημασμένων με αστέρι του Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Καρτέλες στην κορυφή"
-@@ -4361,10 +4247,6 @@
- msgid "Use the system proxy settings"
- msgstr "Χρήση ρυθμίσεων του διαμεσολαβητή του συστήματος"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Χρήση κανονικοποίησης ήχου"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Σε χρήση"
-@@ -4380,7 +4262,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Όνομα χρήστη"
-@@ -4617,22 +4498,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Δεν έχετε λογαριασμό στο GrooveShark Anywhere."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Δεν έχετε Premium λογαριασμό στο Spotify."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Έχετε εξέλθει από το Spotify, παρακαλώ εισάγετε πάλι τον κωδικό σας στις "
--"ρυθμίσεις."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Έχετε εξέλθει από το Spotify, παρακαλώ εισάγετε πάλι τον κωδικό σας."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Λατρεύεις αυτό το κομμάτι"
-@@ -4699,7 +4564,6 @@
- msgstr "Τα scrobbles σου: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Το όνομα χρήστη ή το συνθηματικό ήταν λανθασμένο."
-
-@@ -4788,8 +4652,6 @@
- msgstr "εντός των τελευταίων"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/en_CA.po clementine-libre-1.0.1/src/translations/en_CA.po
---- clementine-1.0.1/src/translations/en_CA.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/en_CA.po 2012-05-29 15:05:50.036409383 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configure Shortcuts"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configure library..."
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1452,10 +1429,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1468,10 +1441,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Downloading Magnatune catalogue"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1622,10 +1591,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1807,10 +1772,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2073,10 +2034,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Include album art in the notification"
-@@ -2105,10 +2062,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2411,7 +2364,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2487,10 +2439,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Malformed response"
-@@ -2748,10 +2696,6 @@
- msgid "Not enough neighbors"
- msgstr "Not enough neighbours"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2886,7 +2830,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2993,10 +2936,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3027,7 +2966,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3044,10 +2982,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3438,18 +3372,6 @@
- msgid "Search Magnatune"
- msgstr "Search Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3774,30 +3696,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Start the playlist currently playing"
-@@ -3807,7 +3709,6 @@
- msgstr "Start transcoding"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3893,18 +3794,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4262,10 +4151,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4281,7 +4166,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4505,20 +4389,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4578,7 +4448,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4667,8 +4536,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/en_GB.po clementine-libre-1.0.1/src/translations/en_GB.po
---- clementine-1.0.1/src/translations/en_GB.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/en_GB.po 2012-05-29 15:06:41.279742544 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "A Spotify Premium account is required."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -315,7 +311,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -588,14 +583,6 @@
- msgid "Always start playing"
- msgstr "Always start playing"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "An error occurred copying the iTunes database from the device"
-@@ -821,10 +808,6 @@
- msgid "CUE sheet support"
- msgstr "CUE sheet support"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Cancel"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Change cover art"
-@@ -1026,10 +1009,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configure library..."
-@@ -1047,10 +1026,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1460,10 +1435,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1476,10 +1447,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1630,10 +1597,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1815,10 +1778,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2081,10 +2040,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Include album art in the notification"
-@@ -2113,10 +2068,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2419,7 +2370,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2495,10 +2445,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Malformed response"
-@@ -2755,10 +2701,6 @@
- msgid "Not enough neighbors"
- msgstr "Not enough neighbours"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2893,7 +2835,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -3000,10 +2941,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3034,7 +2971,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3051,10 +2987,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3445,18 +3377,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3781,30 +3701,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Start the playlist currently playing"
-@@ -3814,7 +3714,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3900,18 +3799,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4269,10 +4156,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4288,7 +4171,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4512,20 +4394,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4585,7 +4453,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4674,8 +4541,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/en.po clementine-libre-1.0.1/src/translations/en.po
---- clementine-1.0.1/src/translations/en.po 2011-12-02 16:24:44.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/en.po 2012-05-29 15:04:56.353075508 -0400
-@@ -178,9 +178,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
- "There are different types of smart playlist that offer different ways of "
-@@ -408,11 +405,6 @@
- msgid "Always start playing"
- msgstr ""
-
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-
-@@ -720,9 +712,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--msgid "Configure Spotify..."
--msgstr ""
--
- msgid "Configure library..."
- msgstr ""
-
-@@ -735,9 +724,6 @@
- msgid "Connect device"
- msgstr ""
-
--msgid "Connecting to Spotify"
--msgstr ""
--
- msgid "Constant bitrate"
- msgstr ""
-
-@@ -1045,9 +1031,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- msgid "Downloading metadata"
- msgstr ""
-
-@@ -1152,9 +1135,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #, qt-format
- msgid "Error loading %1"
- msgstr ""
-@@ -1280,9 +1260,6 @@
- msgid "Font size"
- msgstr ""
-
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- msgid "Force mono encoding"
- msgstr ""
-
-@@ -2409,15 +2386,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--msgid "Search Spotify"
--msgstr ""
--
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- msgid "Search for album covers..."
- msgstr ""
-
-@@ -2647,18 +2615,6 @@
- msgid "Speex"
- msgstr ""
-
--msgid "Spotify"
--msgstr ""
--
--msgid "Spotify login error"
--msgstr ""
--
--msgid "Spotify plugin"
--msgstr ""
--
--msgid "Spotify plugin not installed"
--msgstr ""
--
- msgid "Standard"
- msgstr ""
-
-@@ -2674,9 +2630,6 @@
- msgid "Start typing in the search box above to find music on Grooveshark."
- msgstr ""
-
--msgid "Start typing in the search box above to find music on Spotify."
--msgstr ""
--
- #, qt-format
- msgid "Starting %1"
- msgstr ""
-@@ -2731,15 +2684,6 @@
- msgid "Switch provider"
- msgstr ""
-
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- msgid "Tabs on top"
- msgstr ""
-
-@@ -3180,9 +3124,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
- msgid ""
- "You have selected a Premium-only audio type but do not have any account "
- "details entered"
-diff -rauN clementine-1.0.1/src/translations/eo.po clementine-libre-1.0.1/src/translations/eo.po
---- clementine-1.0.1/src/translations/eo.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/eo.po 2012-05-29 15:18:59.993076631 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Eraro okazis dum kopiado de la iTunes-datumbazo el aparato"
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/es.po clementine-libre-1.0.1/src/translations/es.po
---- clementine-1.0.1/src/translations/es.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/es.po 2012-05-29 15:22:56.383076862 -0400
-@@ -254,10 +254,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Se requiere una cuenta Grooveshrak Anywhere"
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Se requiere una cuenta Premium de Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -319,7 +315,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -592,14 +587,6 @@
- msgid "Always start playing"
- msgstr "Siempre empezar a reproducir"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Un plugin adicional es requerido para usar Spotify en Clementine. ¿Te "
--"gustaría descargarlo e instalarlo ahora?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -829,10 +816,6 @@
- msgid "CUE sheet support"
- msgstr "Soporte de hoja CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Cancelar"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Cambiar portada"
-@@ -1046,10 +1029,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurar accesos rápidos"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configurar Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurar colección..."
-@@ -1067,10 +1046,6 @@
- msgid "Connect device"
- msgstr "Conectar dispositivo"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Connectando con Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Flujo de bits constante"
-@@ -1486,10 +1461,6 @@
- msgid "Download this album..."
- msgstr "Descargar este álbum..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Descargar..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Descargar el directorio de Icecast"
-@@ -1502,10 +1473,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Descargando el catálogo de Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Descargando el plugin Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Descargando metadatos"
-@@ -1657,10 +1624,6 @@
- msgid "Error deleting songs"
- msgstr "Error al borrar canciones"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Error descargando el plugin Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1844,12 +1807,6 @@
- msgid "Font size"
- msgstr "Tamaño de letra"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Por razones de licenciamiento, para usar Spotify se necesita un complemento "
--"separado."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forzar la codificación en mono"
-@@ -2123,10 +2080,6 @@
- "En el modo dinámico las canciones nuevas se elegirán y añadirán a la lista "
- "de reproducción cada vez que termine una canción."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Bandeja de entrada"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Incluir carátula en la notificación"
-@@ -2155,10 +2108,6 @@
- msgid "Insert..."
- msgstr "Insertar..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalado"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2463,7 +2412,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2539,10 +2487,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Perfil principal (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Hacer disponible la lista de reproducción fuera de línea"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Respuesta malformada"
-@@ -2803,10 +2747,6 @@
- msgid "Not enough neighbors"
- msgstr "No hay suficientes vecinos"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "No instalado"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "No ha iniciado sesión"
-@@ -2941,7 +2881,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Contraseña"
-@@ -3048,10 +2987,6 @@
- msgid "Playlists"
- msgstr "Listas de reproducción"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Estado del complemento:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3082,7 +3017,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferencias"
-@@ -3099,10 +3033,6 @@
- msgid "Preferred audio format"
- msgstr "Formato de audio preferido"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Formato preferido"
-@@ -3493,18 +3423,6 @@
- msgid "Search Magnatune"
- msgstr "Buscar en Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Buscar en Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Buscar en Spotify (abre una nueva pestaña)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Buscar en Spotify (abre una pestaña nueva)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Buscar en todas tus fuentes(libreria, servicios de internet, ...) "
-@@ -3830,30 +3748,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Error de inicio de sesión de Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Complemento de Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "El complemento de Spotify no está instalado"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Estándar"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Destacado"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Iniciar la lista de reproducción actualmente reproduciendose"
-@@ -3863,7 +3761,6 @@
- msgstr "Comenzar conversión"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3951,18 +3848,6 @@
- msgid "Switch provider"
- msgstr "Cambiar proveedor"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Sincronizando bandeja de entrada de Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Sincronizando lista de reproducción de Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Sincronizando canciones destacadas de Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Pestañas en la parte superior"
-@@ -4341,10 +4226,6 @@
- msgid "Use the system proxy settings"
- msgstr "Utilizar la configuración para proxy del sistema"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Usado"
-@@ -4360,7 +4241,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nombre de Usuario"
-@@ -4599,20 +4479,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "No tienes una cuenta Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "No tienes una cuenta Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Amas esta canción"
-@@ -4680,7 +4546,6 @@
- msgstr "Sus scrobbles: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Tu nombre de usuario o contraseña es incorrecta."
-
-@@ -4769,8 +4634,6 @@
- msgstr "en los últimos"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/et.po clementine-libre-1.0.1/src/translations/et.po
---- clementine-1.0.1/src/translations/et.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/et.po 2012-05-29 15:46:09.829745009 -0400
-@@ -251,10 +251,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -310,7 +306,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -583,12 +578,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -814,10 +803,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Loobu"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1018,10 +1003,6 @@
- msgid "Configure Shortcuts"
- msgstr "Kiirklahvide seadistamine"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1039,10 +1020,6 @@
- msgid "Connect device"
- msgstr "Ühenda seade"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1452,10 +1429,6 @@
- msgid "Download this album..."
- msgstr "Lae see album..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1468,10 +1441,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1622,10 +1591,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1807,10 +1772,6 @@
- msgid "Font size"
- msgstr "Kirja suurus"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2073,10 +2034,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2105,10 +2062,6 @@
- msgid "Insert..."
- msgstr "Lisa..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Paigaldatud"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2411,7 +2364,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2487,10 +2439,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Vigane vastus"
-@@ -2748,10 +2696,6 @@
- msgid "Not enough neighbors"
- msgstr "Pole piisavalt naabreid"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2886,7 +2830,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Parool"
-@@ -2993,10 +2936,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3027,7 +2966,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Seadistused"
-@@ -3044,10 +2982,6 @@
- msgid "Preferred audio format"
- msgstr "Eelistatud heli vorming"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Eelistatud vorming"
-@@ -3438,18 +3372,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3774,30 +3696,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3807,7 +3709,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3893,18 +3794,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4262,10 +4151,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Kasutuses"
-@@ -4281,7 +4166,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Kasutajanimi"
-@@ -4505,20 +4389,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4578,7 +4448,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4667,8 +4536,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/eu.po clementine-libre-1.0.1/src/translations/eu.po
---- clementine-1.0.1/src/translations/eu.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/eu.po 2012-05-29 15:47:59.699745177 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/fa.po clementine-libre-1.0.1/src/translations/fa.po
---- clementine-1.0.1/src/translations/fa.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/fa.po 2012-05-29 15:57:55.966412407 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "حساب کاربری «Spotify Premium» مورد نیاز است."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -315,7 +311,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -588,14 +583,6 @@
- msgid "Always start playing"
- msgstr "همواره پخش را شروع کن"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"کلمنتاین به افزونهٔ دیگری برای استفادهٔ اسپاتیفای نیاز دارد. آیا می‌خواهید"
--" این افزونه را بارگیری و نصب نمایید؟"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "مشکلی هنگام کپی‌کردن بانک اطلاعاتی آی‌تیون از دستگاه پیش آمد"
-@@ -821,10 +808,6 @@
- msgid "CUE sheet support"
- msgstr "برگهٔ پشتیبانی CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "لغو"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "تغییر جلد هنری"
-@@ -1035,10 +1018,6 @@
- msgid "Configure Shortcuts"
- msgstr "پیکربندی میان‌برها"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "پیکربندی Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "پیکربندی کتابخانه..."
-@@ -1056,10 +1035,6 @@
- msgid "Connect device"
- msgstr "اتصال دستگاه"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "اتصال به Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "ضرباهنگ ثابت"
-@@ -1475,10 +1450,6 @@
- msgid "Download this album..."
- msgstr "بارگیری این آلبوم..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "بارگیری..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "بارگیری پوشهٔ Icecast"
-@@ -1491,10 +1462,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "بارگیری کاتالوگ Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "بارگیری افزونهٔ Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "بارگیری ابرداده"
-@@ -1645,10 +1612,6 @@
- msgid "Error deleting songs"
- msgstr "خطا در پاک کردن آهنگ‌ها"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "خطا در بارگیری افزونهٔ Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1830,10 +1793,6 @@
- msgid "Font size"
- msgstr "اندازهٔ قلم"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "به دلایل اجازه‌نامه، پشتیبانی اسپاتیفای در افزونه‌ای جداگانه است."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "رمزینهٔ مونو پخش کن"
-@@ -2104,10 +2063,6 @@
- "در حالت دینامیک پس از پایان هر آهنگ، قطعه‌های تازه انتخاب و به لیست‌پخش "
- "افزوده می‌شوند."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "صندوق ورودی"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "آلبوم هنری را در آگاهساز قرار بده"
-@@ -2136,10 +2091,6 @@
- msgid "Insert..."
- msgstr "قرار دادن..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "نصب شد"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "اینترنت"
-@@ -2442,7 +2393,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2518,10 +2468,6 @@
- msgid "Main profile (MAIN)"
- msgstr "مشخصات اصلی (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "لیست‌پخش را بیرون‌خط در دسترس بگذار"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "پاسخ ناهنجار"
-@@ -2780,10 +2726,6 @@
- msgid "Not enough neighbors"
- msgstr "بدون همسایهٔ کافی"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "نصب نشده"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2918,7 +2860,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "کلمهٔ عبور"
-@@ -3025,10 +2966,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "وضعیت افزونه"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "پاپ"
-@@ -3059,7 +2996,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "تنظیمات‌"
-@@ -3076,10 +3012,6 @@
- msgid "Preferred audio format"
- msgstr "فرمت صوتی ترجیحی"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "فرمت ترجیحی"
-@@ -3470,18 +3402,6 @@
- msgid "Search Magnatune"
- msgstr "جستجوی Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "جستجوی Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "جستجوی Spotify (گشودن باریکهٔ تازه)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "جستجوی Spotify (گشودن باریکهٔ تازه)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3806,30 +3726,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "خطای ورود به سیستم Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "افزونهٔ Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "افزونهٔ Spotify نصب نیست"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "استاندارد"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "ستاره‌دار"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "شروع لیست‌پخش در حال پخش"
-@@ -3839,7 +3739,6 @@
- msgstr "شروع ترانسکد"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3925,18 +3824,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "همگام‌سازی صندوق ورودی اسپاتیفای"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "همگام‌سازی لیست‌پخش اسپاتیفای"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "همگام‌سازی قطعه‌های ستاره‌دار اسپاتیفای"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "باریکه‌ها در بالا"
-@@ -4314,10 +4201,6 @@
- msgid "Use the system proxy settings"
- msgstr "بکاربردن تنظیمات پراکسی سیستم"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "استفاده‌شده"
-@@ -4333,7 +4216,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "شناسه"
-@@ -4568,20 +4450,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "عاشق این آهنگ هستید"
-@@ -4648,7 +4516,6 @@
- msgstr "برونکشی‌های شما: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4737,8 +4604,6 @@
- msgstr "در آخرین"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/fi.po clementine-libre-1.0.1/src/translations/fi.po
---- clementine-1.0.1/src/translations/fi.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/fi.po 2012-05-29 16:22:14.749747287 -0400
-@@ -250,10 +250,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Grooveshark Anywhere tili vaaditaan käyttöön."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotifyn Premium-tili vaaditaan."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -311,7 +307,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -584,14 +579,6 @@
- msgid "Always start playing"
- msgstr "Aloita aina toisto"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Spotifyn käyttö Clementinessä vaatii lisäosan. Haluatko ladata ja asentaa "
--"sen nyt?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "iTunes-tietokantaa laitteesta ladatessa tapahtui virhe"
-@@ -819,10 +806,6 @@
- msgid "CUE sheet support"
- msgstr "CUE-tiedostojen tuki"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Peru"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Vaihda kansikuvaa"
-@@ -1032,10 +1015,6 @@
- msgid "Configure Shortcuts"
- msgstr "Pikanäppäinten asetukset..."
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Muokkaa Spotifya..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Kirjaston asetukset..."
-@@ -1053,10 +1032,6 @@
- msgid "Connect device"
- msgstr "Yhdistä laite"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Yhdistetään Spotifyyn"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Pysyvä bittinopeus"
-@@ -1468,10 +1443,6 @@
- msgid "Download this album..."
- msgstr "Lataa tämä levy..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Lataa..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Ladataan Icecast-hakemistoa"
-@@ -1484,10 +1455,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Ladataan Magnatune-luetteloa"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Ladataan Spotify-liitännäistä"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Noudetaan metadataa"
-@@ -1638,10 +1605,6 @@
- msgid "Error deleting songs"
- msgstr "Virhe kappaleita poistaessa"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Virhe ladatessa Spotify-liitännäistä"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1825,10 +1788,6 @@
- msgid "Font size"
- msgstr "Kirjasinkoko"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Lisenssisyistä Spotify-tuki on erillinen liitännäinen."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Pakota monokoodaus"
-@@ -2097,10 +2056,6 @@
- "Dynaamisessa tilassa uusia kappaleita valitaan ja lisätään soittolistaan "
- "joka kerta kun yksi kappale on soitettu."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Saapuneet"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Näytä kansikuva ilmoituksen yhteydessä"
-@@ -2129,10 +2084,6 @@
- msgid "Insert..."
- msgstr "Lisää..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Asennettu"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2435,7 +2386,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2511,10 +2461,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Oletusprofiili (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Virheellinen vastaus"
-@@ -2775,10 +2721,6 @@
- msgid "Not enough neighbors"
- msgstr "Ei tarpeeksi naapureita"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Ei asennettu"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Ei kirjautunut"
-@@ -2913,7 +2855,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Salasana"
-@@ -3020,10 +2961,6 @@
- msgid "Playlists"
- msgstr "Soittolistat"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Liitännäisen tila:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3054,7 +2991,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Asetukset"
-@@ -3071,10 +3007,6 @@
- msgid "Preferred audio format"
- msgstr "Ensisijainen äänimuoto"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Ensisijainen muoto"
-@@ -3465,18 +3397,6 @@
- msgid "Search Magnatune"
- msgstr "Etsi Magnatunesta"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Etsi Spotifysta"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Etsi Spotifysta (avaa uuden välilehden)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Etsi Spotifysta (avaa uuden välilehden)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Etsi kaikista lähteistä (kirjasto, internet, ...)"
-@@ -3801,30 +3721,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify-kirjautumisvirhe"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify-liitännäinen"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify-liitännäistä ei ole asennettu"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Normaali"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3834,7 +3734,6 @@
- msgstr "Aloita muunnos"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3920,18 +3819,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synkronoi Spotify saapuneet"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synkronoi Spotify soittolistan"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synkronoi Spotify arvostellut kappaleet"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Välilehdet ylhäällä"
-@@ -4306,10 +4193,6 @@
- msgid "Use the system proxy settings"
- msgstr "Käytä järjestelmän välityspalvelinasetuksia"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Käytetty"
-@@ -4325,7 +4208,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Käyttäjätunnus"
-@@ -4562,20 +4444,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Sinulla ei ole Grooveshark Anywhere tiliä."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Sinulla ei ole Spotify Premium tiliä."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Tykkäät tästä kappaleesta"
-@@ -4635,7 +4503,6 @@
- msgstr "Lähetyksesi: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Käyttäjätunnus tai salasana oli virheellinen."
-
-@@ -4724,8 +4591,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kb/s"
-
-diff -rauN clementine-1.0.1/src/translations/fr.po clementine-libre-1.0.1/src/translations/fr.po
---- clementine-1.0.1/src/translations/fr.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/fr.po 2012-05-29 16:25:03.779747446 -0400
-@@ -258,10 +258,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Un compte Grooveshark Anywhere est nécessaire."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Un compte Spotify Premium est nécessaire."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -323,7 +319,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -597,14 +592,6 @@
- msgid "Always start playing"
- msgstr "Toujours commencer à lire"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Un module externe est requis pour pouvoir utiliser Spotify. Voulez-vous le "
--"télécharger et l'installer maintenant ?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -838,10 +825,6 @@
- msgid "CUE sheet support"
- msgstr "Support des CUE sheet."
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Annuler"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Changer la couverture de l'album"
-@@ -1056,10 +1039,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurer les raccourcis clavier"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configurer Spotify…"
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurer votre bibliothèque..."
-@@ -1077,10 +1056,6 @@
- msgid "Connect device"
- msgstr "Connexion du périphérique"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Connexion à Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Débit constant"
-@@ -1496,10 +1471,6 @@
- msgid "Download this album..."
- msgstr "Télécharger cet album..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Télécharger..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Téléchargement du catalogue d'Icecast"
-@@ -1512,10 +1483,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Téléchargement du catalogue Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Téléchargement du module Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Téléchargement des métadonnées"
-@@ -1671,10 +1638,6 @@
- msgid "Error deleting songs"
- msgstr "Erreur lors de la suppression des morceaux"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Erreur lors du téléchargement du module Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1858,12 +1821,6 @@
- msgid "Font size"
- msgstr "Taille de la police"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Pour des raisons de licence, le support de Spotify est dans un module "
--"séparé."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forcer l’encodage en mono"
-@@ -2138,10 +2095,6 @@
- "En mode dynamique, de nouvelles pistes seront choisies et ajoutées à la fin "
- "de la liste de lecture chaque fois qu'un morceau se terminera."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Boîte de réception"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Inclure la pochette de l'abum dans la fenêtre de notification"
-@@ -2170,10 +2123,6 @@
- msgid "Insert..."
- msgstr "Insérer..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Installé(e)(s)"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2481,7 +2430,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2557,10 +2505,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Profil principal (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Rendre la liste de lecture accessible hors ligne"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Réponse mal formatée"
-@@ -2822,10 +2766,6 @@
- msgid "Not enough neighbors"
- msgstr "Voisins insuffisants"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Non installé"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Non connecté"
-@@ -2960,7 +2900,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Mot de passe"
-@@ -3067,10 +3006,6 @@
- msgid "Playlists"
- msgstr "Listes de lecture"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "État du module externe :"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3101,7 +3036,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Préférences"
-@@ -3118,10 +3052,6 @@
- msgid "Preferred audio format"
- msgstr "Format audio préféré"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Débit préféré"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Format préféré"
-@@ -3512,18 +3442,6 @@
- msgid "Search Magnatune"
- msgstr "Recherche Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Recherche Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Recherche Spotify (ouvre un nouvel onglet)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Recherche Spotify (ouvre un nouvel onglet)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3851,30 +3769,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Erreur lors de la connexion à Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Module externe Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Le module externe de Spotify n'est pas installé"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Favoris"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Commencer la liste de lecture jouée actuellement"
-@@ -3884,7 +3782,6 @@
- msgstr "Démarrer transcodage"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3972,18 +3869,6 @@
- msgid "Switch provider"
- msgstr "Changer de service"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synchronisation de la boîte de réception Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synchronisation de la liste de lecture Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synchronisation des morceaux Spotify préférés"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Onglets au dessus"
-@@ -4369,10 +4254,6 @@
- msgid "Use the system proxy settings"
- msgstr "Utiliser les paramètres du système pour le serveur mandataire"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Utilisé"
-@@ -4388,7 +4269,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nom d'utilisateur"
-@@ -4629,23 +4509,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Vous n'avez pas de compte Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Vous n'avez pas de compte Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Vous avez été déconnecté de Spotify ; merci de ressaisir votre mot de passe "
--"dans la fenêtre des préférences."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--"Vous avez été déconnecté de Spotify ; merci de ressaisir votre mot de passe."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Vous aimez cette piste"
-@@ -4713,7 +4576,6 @@
- msgstr "Vos scrobbles : %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Votre nom d'utilisateur ou mot de passe est incorrect."
-
-@@ -4802,8 +4664,6 @@
- msgstr "parmi les derniers"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/gl.po clementine-libre-1.0.1/src/translations/gl.po
---- clementine-1.0.1/src/translations/gl.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/gl.po 2012-05-29 16:27:07.409747570 -0400
-@@ -251,10 +251,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -310,7 +306,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -583,12 +578,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Aconteceu un erro copiando a base de datos de iTunes do dispositivo"
-@@ -814,10 +803,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1022,10 +1007,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurar a biblioteca..."
-@@ -1043,10 +1024,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1456,10 +1433,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1472,10 +1445,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1625,10 +1594,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1810,10 +1775,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2076,10 +2037,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2108,10 +2065,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2415,7 +2368,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2491,10 +2443,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Resposta mal formada"
-@@ -2751,10 +2699,6 @@
- msgid "Not enough neighbors"
- msgstr "Viciños insuficientes"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2889,7 +2833,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2996,10 +2939,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3030,7 +2969,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3047,10 +2985,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3441,18 +3375,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3777,30 +3699,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Reproducir a playlist actualmente reproducindo"
-@@ -3810,7 +3712,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3896,18 +3797,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4265,10 +4154,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4284,7 +4169,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4508,20 +4392,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4581,7 +4451,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4670,8 +4539,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/he.po clementine-libre-1.0.1/src/translations/he.po
---- clementine-1.0.1/src/translations/he.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/he.po 2012-05-29 16:33:23.043081344 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -313,7 +309,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -586,12 +581,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "ארעה שגיאה בהעתקת מסד הנתונים של iTunes מההתקן"
-@@ -817,10 +806,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "שינוי עטיפת האלבום"
-@@ -1025,10 +1010,6 @@
- msgid "Configure Shortcuts"
- msgstr "הגדר קיצורי מקשים"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "הגדר את הספרייה..."
-@@ -1046,10 +1027,6 @@
- msgid "Connect device"
- msgstr "חבר התקן"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1464,10 +1441,6 @@
- msgid "Download this album..."
- msgstr "הורד את האלבום הזה..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "מוריד תיקיית Icecast"
-@@ -1480,10 +1453,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "מוריד את הקטלוג של Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1633,10 +1602,6 @@
- msgid "Error deleting songs"
- msgstr "שגיאה במחיקת שירים"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1818,10 +1783,6 @@
- msgid "Font size"
- msgstr "גודל הגופן"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2086,10 +2047,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "אומנות אלבום בתוך ההתראה"
-@@ -2118,10 +2075,6 @@
- msgid "Insert..."
- msgstr "הוספה..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "אינטרנט"
-@@ -2424,7 +2377,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2500,10 +2452,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "תגובה שגויה"
-@@ -2761,10 +2709,6 @@
- msgid "Not enough neighbors"
- msgstr "אין מספיק שכנים"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2899,7 +2843,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "סיסמא"
-@@ -3006,10 +2949,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "פופ"
-@@ -3040,7 +2979,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "מאפיינים"
-@@ -3057,10 +2995,6 @@
- msgid "Preferred audio format"
- msgstr "פורמט אודיו מועדף"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "פורמט מועדף"
-@@ -3451,18 +3385,6 @@
- msgid "Search Magnatune"
- msgstr "חיפוש ב־Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3787,30 +3709,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "התחל את רשימת־ההשמעה המתנגנת כעת"
-@@ -3820,7 +3722,6 @@
- msgstr "התחלת הקידוד"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3906,18 +3807,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "לשוניות למעלה"
-@@ -4280,10 +4169,6 @@
- msgid "Use the system proxy settings"
- msgstr "שימוש בהגדרות הפרוקסי של המערכת"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "בשימוש"
-@@ -4299,7 +4184,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "שם משתמש"
-@@ -4532,20 +4416,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "אתה אוהב את הרצועה הזו"
-@@ -4608,7 +4478,6 @@
- msgstr "ה-scrobbles שלך: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4697,8 +4566,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "קילו־סיביות לשניה"
-
-diff -rauN clementine-1.0.1/src/translations/hi.po clementine-libre-1.0.1/src/translations/hi.po
---- clementine-1.0.1/src/translations/hi.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/hi.po 2012-05-29 16:34:21.266414734 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/hr.po clementine-libre-1.0.1/src/translations/hr.po
---- clementine-1.0.1/src/translations/hr.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/hr.po 2012-05-29 16:50:07.443081990 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify Premium račun je obvezan."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -316,7 +312,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Uvijek započinji reprodukciju glazbe"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Dodatni dodatak je potreban za korištenje Spotify-a u Clementine-u. Želite "
--"li preuzeti dodatak i instalirati sada?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Pogreška je nastala tijekom kopiranja iTunes baze podataka sa uređaja"
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr "Podrška za CUE listu"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Otkaži"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Promijenite omot albuma"
-@@ -1039,10 +1022,6 @@
- msgid "Configure Shortcuts"
- msgstr "Podesi prečace"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Podesite Spotify ..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Podesi zbirku..."
-@@ -1060,10 +1039,6 @@
- msgid "Connect device"
- msgstr "Spoji uređaj"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Spajanje Spotify-a"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konstantna brzina prijenosa"
-@@ -1479,10 +1454,6 @@
- msgid "Download this album..."
- msgstr "Preuzmi ovaj album..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Preuzmi..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Preuzimanje Icecast direktorija"
-@@ -1495,10 +1466,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Preuzimanje Magnatune kataloga"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Preuzimanje Spotify dodatka"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Preuzimanje metapodataka"
-@@ -1649,10 +1616,6 @@
- msgid "Error deleting songs"
- msgstr "Pogreška u brisanju pjesama"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "pogreška pri preuzimanju Spotify dodatka"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1834,10 +1797,6 @@
- msgid "Font size"
- msgstr "Veličina slova"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Zbog razloga licenciranja Spotify-a podrška je u posebnom dodatak."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forsiraj mono enkodiranje"
-@@ -2108,10 +2067,6 @@
- "U dinamičkom modu nove pjesme će biti izabrane i dodane u popis izvođenja "
- "svaki puta kada je pjesma odsvirana."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Pristigle poruke"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Prikaži omot albuma u obavijesti"
-@@ -2140,10 +2095,6 @@
- msgid "Insert..."
- msgstr "Umetni..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalirano"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2446,7 +2397,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2522,10 +2472,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Glavni profil (GLAVNI)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Učini popis izvođenja dostupnim kada je veza prekinuta"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Pogreška u odgovoru"
-@@ -2784,10 +2730,6 @@
- msgid "Not enough neighbors"
- msgstr "Nema dovoljno susjeda"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nije instalirano"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2922,7 +2864,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Lozinka"
-@@ -3029,10 +2970,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Status dodatka:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3063,7 +3000,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Opcije"
-@@ -3080,10 +3016,6 @@
- msgid "Preferred audio format"
- msgstr "Željeni audio format"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Željeni format"
-@@ -3474,18 +3406,6 @@
- msgid "Search Magnatune"
- msgstr "Pretražite Magnatune stanice"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Pretražite Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Pretražite Spotify (otvori u novoj kartici)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Pretražite Spotify (otvori u novoj kartici)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3811,30 +3731,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify pogreška kod prijave"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify dodatak"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify dodatak nije instaliran"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standardno"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Sa zvjezdicom"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Pokrenite popis izvođenja koji se trenutno izvodi"
-@@ -3844,7 +3744,6 @@
- msgstr "Započni enkodiranje"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3930,18 +3829,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Sinkronizacija Spotify ulaznog spremnika"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Sinkroniziranje Spotify popisa izvođenja"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Sinkronizacija Spotify pjesama označenim zvjezdicama"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Kartice pri vrhu"
-@@ -4318,10 +4205,6 @@
- msgid "Use the system proxy settings"
- msgstr "Koristite proxy postavke od sustava"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Iskorišteno"
-@@ -4337,7 +4220,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Korisničko ime"
-@@ -4572,20 +4454,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Sviđa vam se ova pjesma"
-@@ -4653,7 +4521,6 @@
- msgstr "Vaši scrobbles: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4742,8 +4609,6 @@
- msgstr "u posljednjih"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/hu.po clementine-libre-1.0.1/src/translations/hu.po
---- clementine-1.0.1/src/translations/hu.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/hu.po 2012-05-29 16:50:46.463082538 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Grooveshark Anywhere fiók szükséges."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify prémium fiók szükséges"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -316,7 +312,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Mindig indítja a lejátszást"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"A Spotify használatához külön beépülő szükséges. Szeretnéd most letölteni és"
--" telepíteni?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Hiba történt az iTunes adatbázis másolása közben az eszközről"
-@@ -823,10 +810,6 @@
- msgid "CUE sheet support"
- msgstr "CUE fájl támogatás"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Mégsem"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Albumborító módosítása"
-@@ -1042,10 +1025,6 @@
- msgid "Configure Shortcuts"
- msgstr "Billentyűkombinációk beállítása"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Spotify beállítása..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Zenetár beállítása..."
-@@ -1065,10 +1044,6 @@
- msgid "Connect device"
- msgstr "Eszköz csatlakoztatása"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Csatlakozás a Spotifyhoz"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Állandó bitráta"
-@@ -1484,10 +1459,6 @@
- msgid "Download this album..."
- msgstr "Album letöltése..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Letöltés…"
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Icecast könyvtár letöltése"
-@@ -1500,10 +1471,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Magnatune katalógus letöltése"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Spotify beépülő letöltése"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Metaadat letöltése"
-@@ -1656,10 +1623,6 @@
- msgid "Error deleting songs"
- msgstr "Hiba történt a számok törlése közben"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Hiba a Spotify beépülő letöltése közben"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1842,12 +1805,6 @@
- msgid "Font size"
- msgstr "Betűméret"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Licencelési okok miatt a Spotify támogatást külön beépülőben kell "
--"telepíteni."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Mono kódolás kényszerítése"
-@@ -2117,10 +2074,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Beérkezett üzenetek"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Albumborító megjelenítése az értesítésben"
-@@ -2149,10 +2102,6 @@
- msgid "Insert..."
- msgstr "Beszúrás..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Telepítve"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2455,7 +2404,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2531,10 +2479,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Fő profil (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Hibásan formázott válasz"
-@@ -2793,10 +2737,6 @@
- msgid "Not enough neighbors"
- msgstr "Nincs elég szomszédja"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nincs telepítve"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2931,7 +2871,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Jelszó"
-@@ -3038,10 +2977,6 @@
- msgid "Playlists"
- msgstr "Lejátszási lista"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Beépülő állapot:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3072,7 +3007,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Beállítások"
-@@ -3089,10 +3023,6 @@
- msgid "Preferred audio format"
- msgstr "Előnyben részesített audio formátum"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Előnyben részesített formátum"
-@@ -3483,18 +3413,6 @@
- msgid "Search Magnatune"
- msgstr "Keresés a Magnatuneon"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Keresés Spotifyon"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Keresés Spotifyon (új lapot nyit)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Keresés Spotifyon (új lapot nyit)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3822,30 +3740,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Hiba a Spotifyra való bejelentkezéskor"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify beépülő"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "A Spotify beépülő nincs telepítve"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Normál"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Kedvenc"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Az éppen lejátszott lista indítása"
-@@ -3855,7 +3753,6 @@
- msgstr "Átkódolás indítása"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3941,18 +3838,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Spotify üzenetek szinkronizálása"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Spotify lejátszási lista szinkronizálása"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Spotify csillagozott számok szinronizálása"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Lapfülek felül"
-@@ -4327,10 +4212,6 @@
- msgid "Use the system proxy settings"
- msgstr "A rendszer proxy beállításainak használata"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Használt"
-@@ -4346,7 +4227,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Felhasználónév"
-@@ -4580,20 +4460,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Kedveled ezt a számot"
-@@ -4660,7 +4526,6 @@
- msgstr "Scrobblejaid: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4749,8 +4614,6 @@
- msgstr "az utóbbi"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/hy.po clementine-libre-1.0.1/src/translations/hy.po
---- clementine-1.0.1/src/translations/hy.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/hy.po 2012-05-29 16:51:35.523082336 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/ia.po clementine-libre-1.0.1/src/translations/ia.po
---- clementine-1.0.1/src/translations/ia.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ia.po 2012-05-29 16:52:43.266415554 -0400
-@@ -250,10 +250,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -309,7 +305,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -582,12 +577,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -813,10 +802,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1017,10 +1002,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1038,10 +1019,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1451,10 +1428,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1467,10 +1440,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1620,10 +1589,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1805,10 +1770,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2071,10 +2032,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2103,10 +2060,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2409,7 +2362,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2485,10 +2437,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2745,10 +2693,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2883,7 +2827,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2990,10 +2933,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3024,7 +2963,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3041,10 +2979,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3435,18 +3369,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3771,30 +3693,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3804,7 +3706,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3890,18 +3791,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4259,10 +4148,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4278,7 +4163,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4502,20 +4386,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4575,7 +4445,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4664,8 +4533,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/id.po clementine-libre-1.0.1/src/translations/id.po
---- clementine-1.0.1/src/translations/id.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/id.po 2012-05-29 16:55:43.939749412 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Sebuah akun Premium Spotify diperlukan."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -316,7 +312,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,12 +584,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -820,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1024,10 +1009,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1045,10 +1026,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1458,10 +1435,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1474,10 +1447,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1627,10 +1596,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1812,10 +1777,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2078,10 +2039,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2110,10 +2067,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2416,7 +2369,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2492,10 +2444,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2752,10 +2700,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2890,7 +2834,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2997,10 +2940,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3031,7 +2970,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3048,10 +2986,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3442,18 +3376,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3778,30 +3700,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3811,7 +3713,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3897,18 +3798,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4266,10 +4155,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4285,7 +4170,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4509,20 +4393,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4582,7 +4452,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4671,8 +4540,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/is.po clementine-libre-1.0.1/src/translations/is.po
---- clementine-1.0.1/src/translations/is.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/is.po 2012-05-29 16:56:42.033082876 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr "Alltaf hefja spilun"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Villa kom upp við afritun iTunes gagnagrunns af tæki"
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/it.po clementine-libre-1.0.1/src/translations/it.po
---- clementine-1.0.1/src/translations/it.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/it.po 2012-05-29 16:57:27.279749567 -0400
-@@ -256,10 +256,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "È richiesto un account Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "È richiesto un account Premium di Spotify"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -318,7 +314,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Inizia sempre la riproduzione"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Un plugin aggiuntivo è richiesto per utilizzare Spotify in Clementine. Vuoi "
--"scaricarlo e installarlo subito?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -829,10 +816,6 @@
- msgid "CUE sheet support"
- msgstr "Supporto CUE sheet"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Annulla"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Cambia copertina"
-@@ -1044,10 +1027,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configura scorciatoie"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configura Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configura raccolta..."
-@@ -1065,10 +1044,6 @@
- msgid "Connect device"
- msgstr "Connetti dispositivo"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Connessione a Spotify in corso"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Bitrate costante"
-@@ -1484,10 +1459,6 @@
- msgid "Download this album..."
- msgstr "Scarica questo album..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Scarica..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Scaricamento directory Icecast in corso"
-@@ -1500,10 +1471,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Scaricamento catalogo Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Scarica il plugin di Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Scaricamento metadati in corso"
-@@ -1658,10 +1625,6 @@
- msgid "Error deleting songs"
- msgstr "Errore durante l'eliminazione dei brani"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Errore di scaricamento del plugin di Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1844,11 +1807,6 @@
- msgid "Font size"
- msgstr "Dimensione del carattere"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Per motivi di licenza, il supporto di Spotify è in un plugin separato."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forza codifica mono"
-@@ -2123,10 +2081,6 @@
- "Nella modalità dinamica le nuove tracce saranno scelte e aggiunte alla "
- "scaletta al termine di ogni brano."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "In arrivo"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Includi copertina nella notifica"
-@@ -2155,10 +2109,6 @@
- msgid "Insert..."
- msgstr "Inserisci..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Installati"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2465,7 +2415,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2541,10 +2490,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Profilo principale (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Rendi la scaletta disponibile non in linea"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Risposta non corretta"
-@@ -2804,10 +2749,6 @@
- msgid "Not enough neighbors"
- msgstr "Vicini non sufficienti"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Non installati"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Accesso non effettuato"
-@@ -2942,7 +2883,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Password"
-@@ -3049,10 +2989,6 @@
- msgid "Playlists"
- msgstr "Scalette"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stato del plugin:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3083,7 +3019,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferenze"
-@@ -3100,10 +3035,6 @@
- msgid "Preferred audio format"
- msgstr "Formato audio preferito"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Bitrate preferito"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Formato preferito"
-@@ -3494,18 +3425,6 @@
- msgid "Search Magnatune"
- msgstr "Cerca in Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Cerca in Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Cerca in Spotify (apre una nuova scheda)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Cerca in Spotify (apre una nuova scheda)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Cerca in tutte le fonti (raccolta, servizi internet, ...)"
-@@ -3831,30 +3750,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Errore di accesso a Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Plugin di Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Plugin di Spotify non installato"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Preferiti"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Avvia la scaletta attualmente in riproduzione"
-@@ -3864,7 +3763,6 @@
- msgstr "Avvia transcodifica"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3952,18 +3850,6 @@
- msgid "Switch provider"
- msgstr "Cambia fornitore"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Sincronizzazione inbox di Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Sincronizzazione scaletta di Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Sincronizzazione tracce preferite di Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Schede in alto"
-@@ -4351,10 +4237,6 @@
- msgid "Use the system proxy settings"
- msgstr "Utilizza le impostazioni di sistema del proxy"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Usa la normalizzazione del volume"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Utilizzato"
-@@ -4370,7 +4252,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nome utente"
-@@ -4607,22 +4488,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Non hai un account Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Non hai un account Premium Spotify."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Ti sei disconnesso da Spotify, reinserisci la password nella finestra "
--"Impostazioni."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Ti sei disconnesso da Spotify, reinserisci la password."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Ti piace questa traccia"
-@@ -4690,7 +4555,6 @@
- msgstr "I tuoi scrobble: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Nome utente o password non corretta."
-
-@@ -4779,8 +4643,6 @@
- msgstr "negli ultimi"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/ja.po clementine-libre-1.0.1/src/translations/ja.po
---- clementine-1.0.1/src/translations/ja.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ja.po 2012-05-29 16:58:23.063082909 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Grooveshark Anywhere のアカウントが必要です。"
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify のプレミアムアカウントが必要です。"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -313,7 +309,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -586,12 +581,6 @@
- msgid "Always start playing"
- msgstr "常に再生を開始する"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr "Clementine で Spotify を利用するには追加のプラグインが必要です。今すぐダウンロードしてインストールしますか?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "デバイスからの iTunes データベースのコピー エラーです"
-@@ -817,10 +806,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "キャンセル"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "カバー アートの変更"
-@@ -1023,10 +1008,6 @@
- msgid "Configure Shortcuts"
- msgstr "ショートカットの構成"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "ライブラリの構成..."
-@@ -1044,10 +1025,6 @@
- msgid "Connect device"
- msgstr "デバイスの接続"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1461,10 +1438,6 @@
- msgid "Download this album..."
- msgstr "このアルバムをダウンロード..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Icecast ディレクトリのダウンロード"
-@@ -1477,10 +1450,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Magnatune カタログのダウンロード"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Spotify のプラグインをダウンロード中"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "メタデータをダウンロード中"
-@@ -1630,10 +1599,6 @@
- msgid "Error deleting songs"
- msgstr "曲の削除エラー"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1815,10 +1780,6 @@
- msgid "Font size"
- msgstr "フォント サイズ"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2081,10 +2042,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "通知にアルバム アートを含める"
-@@ -2113,10 +2070,6 @@
- msgid "Insert..."
- msgstr "挿入..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "インターネット"
-@@ -2419,7 +2372,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2495,10 +2447,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "不正な応答です"
-@@ -2755,10 +2703,6 @@
- msgid "Not enough neighbors"
- msgstr "ご近所さんが足りません"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2893,7 +2837,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "パスワード"
-@@ -3000,10 +2943,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3034,7 +2973,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "環境設定"
-@@ -3051,10 +2989,6 @@
- msgid "Preferred audio format"
- msgstr "優先するオーディオ形式"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "優先する形式"
-@@ -3445,18 +3379,6 @@
- msgid "Search Magnatune"
- msgstr "Magnatune の検索"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3781,30 +3703,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "現在再生中のプレイリストを開始する"
-@@ -3814,7 +3716,6 @@
- msgstr "トランスコードの開始"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3900,18 +3801,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "タブを上に配置"
-@@ -4271,10 +4160,6 @@
- msgid "Use the system proxy settings"
- msgstr "システムのプロキシ設定を使用する"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "使用中"
-@@ -4290,7 +4175,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "ユーザー名"
-@@ -4520,20 +4404,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "このトラックは Love されています"
-@@ -4595,7 +4465,6 @@
- msgstr "Scrobble 回数: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "ユーザネームまたはパスワードが間違っています。"
-
-@@ -4684,8 +4553,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/ka.po clementine-libre-1.0.1/src/translations/ka.po
---- clementine-1.0.1/src/translations/ka.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ka.po 2012-05-29 16:59:47.116416380 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify-ის Premium ანგარიში აუცილებელია."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr "ყოველთვის დაიწყე დაკვრა"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "შეცდომა მოწყობილობიდან iTunes-ის მონაცემთა ბაზის კოპირებისას"
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr "CUE sheet-ის მხარდაჭერა"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "გაუქმება"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "ალბომის ყდის შეცვლა"
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/kk.po clementine-libre-1.0.1/src/translations/kk.po
---- clementine-1.0.1/src/translations/kk.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/kk.po 2012-05-29 17:17:47.953084141 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Поп"
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/ko.po clementine-libre-1.0.1/src/translations/ko.po
---- clementine-1.0.1/src/translations/ko.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ko.po 2012-05-29 17:20:24.469750963 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify 프리미엄 계정이 필요합니다."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/lt.po clementine-libre-1.0.1/src/translations/lt.po
---- clementine-1.0.1/src/translations/lt.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/lt.po 2012-05-29 17:21:09.749751142 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Reikalingas mokamas Spotify vartotojas"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -313,7 +309,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -586,14 +581,6 @@
- msgid "Always start playing"
- msgstr "Visada pradėti grojant"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Kad naudotumėte Spotify Clementine grotuve, jums reikia papildomo išplėtimo."
--" Ar parsiųsti ir įdiegti jį dabar?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Iškilo klaida kopijuojant iTunes duomenų bazę iš įrenginio"
-@@ -819,10 +806,6 @@
- msgid "CUE sheet support"
- msgstr "\"CUE sheet\" palaikymas"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Atšaukti"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Keisti viršelio paveikslėlį"
-@@ -1032,10 +1015,6 @@
- msgid "Configure Shortcuts"
- msgstr "Konfigūruoti sparčiuosius klavišus"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Konfigūruoti Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Konfigūruoti fonoteką..."
-@@ -1053,10 +1032,6 @@
- msgid "Connect device"
- msgstr "Prijungti įrenginį"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Jungiamasi prie Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Pastovus bitų dažnis"
-@@ -1472,10 +1447,6 @@
- msgid "Download this album..."
- msgstr "Atsisiunčiamas šis albumas"
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Atsisiųsti..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Atsiunčiamas Icecast aplankas"
-@@ -1488,10 +1459,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Atsiunčiamas Magnatune katalogas"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Siunčiamas Spotify plėtinys"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Atsiunčiami metaduomenys"
-@@ -1643,10 +1610,6 @@
- msgid "Error deleting songs"
- msgstr "Klaida trinant dainas"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Klaida siunčiant Spotify plėtinį"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1828,12 +1791,6 @@
- msgid "Font size"
- msgstr "Šrifto dydis"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Dėl licencijavimo priežasčių Spotify palaikymas yra įjungiamas per atskirą "
--"plėtinį."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Įjungti tik mono kodavimą"
-@@ -2104,10 +2061,6 @@
- "Dinamiškame režime nauji kūriniais bus parinkti ir pridėti į grojaraštį "
- "kaskart, kai dabar grojamas kūrinys baigsis."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Gautieji"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Rodyti albumo paveikslus pranešime"
-@@ -2136,10 +2089,6 @@
- msgid "Insert..."
- msgstr "Įterpti..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Įdiegta"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internetas"
-@@ -2444,7 +2393,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2520,10 +2468,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Pagrindinis profilis"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Padaryti šį grojaraštį prieinamą atsijungus"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Netinkamas atsakymas"
-@@ -2781,10 +2725,6 @@
- msgid "Not enough neighbors"
- msgstr "Nepakanka kaimynų"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Neįdiegta"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2919,7 +2859,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Slaptažodis"
-@@ -3026,10 +2965,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Plėtinio būklė:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3060,7 +2995,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Nustatymai"
-@@ -3078,10 +3012,6 @@
- msgid "Preferred audio format"
- msgstr "Pageidaujamas audio formatas"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Pageidaujamas formatas"
-@@ -3472,18 +3402,6 @@
- msgid "Search Magnatune"
- msgstr "Ieškoti Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Ieškoti Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Ieškoti Spotify (atveria naują kortelę)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Ieškoti Spotify (atveria naują kortelę)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3808,30 +3726,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify prisijungimo klaida"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify plėtinys"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify plėtinys neįdiegtas"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standartinis"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Su žvaigždute"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Pradėti grajaraštį nuo dabar grojančio"
-@@ -3841,7 +3739,6 @@
- msgstr "Perkoduoti"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3927,18 +3824,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Atnaujinama Spotify dėžutė"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Atnaujinama Spotify grojaraštis"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Atnaujinama Spotify pažymėti kūriniai"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Kortelės viršuje"
-@@ -4312,10 +4197,6 @@
- msgid "Use the system proxy settings"
- msgstr "Naudoti sistemos tarpinio serverio nustatymus"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Panaudota"
-@@ -4331,7 +4212,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Naudotojo vardas"
-@@ -4565,20 +4445,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Jūs mylite šį takelį"
-@@ -4645,7 +4511,6 @@
- msgstr "Jūsų pateikta informacija: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4734,8 +4599,6 @@
- msgstr "per paskutines"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/lv.po clementine-libre-1.0.1/src/translations/lv.po
---- clementine-1.0.1/src/translations/lv.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/lv.po 2012-05-29 17:21:57.143084399 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Nepieciešams Spotify Premium konts."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -315,7 +311,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -588,14 +583,6 @@
- msgid "Always start playing"
- msgstr "Vienmēr sākt atskaņošanu"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Lai lietotu Spotify, nepieciešams papildus spraudnis. Vai jūs vēlaties to "
--"lejupielādēt un instalēt?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Kļūda kopējot iTunes datubāzi no ierīces"
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Atcelt"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Mainīt vāka attēlu"
-@@ -1035,10 +1018,6 @@
- msgid "Configure Shortcuts"
- msgstr "Konfigurēt īsceļus"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Konfigurēt Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Konfigurēt bibliotēku..."
-@@ -1056,10 +1035,6 @@
- msgid "Connect device"
- msgstr "Pieslēgt ierīci"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Pieslēdzos Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konstants bitreits"
-@@ -1475,10 +1450,6 @@
- msgid "Download this album..."
- msgstr "Lejupielādēt šo albumu..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Lejupielādēt..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Lejupielādē Icecast mapi"
-@@ -1491,10 +1462,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Lejupielādē Magnatude katalogu"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Lejupielādē Spotify spraudni"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Lejupielādē metadatus"
-@@ -1646,10 +1613,6 @@
- msgid "Error deleting songs"
- msgstr "Kļūda dzēšot dziesmas"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Kļūda lejupielādējot Spotify spraudni"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1832,10 +1795,6 @@
- msgid "Font size"
- msgstr "Fonta izmērs"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Licencēšanas nolūkā Spotify atbalsts pieejams kā atsevišķs spraudnis"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forsēt mono kodēšanu"
-@@ -2102,10 +2061,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Ienākošie"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Iekļaut vāku attēlus paziņojumos"
-@@ -2134,10 +2089,6 @@
- msgid "Insert..."
- msgstr "Ievietot..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Uzstādīts"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internets"
-@@ -2441,7 +2392,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2517,10 +2467,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Galvenais profils (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Izkropļota atbilde"
-@@ -2778,10 +2724,6 @@
- msgid "Not enough neighbors"
- msgstr "Nepietiek kaimiņu"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nav uzstādīta"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2916,7 +2858,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Parole"
-@@ -3023,10 +2964,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Spraudņa statuss:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Popmūzika"
-@@ -3057,7 +2994,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Uzstādījumi"
-@@ -3074,10 +3010,6 @@
- msgid "Preferred audio format"
- msgstr "Vēlamais audio formāts"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Vēlamais formāts"
-@@ -3468,18 +3400,6 @@
- msgid "Search Magnatune"
- msgstr "Meklēt Magnatude"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Meklēt Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Meklēt Spotify (tiks atvērta jauna cilne)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Meklēt Spotify (tiks atvērta jauna cilne)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3804,30 +3724,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify pieslēgšanās kļūda"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify spraudnis"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify spraudnis nav uzstādīts"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standarts"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Novērtēts ar zvaigzni"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Sākt pašreiz atskaņoto dziesmu listi"
-@@ -3837,7 +3737,6 @@
- msgstr "Sākt kodēšanu"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3923,18 +3822,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Cilnes pa virsu"
-@@ -4304,10 +4191,6 @@
- msgid "Use the system proxy settings"
- msgstr "Lietot sistēmas starpniekservera uzstādījumus"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Izmantots"
-@@ -4323,7 +4206,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Lietotājvārds"
-@@ -4554,20 +4436,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Jūs mīlat šo dziesmu"
-@@ -4630,7 +4498,6 @@
- msgstr "Jūsu skrobli: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4719,8 +4586,6 @@
- msgstr "pēdējās"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kb/s"
-
-diff -rauN clementine-1.0.1/src/translations/mr.po clementine-libre-1.0.1/src/translations/mr.po
---- clementine-1.0.1/src/translations/mr.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/mr.po 2012-05-29 17:22:45.193084728 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/ms.po clementine-libre-1.0.1/src/translations/ms.po
---- clementine-1.0.1/src/translations/ms.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ms.po 2012-05-29 17:23:27.779751138 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Akaun Spotify Premium diperlukan"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -313,7 +309,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -586,14 +581,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Satu plugin tambahan diperlukan untuk menggunakan Spotify dalam Clementine. "
--"Inginkah anda memuat turun dan memasangnya sekarang?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Satu ralat berlaku semasa menyalin pangkalan data iTunes dari peranti"
-@@ -819,10 +806,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Batal"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Ubahkan seni kulit muka"
-@@ -1030,10 +1013,6 @@
- msgid "Configure Shortcuts"
- msgstr "Tetapkan Pintasan"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1051,10 +1030,6 @@
- msgid "Connect device"
- msgstr "Sambung peranti"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Menyambung ke Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Kadar bit malar"
-@@ -1464,10 +1439,6 @@
- msgid "Download this album..."
- msgstr "Muat turun album ini..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Muat Turun..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Memuat turun direktori Icecast"
-@@ -1480,10 +1451,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Memuat turun katalog Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Memuat turun plugin Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Memuatturun metadata"
-@@ -1633,10 +1600,6 @@
- msgid "Error deleting songs"
- msgstr "Ralat memadam lagu-lagu"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Ralat memuat turun plugin Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1822,11 +1785,6 @@
- msgid "Font size"
- msgstr "Saiz fon"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Atas sebab-sebab perlesenan sokongan Spotify berada dalam plugin berasingan."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2099,10 +2057,6 @@
- "Dalam mod dinamik trek-trek baru akan dipilih dan ditambah ke senarai main "
- "setiap kali lagu selesai."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Peti Masuk"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Sertakan hasil seni album dalam pemberitahuan"
-@@ -2131,10 +2085,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Terpasang"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2437,7 +2387,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2513,10 +2462,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Buatkan senarai main tersedia di luar talian"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2775,10 +2720,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Tidak dipasang"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2913,7 +2854,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Kata laluan"
-@@ -3020,10 +2960,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Status plugin:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3054,7 +2990,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3071,10 +3006,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3465,18 +3396,6 @@
- msgid "Search Magnatune"
- msgstr "Cari Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Cari Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Cari Spotify (buka tab baru)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Cari Spotify (buka tab baru)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3801,30 +3720,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Ralat log masuk Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Plugin Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Plugin Spotify tidak dipasang"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Piawai"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Disukai"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3834,7 +3733,6 @@
- msgstr "Mulakan transkod"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3920,18 +3818,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Tab-tab di atas"
-@@ -4308,10 +4194,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4327,7 +4209,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nama pengguna"
-@@ -4555,20 +4436,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Anda suka trek ini"
-@@ -4628,7 +4495,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4717,8 +4583,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/nb.po clementine-libre-1.0.1/src/translations/nb.po
---- clementine-1.0.1/src/translations/nb.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/nb.po 2012-05-29 17:24:06.539751459 -0400
-@@ -254,10 +254,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Til dette trenger du en Grooveshark Anywhere-konto."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Til dette trenger du en Spotify Premium-konto."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -316,7 +312,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Alltid start avspilling"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Det trengs et programtillegg for å bruke Spotify i Clementine. Ønsker du å "
--"laste ned og installere den nå?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "En feil oppsto under kopiering av iTunes databasen fra enheten"
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr "Støtte for CUE-filer"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Avbryt"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Endre omslagsbilde"
-@@ -1038,10 +1021,6 @@
- msgid "Configure Shortcuts"
- msgstr "Oppsett av hurtigtaster"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Konfigurere Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Sett opp bibliotek..."
-@@ -1059,10 +1038,6 @@
- msgid "Connect device"
- msgstr "Koble til enhet"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Kobler til Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konstant bitrate"
-@@ -1478,10 +1453,6 @@
- msgid "Download this album..."
- msgstr "Last ned dette albumet..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Last ned..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Laster ned Icecast-katalogen"
-@@ -1494,10 +1465,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Laster ned Magnatune-katalogen"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Laster ned Spotify-modul"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Laster ned metadata"
-@@ -1648,10 +1615,6 @@
- msgid "Error deleting songs"
- msgstr "Kunne ikke slette sanger"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Kunne ikke laste ned Spotify-modul"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1833,10 +1796,6 @@
- msgid "Font size"
- msgstr "Skriftstørrelse"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Av lisenshensyn er Spotify-støtte en egen innstikksmodul."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Tving monolyd-koding"
-@@ -2108,10 +2067,6 @@
- "I dynamisk modus vil nye spor bli valgt og lagt til spillelista hver gang en"
- " sang tar slutt."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Innboks"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Inkludér cover i meldingen"
-@@ -2140,10 +2095,6 @@
- msgid "Insert..."
- msgstr "Sett inn..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Installert"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internett"
-@@ -2446,7 +2397,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2522,10 +2472,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Hovedprofil (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Gjør spillelista tilgjengelig online"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Ugyldig svar"
-@@ -2782,10 +2728,6 @@
- msgid "Not enough neighbors"
- msgstr "Ikke nok naboer"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Ikke installert"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Ikke pålogget"
-@@ -2920,7 +2862,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Passord"
-@@ -3027,10 +2968,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Modulens status:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3061,7 +2998,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Innstillinger"
-@@ -3078,10 +3014,6 @@
- msgid "Preferred audio format"
- msgstr "Foretrukket lydformat"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Foretrukket format"
-@@ -3472,18 +3404,6 @@
- msgid "Search Magnatune"
- msgstr "Søk i Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Søk i Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Søk i Spotify (åpner en ny flik)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Søk i Spotify (åpner en ny flik...)"
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3808,30 +3728,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Kunne ikke logge på Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify-modul"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Har ikke installert Spotify-modul"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Har stjerner"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Begynn på spillelista nå"
-@@ -3841,7 +3741,6 @@
- msgstr "Start koding"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3927,18 +3826,6 @@
- msgid "Switch provider"
- msgstr "Switch-leverandør"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synkroniserer Spotify-innboksen"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synkroniserer Spotify-spillelista"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synkroniserer spor med sterner mot Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Fliker på toppen"
-@@ -4310,10 +4197,6 @@
- msgid "Use the system proxy settings"
- msgstr "Bruk standard proxy-innstillinger"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Brukt"
-@@ -4329,7 +4212,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Brukernavn"
-@@ -4565,20 +4447,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Du har ikke noen Grooveshark Anywhare-konto."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Du har ikke noen Spotify Premium-konto."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Du elsker dette sporet"
-@@ -4644,7 +4512,6 @@
- msgstr "Dine delte lyttevaner (\"scrobbles\"): %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Feil med din brukerinformasjon"
-
-@@ -4733,8 +4600,6 @@
- msgstr "i de siste"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/nl.po clementine-libre-1.0.1/src/translations/nl.po
---- clementine-1.0.1/src/translations/nl.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/nl.po 2012-05-29 17:24:47.773084596 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Een Grooveshark Anywhere account is vereist."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Een Spotify Premium account is vereist."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -317,7 +313,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -592,14 +587,6 @@
- msgid "Always start playing"
- msgstr "Altijd afspelen"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Een extra plug-in is vereist om Spotify in Clementine te gebruiken. Wilt u "
--"deze nu downloaden en installeren?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -829,10 +816,6 @@
- msgid "CUE sheet support"
- msgstr "CUE-sheet ondersteuning"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Annuleren"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Albumhoes wijzigen"
-@@ -1047,10 +1030,6 @@
- msgid "Configure Shortcuts"
- msgstr "Sneltoetsen instellen"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configureer Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Bibliotheek configureren…"
-@@ -1068,10 +1047,6 @@
- msgid "Connect device"
- msgstr "Apparaat verbinden"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Met Spotify verbinden"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Constante bitrate"
-@@ -1487,10 +1462,6 @@
- msgid "Download this album..."
- msgstr "Dit album downloaden…"
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Downloaden…"
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Icecast-map aan het downloaden"
-@@ -1503,10 +1474,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Magnatune-catalogus downloaden"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "De Spotify plug-in aan het downloaden"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Metadata ophalen"
-@@ -1660,10 +1627,6 @@
- msgid "Error deleting songs"
- msgstr "Fout tijdens het verwijderen van de nummers"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Fout bij het downloaden van de Spotify plug-in"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1846,12 +1809,6 @@
- msgid "Font size"
- msgstr "Tekengrootte"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Vanwege licenties is Spotify-ondersteuning alleen via een plug-in "
--"beschikbaar."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Mono-encodering forceren"
-@@ -2126,10 +2083,6 @@
- "In ‘dynamische modus’ worden nieuwe nummers gekozen en aan de afspeellijst "
- "toegevoegd op het moment dat een nummer eindigt."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Inbox"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Albumhoes in de notificatie weergeven"
-@@ -2158,10 +2111,6 @@
- msgid "Insert..."
- msgstr "Invoegen…"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Geïnstalleerd"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2466,7 +2415,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2542,10 +2490,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Normaal profiel (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Afspeellijst offline beschikbaar maken"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Foutieve respons"
-@@ -2806,10 +2750,6 @@
- msgid "Not enough neighbors"
- msgstr "Onvoldoende buren"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Niet geïnstalleerd"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Niet ingelogd"
-@@ -2944,7 +2884,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Wachtwoord"
-@@ -3051,10 +2990,6 @@
- msgid "Playlists"
- msgstr "Afspeellijsten"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Plug-in status:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3085,7 +3020,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Voorkeuren"
-@@ -3103,10 +3037,6 @@
- msgid "Preferred audio format"
- msgstr "Audioformaat-voorkeur"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Bitrate voorkeur"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Voorkeursformaat"
-@@ -3497,18 +3427,6 @@
- msgid "Search Magnatune"
- msgstr "Zoeken op Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Doorzoek Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Doorzoek Spotify (open nieuw tabblad)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Doorzoek Spotify (open nieuw tabblad)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Doorzoek al uw bronnen (bibliotheek, internet bronnen, ...)"
-@@ -3833,30 +3751,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify inlogfout"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify plug-in"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify plug-in niet geïnstalleerd"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standaard"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Met ster"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Momenteel spelende afspeellijst starten"
-@@ -3866,7 +3764,6 @@
- msgstr "Converteren starten"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Typ in de zoekbalk hierboven om naar muziek te zoeken op %1."
-@@ -3952,18 +3849,6 @@
- msgid "Switch provider"
- msgstr "Switch provider"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Spotify inbox synchroniseren"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Spotify afspeellijst synchroniseren"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Favoriete Spotify-nummers synchroniseren"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Tabs bovenaan"
-@@ -4350,10 +4235,6 @@
- msgid "Use the system proxy settings"
- msgstr "Globale proxy-instellingen gebruiken"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Volume normalisatie gebruiken"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Gebruikt"
-@@ -4369,7 +4250,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Gebruikersnaam"
-@@ -4607,22 +4487,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "U heeft geen Grooveshark Anywhere account."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "U heeft geen Spotify Premium account."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"U bent uitgelogd bij Spotify, voer in het voorkeuren venster nogmaals uw "
--"wachtwoord in."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "U bent uitgelogd bij Spotify, voer nogmaals uw wachtwoord in."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "U vindt dit nummer mooi"
-@@ -4690,7 +4554,6 @@
- msgstr "Uw scrobbles: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Uw gebruikersnaam of wachtwoord is niet correct."
-
-@@ -4779,8 +4642,6 @@
- msgstr "in de laatste"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/oc.po clementine-libre-1.0.1/src/translations/oc.po
---- clementine-1.0.1/src/translations/oc.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/oc.po 2012-05-29 17:25:36.176417975 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurar los acorchis de clavièr"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Sus Internet"
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/pa.po clementine-libre-1.0.1/src/translations/pa.po
---- clementine-1.0.1/src/translations/pa.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/pa.po 2012-05-29 17:26:32.036418109 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/pl.po clementine-libre-1.0.1/src/translations/pl.po
---- clementine-1.0.1/src/translations/pl.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/pl.po 2012-05-29 17:27:25.839751300 -0400
-@@ -254,10 +254,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Potrzebne jest konto Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Musisz posiadać konto Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -318,7 +314,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Odtwarzaj automatycznie"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Aby korzystać ze Spotify przy użyciu Clementine, wymagany jest dodatkowy "
--"skrypt. Czy chcesz go teraz pobrać?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Wystąpił błąd podczas kopiowania bazy danych iTunes z urządzenia"
-@@ -824,10 +811,6 @@
- msgid "CUE sheet support"
- msgstr "obsługa arkuszy CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Anuluj"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Zmień okładkę"
-@@ -1041,10 +1024,6 @@
- msgid "Configure Shortcuts"
- msgstr "Konfiguracja skrótów klawiszowych"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Konfiguracja Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Konfiguruj bibliotekę..."
-@@ -1062,10 +1041,6 @@
- msgid "Connect device"
- msgstr "Podłącz urządzenie"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Połącz z Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Stały bitrate"
-@@ -1481,10 +1456,6 @@
- msgid "Download this album..."
- msgstr "Pobierz ten album..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Pobierz..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Pobieranie katalogu Icecast"
-@@ -1497,10 +1468,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Pobieranie katalogu Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Pobierz plugin Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Pobieranie metadanych"
-@@ -1651,10 +1618,6 @@
- msgid "Error deleting songs"
- msgstr "Błąd przy usuwaniu utworów"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Plugin Spotify - nieudane pobieranie"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1837,11 +1800,6 @@
- msgid "Font size"
- msgstr "Rozmiar czcionki"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Ze względów licencyjnych Spotify obsługiwany jest przez oddzielny plugin"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Wymuś kodowanie mono"
-@@ -2114,10 +2072,6 @@
- "W trybie dynamicznym nowe utwory będą wybierane i dodawane do playlisty za "
- "każdym razem gdy skończy się odtwarzanie bieżącego utworu."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Skrzynka odbiorcza"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Dołącz okładkę albumu"
-@@ -2146,10 +2100,6 @@
- msgid "Insert..."
- msgstr "Wstaw..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Zainstalowano"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2454,7 +2404,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2530,10 +2479,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Profil główny (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Uczyń playlistę dostępną offline"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Nieprawidłowa odpowiedź"
-@@ -2793,10 +2738,6 @@
- msgid "Not enough neighbors"
- msgstr "Za mało sąsiadów"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nie zainstalowano"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2931,7 +2872,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Hasło"
-@@ -3038,10 +2978,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stan wtyczki:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3072,7 +3008,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Ustawienia"
-@@ -3090,10 +3025,6 @@
- msgid "Preferred audio format"
- msgstr "Preferowany format audio"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Preferowany format"
-@@ -3484,18 +3415,6 @@
- msgid "Search Magnatune"
- msgstr "Przeszukaj Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Szukaj w Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Szukaj w Spotify (nowa karta)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Szukaj w Spotify (nowa karta)"
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3821,30 +3740,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Nieudane logowanie do Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Wtyczka Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Nie zainstalowano pluginu Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standardowy"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Oznaczone gwiazdką"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Rozpocznij aktualnie odtwarzaną listę"
-@@ -3854,7 +3753,6 @@
- msgstr "Rozpocznij transkodowanie"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3940,18 +3838,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synchronizowanie skrzynki Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synchronizowanie playlisty Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synchronizowanie utworów oznaczonych gwiazdką na Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Zakładki na górze"
-@@ -4326,10 +4212,6 @@
- msgid "Use the system proxy settings"
- msgstr "Użyj systemowych ustawień proxy"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Użyto"
-@@ -4345,7 +4227,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Użytkownik"
-@@ -4579,20 +4460,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Kochasz tę ścieżkę"
-@@ -4662,7 +4529,6 @@
- msgstr "Przesłane utwory: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4751,8 +4617,6 @@
- msgstr "w ostatnich"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/pt_BR.po clementine-libre-1.0.1/src/translations/pt_BR.po
---- clementine-1.0.1/src/translations/pt_BR.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/pt_BR.po 2012-05-29 17:30:29.606418269 -0400
-@@ -251,10 +251,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "É necessária uma conta Premium Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -313,7 +309,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -586,14 +581,6 @@
- msgid "Always start playing"
- msgstr "Sempre começar tocando"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Um plugin adicional é necessário para usar Spotify no Clementine. Gostaria "
--"de fazer o download e instalá-lo agora?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -821,10 +808,6 @@
- msgid "CUE sheet support"
- msgstr "Suporte a lista CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Cancelar"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Alterar capa"
-@@ -1036,10 +1019,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurar atalhos"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configurar Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurar biblioteca"
-@@ -1057,10 +1036,6 @@
- msgid "Connect device"
- msgstr "Conectar dispositivo"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Conectando ao Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Taxa de bits constante"
-@@ -1476,10 +1451,6 @@
- msgid "Download this album..."
- msgstr "Baixar este álbum..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Baixar..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Baixando diretório Icecast"
-@@ -1492,10 +1463,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Baixando catálogo da Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Baixando plugin Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Baixando metadados"
-@@ -1647,10 +1614,6 @@
- msgid "Error deleting songs"
- msgstr "Erro ao apagar músicas"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Erro ao baixar o plugin Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1834,12 +1797,6 @@
- msgid "Font size"
- msgstr "Tamanho da fonte"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Por motivos de licenciamento, o suporte ao Spotify está em um plugin "
--"separado."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forçar codificação em mono"
-@@ -2113,10 +2070,6 @@
- "No modo dinâmico, novas faixas serão escolhidas e adicionadas à lista de "
- "reprodução toda a vez que uma musica terminar."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Caixa de entrada"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Incluir capa do álbum na notificação"
-@@ -2145,10 +2098,6 @@
- msgid "Insert..."
- msgstr "Inserir..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalado"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2453,7 +2402,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2529,10 +2477,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Meu perfil (PRINCIPAL)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Tornar lista de reprodução disponível offline"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Resposta inválida"
-@@ -2793,10 +2737,6 @@
- msgid "Not enough neighbors"
- msgstr "Sem vizinhos o bastante"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Não instalado"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2931,7 +2871,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Senha"
-@@ -3038,10 +2977,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Status do plugin:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3072,7 +3007,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferências"
-@@ -3089,10 +3023,6 @@
- msgid "Preferred audio format"
- msgstr "Formato de áudio preferido"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Formato preferido"
-@@ -3483,18 +3413,6 @@
- msgid "Search Magnatune"
- msgstr "Pesquisar Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Procurar Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Procurar Spotify (abre um novo aba)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Procurar Spotify (abre um novo aba)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3819,30 +3737,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Erro ao conectar no Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Plugin Spofity"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Plugin Spofity não instalado"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Padrão"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Favoritos"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Iniciar a lista que está em execução"
-@@ -3852,7 +3750,6 @@
- msgstr "Começar transcodificação"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3938,18 +3835,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Sincronizando caixa de entrada do Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Sincronizando listas de reprodução do Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Sincronizando faixas favoritas do Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Mostrar abas no topo"
-@@ -4329,10 +4214,6 @@
- msgid "Use the system proxy settings"
- msgstr "Usar configurações de proxy do sistema"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Usado"
-@@ -4348,7 +4229,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nome de usuário"
-@@ -4582,20 +4462,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Você adora essa faixa"
-@@ -4661,7 +4527,6 @@
- msgstr "Seus scrobbles: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4750,8 +4615,6 @@
- msgstr "nos últimos"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/pt.po clementine-libre-1.0.1/src/translations/pt.po
---- clementine-1.0.1/src/translations/pt.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/pt.po 2012-05-29 17:28:15.776418125 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Requer uma conta Grooveshark Anywhere"
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Requer uma conta Spotify Premium"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -316,7 +312,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Iniciar sempre a reprodução"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Necessita de um \"plug-in\" para utilizar o Spotify no Clementine. Pretende "
--"transferir e instalar o \"plug-in\"?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -823,10 +810,6 @@
- msgid "CUE sheet support"
- msgstr "Suporte a ficheiros CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Cancelar"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Alterar capa do álbum"
-@@ -1040,10 +1023,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurar atalhos"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configurar Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurar coleção..."
-@@ -1061,10 +1040,6 @@
- msgid "Connect device"
- msgstr "Ligar dispositivo"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Ligar ao Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Taxa de dados constante"
-@@ -1480,10 +1455,6 @@
- msgid "Download this album..."
- msgstr "Transferir este álbum..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Transferir..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "A transferir o diretório Icecast"
-@@ -1496,10 +1467,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "A transferir o catálogo Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "A transferir o \"plug-in\" Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "A transferir dados"
-@@ -1652,10 +1619,6 @@
- msgid "Error deleting songs"
- msgstr "Erro ao eliminar faixas"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Erro ao transferir o \"plug-in\""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1837,12 +1800,6 @@
- msgid "Font size"
- msgstr "Tamanho de letra"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Devido à sua licença, o \"plug-in\" do Spotify é disponibilizado "
--"separadamente"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forçar codificação mono"
-@@ -2114,10 +2071,6 @@
- "No modo dinâmico, as faixas são escolhidas e adicionadas à lista de "
- "reprodução assim que uma música termine"
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Caixa de entrada"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Incluir capa do álbum na notificação"
-@@ -2146,10 +2099,6 @@
- msgid "Insert..."
- msgstr "Inserir..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalado"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2454,7 +2403,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2530,10 +2478,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Perfil principal (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Tornar lista de reprodução disponível localmente"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Resposta inválida"
-@@ -2793,10 +2737,6 @@
- msgid "Not enough neighbors"
- msgstr "Vizinhos insuficientes"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Não instalado"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Sessão não iniciada"
-@@ -2931,7 +2871,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Senha"
-@@ -3038,10 +2977,6 @@
- msgid "Playlists"
- msgstr "Listas de reprodução"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Estado:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3072,7 +3007,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferências"
-@@ -3089,10 +3023,6 @@
- msgid "Preferred audio format"
- msgstr "Formato áudio preferido"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Taxa de dados preferencial"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Formato preferido"
-@@ -3483,18 +3413,6 @@
- msgid "Search Magnatune"
- msgstr "Pesquisar no Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Procurar no Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Procurar no Spotify (abre um novo separador)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Procurar no Spotify (abre um novo separador)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Procurar em todas as fontes (coleção, internet, ...)"
-@@ -3820,30 +3738,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Erro de autenticação Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "\"Plug-in\" Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "\"Plug-in\" Spotify não instalado"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Padrão"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Com estrela"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Iniciar lista de reprodução atual"
-@@ -3853,7 +3751,6 @@
- msgstr "Iniciar conversão"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Escreva algo na caixa de procura para descobrir músicas no %1"
-@@ -3939,18 +3836,6 @@
- msgid "Switch provider"
- msgstr "Trocar fornecedor"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "A sincronizar caixa de entrada Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "A sincronizar lista de reprodução Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "A sincronizar faixas Spotify assinaladas"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Separadores no topo"
-@@ -4333,10 +4218,6 @@
- msgid "Use the system proxy settings"
- msgstr "Utilizar definições do sistema"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Utilizar normalização de volume"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Utilizado"
-@@ -4352,7 +4233,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Utilizador"
-@@ -4589,22 +4469,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Você não tem uma conta Grooveshark Anywhere"
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Você não tem uma conta Spotify Premium"
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Terminou a sessão no Spotify. Reintroduza a sua senha na caixa de diálogo de"
--" definições"
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Terminou a sessão no Spotify. Reintroduza a sua senha"
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Você gosta desta faixa"
-@@ -4671,7 +4535,6 @@
- msgstr "Os seus envios: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Utilizador e/ou senha inválida"
-
-@@ -4760,8 +4623,6 @@
- msgstr "no(s) último(s)"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/ro.po clementine-libre-1.0.1/src/translations/ro.po
---- clementine-1.0.1/src/translations/ro.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ro.po 2012-05-29 17:31:07.169751658 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Este necesar un cont Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Este necesar un cont Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -317,7 +313,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -590,14 +585,6 @@
- msgid "Always start playing"
- msgstr "Începe redarea întotdeauna"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Este necesara activarea unui plugin pentru utlizarea Spotify in Clementine. "
--"Doriți să fie descărcat si instalat acum?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "A apărut o eroare de copiere a bazei de date iTunes de pe dispozitiv"
-@@ -823,10 +810,6 @@
- msgid "CUE sheet support"
- msgstr "CUE placa suport"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Anulare"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Schimbă imaginea coperții"
-@@ -1037,10 +1020,6 @@
- msgid "Configure Shortcuts"
- msgstr "Configurează scurtături"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Configurare Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Configurează biblioteca..."
-@@ -1058,10 +1037,6 @@
- msgid "Connect device"
- msgstr "Conectează un dispozitiv"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Se conectează la Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Rată de biți constantă"
-@@ -1477,10 +1452,6 @@
- msgid "Download this album..."
- msgstr "Descarcă acest album..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Descărcare..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Descărcare dosarul Icecast"
-@@ -1493,10 +1464,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Descărcare catalog Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Se descarcă pluginul Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Descărcare metadata"
-@@ -1651,10 +1618,6 @@
- msgid "Error deleting songs"
- msgstr "Eroare ștergere melodii"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Eroare la descărcarea pluginului Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1838,11 +1801,6 @@
- msgid "Font size"
- msgstr "Dimensiunea fontului"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"Din motive de licență, suportul pentru Spotify este într-un plugin separat."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Forțează codarea mono"
-@@ -2114,10 +2072,6 @@
- "În modul dinamic, melodii noi vor fi alese și adăugate la lista de redare de"
- " fiecare dată când se termină o melodie."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Includeți album de artă în notificare"
-@@ -2146,10 +2100,6 @@
- msgid "Insert..."
- msgstr "Introduce..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalat"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2452,7 +2402,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2528,10 +2477,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Profil principal (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2788,10 +2733,6 @@
- msgid "Not enough neighbors"
- msgstr "Nu sunt destui vecini"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Neinstalat"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2926,7 +2867,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Parolă"
-@@ -3033,10 +2973,6 @@
- msgid "Playlists"
- msgstr "Liste de redare"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Status plugin:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3067,7 +3003,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Preferinţe"
-@@ -3084,10 +3019,6 @@
- msgid "Preferred audio format"
- msgstr "Format audio preferat"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Rată de biți preferată"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Format preferat"
-@@ -3478,18 +3409,6 @@
- msgid "Search Magnatune"
- msgstr "Caută în Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Caută în Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Caută în Spotify (deschide o filă nouă)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Caută în Spotify (deschide o filă nouă)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3814,30 +3733,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Eroare la logarea în Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Plugin Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Pluginul Spotify nu este instalat"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Cu steluță"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3847,7 +3746,6 @@
- msgstr "Începe transcodare"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3933,18 +3831,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "File deasupra"
-@@ -4304,10 +4190,6 @@
- msgid "Use the system proxy settings"
- msgstr "Folosește setările de proxy ale sistemului"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4323,7 +4205,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Nume de utilizator"
-@@ -4549,20 +4430,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Nu aveți un cont Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4622,7 +4489,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Parola sau numele de utilizator au fost incorecte."
-
-@@ -4711,8 +4577,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/ru.po clementine-libre-1.0.1/src/translations/ru.po
---- clementine-1.0.1/src/translations/ru.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/ru.po 2012-05-29 17:31:44.913085063 -0400
-@@ -256,10 +256,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Требуется учётная запись Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Требуется Premium аккаунт Spotify"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -320,7 +316,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -593,14 +588,6 @@
- msgid "Always start playing"
- msgstr "Всегда начинать воспроизведение"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Требуется дополнительный модуль для использования Spotify в Clementine. "
--"Скачать и установить его?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Произошла ошибка при загрузке данных iTunes с устройства"
-@@ -826,10 +813,6 @@
- msgid "CUE sheet support"
- msgstr "Поддержка файлов разметки CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Отмена"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Выберите обложку"
-@@ -1045,10 +1028,6 @@
- msgid "Configure Shortcuts"
- msgstr "Комбинации клавиш"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Настройка Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Настроить коллекцию..."
-@@ -1066,10 +1045,6 @@
- msgid "Connect device"
- msgstr "Подсоединение устройства"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Подключение к Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Постоянный битрейт"
-@@ -1485,10 +1460,6 @@
- msgid "Download this album..."
- msgstr "Загрузить этот альбом"
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Загрузить..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Загружаем директорию Icecast"
-@@ -1501,10 +1472,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Скачать каталог Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Загрузка модуля Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Загрузка метаданных"
-@@ -1658,10 +1625,6 @@
- msgid "Error deleting songs"
- msgstr "Ошибка удаления композиций"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Ошибка загрузки модуля Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1845,12 +1808,6 @@
- msgid "Font size"
- msgstr "Размер шрифта"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"По лицензионным соображениям поддержка Spotify реализована в виде отдельного"
--" плагина"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Принудительное кодирование в моно"
-@@ -2122,10 +2079,6 @@
- "В динамическом режиме новые треки выбираются и добавляются в список "
- "воспроизведения каждый раз, когда заканчивается очередная песня."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Входящие"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Показывать обложку альбома в уведомлении"
-@@ -2154,10 +2107,6 @@
- msgid "Insert..."
- msgstr "Вставить..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Установлено"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Интернет"
-@@ -2462,7 +2411,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2538,10 +2486,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Основной профиль (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Сделать плейлист доступным оффлайн"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Неправильный ответ"
-@@ -2800,10 +2744,6 @@
- msgid "Not enough neighbors"
- msgstr "Недостаточно соседей"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Не установлено"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Не был выполнен логин"
-@@ -2938,7 +2878,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Пароль"
-@@ -3045,10 +2984,6 @@
- msgid "Playlists"
- msgstr "Списки воспроизведения"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Статус модуля:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3079,7 +3014,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Настройки"
-@@ -3096,10 +3030,6 @@
- msgid "Preferred audio format"
- msgstr "Предпочитаемый аудио формат"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Предпочитаемый битрейт"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Предпочитаемый формат"
-@@ -3490,18 +3420,6 @@
- msgid "Search Magnatune"
- msgstr "Искать на Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Поиск на Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Поиск на Spotify (открывается в новой вкладке)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Поиск на Spotify (в новой вкладке)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Искать во всех источниках (библиотеке, интернет сервисах, ...)"
-@@ -3827,30 +3745,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Ошибка имени пользователя Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Модуль Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Модуль Spotify не установлен"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Стандартный"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Оцененные"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Запустить список воспроизведения проигрываемый в данный момент"
-@@ -3860,7 +3758,6 @@
- msgstr "Начать перекодирование"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Наберите начальные буквы наименования песни чтобы начать поиск в %1"
-@@ -3946,18 +3843,6 @@
- msgid "Switch provider"
- msgstr "Выбрать другой источник"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Синхронизация входящих Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Синхронизация плейлистов Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Синхронизация рейтингованных треков Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Вкладки вверху"
-@@ -4336,10 +4221,6 @@
- msgid "Use the system proxy settings"
- msgstr "Использовать системные настройки прокси"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Использовать выравнивание громкости"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Использовано"
-@@ -4355,7 +4236,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Имя пользователя"
-@@ -4591,23 +4471,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "У вас нет учетной записи Grooveshark Anywhere"
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "У вас нет учетной записи Spotify Premium"
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Подключение к сервису Spotify было разорвано, введите ваш пароль ещё раз в"
--" диалоге Настройки."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--"Подключение к сервису Spotify было разорвано, введите ваш пароль ещё раз."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Вам нравится эта композиция"
-@@ -4675,7 +4538,6 @@
- msgstr "Ваш скробблинг: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Имя пользователя или пароль неправильные."
-
-@@ -4764,8 +4626,6 @@
- msgstr "в последние"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "кбит/с"
-
-diff -rauN clementine-1.0.1/src/translations/sk.po clementine-libre-1.0.1/src/translations/sk.po
---- clementine-1.0.1/src/translations/sk.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/sk.po 2012-05-29 17:32:30.349751863 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Je vyžadovaný Grooveshark Anywhere účet."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Je vyžadovaný prémium účet na Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -314,7 +310,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -587,14 +582,6 @@
- msgid "Always start playing"
- msgstr "Hneď začne hrať"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Aby sa dalo Spotify využiť v Clementine, je vyžadovaný ďalší plugin. Chcete "
--"ho teraz stiahnuť a nainštalovať?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Nastala chyba pri kopírovaní iTunes databázy zo zariadenia"
-@@ -820,10 +807,6 @@
- msgid "CUE sheet support"
- msgstr "podpora CUE zoznamu"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Zrušiť"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Zmeniť obal albumu"
-@@ -1034,10 +1017,6 @@
- msgid "Configure Shortcuts"
- msgstr "Klávesové skratky"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Nastaviť Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Nastaviť zbierku..."
-@@ -1055,10 +1034,6 @@
- msgid "Connect device"
- msgstr "Pripojiť zariadenie"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Pripájanie k Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konštantný dátový tok"
-@@ -1474,10 +1449,6 @@
- msgid "Download this album..."
- msgstr "Stiahnuť tento album..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Stiahnuť..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Sťahuje sa Icecast priečinok"
-@@ -1490,10 +1461,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Sťahuje sa Magnatune katalóg"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Sťahuje sa Spotify plugin"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Sťahujú sa metadáta"
-@@ -1648,10 +1615,6 @@
- msgid "Error deleting songs"
- msgstr "Chyba pri vymazávaní piesní"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Chyba pri sťahovaní Spotify pluginu."
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1834,10 +1797,6 @@
- msgid "Font size"
- msgstr "Veľkosť písma"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Kvôli licenčným dôvodom je podpora Spotify v oddelenom plugine."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Vynútiť mono enkódovanie"
-@@ -2109,10 +2068,6 @@
- "V dynamickom režime budú nové skladby vybraté a pridané do playlistu "
- "zakaždým keď skončí pieseň."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Doručené"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Zahrnúť obal do upozornenia"
-@@ -2141,10 +2096,6 @@
- msgid "Insert..."
- msgstr "Vložiť..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Nainštalované"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2447,7 +2398,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2523,10 +2473,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Hlavný profil (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Urobiť playlist dostupný offline"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Poškodená odpoveď"
-@@ -2785,10 +2731,6 @@
- msgid "Not enough neighbors"
- msgstr "Nedostatok susedov"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Nenainštalované"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Nieprihlásený"
-@@ -2923,7 +2865,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Heslo"
-@@ -3030,10 +2971,6 @@
- msgid "Playlists"
- msgstr "Playlisty"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stav pluginu:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3064,7 +3001,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Nastavenia"
-@@ -3081,10 +3017,6 @@
- msgid "Preferred audio format"
- msgstr "Preferovaný formát zvuku"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Preferovaný dátový tok"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Preferovaný formát"
-@@ -3475,18 +3407,6 @@
- msgid "Search Magnatune"
- msgstr "Hľadať na Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Hľadať v Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Hľadať v Spotify (otvorí novú kartu)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Hľadať v Spotify (otvorí novú kartu)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3812,30 +3732,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Chyba pri prihlasovaní na Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify plugin"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify plugin nieje nainštalovaný"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Štandardný"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "S hviezdičkou"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Začať playlist práve prehrávanou"
-@@ -3845,7 +3745,6 @@
- msgstr "Začať transkódovanie"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3932,18 +3831,6 @@
- msgid "Switch provider"
- msgstr "Zmeniť poskytovateľa"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synchronizuje sa Spotify schránka"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synchronizuje sa Spotify playlist"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synchronizujú sa skladby ohviezdičkované na Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Karty na vrchu"
-@@ -4325,10 +4212,6 @@
- msgid "Use the system proxy settings"
- msgstr "Použiť systémové nastavenia proxy"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Použiť normalizáciu hlasitosti"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Použitých"
-@@ -4344,7 +4227,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Meno používateľa"
-@@ -4580,22 +4462,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Nemáte Grooveshark Anywhere účet."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Nemáte Spotify prémium účet."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Boli ste odhlásení zo Spotify, prosím, zadajte heslo znovu v dialógu "
--"Nastavenia."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Boli ste odhlásený zo Spotify, prosím znovu zadajte heslo."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Milujete túto pieseň"
-@@ -4663,7 +4529,6 @@
- msgstr "Skroblujete: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Vaše meno používateľa alebo heslo bolo nesprávne."
-
-@@ -4752,8 +4617,6 @@
- msgstr "za posledných"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/sl.po clementine-libre-1.0.1/src/translations/sl.po
---- clementine-1.0.1/src/translations/sl.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/sl.po 2012-05-29 17:41:04.549752271 -0400
-@@ -252,10 +252,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Zahtevan je račun Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -314,7 +310,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -587,14 +582,6 @@
- msgid "Always start playing"
- msgstr "Vedno začni s predvajanjem"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Da lahko uporabite Spotify v Clementine, potrebujete dodaten vstavek. Ga "
--"želite prejeti in namestiti zdaj?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr "Podpora predlogam CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Prekliči"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Spremeni ovitek albuma"
-@@ -1039,10 +1022,6 @@
- msgid "Configure Shortcuts"
- msgstr "Nastavi bližnjice"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Nastavi Spotify ..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Nastavi knjižnico ..."
-@@ -1060,10 +1039,6 @@
- msgid "Connect device"
- msgstr "Priklopi napravo"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Povezovanje na Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Stalna bitna hitrost"
-@@ -1479,10 +1454,6 @@
- msgid "Download this album..."
- msgstr "Prejmi ta album ..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Prejmi ..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Prejemanje imenika Icecast"
-@@ -1495,10 +1466,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Prejemanje kataloga Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Prejemanje vstavka Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Prejemanje metapodatkov"
-@@ -1651,10 +1618,6 @@
- msgid "Error deleting songs"
- msgstr "Napaka pri brisanju skladb"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Napaka med prejemanjem vstavka Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1836,10 +1799,6 @@
- msgid "Font size"
- msgstr "Velikost pisave"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Zaradi licence je podpora Spotify v ločenem vstavku."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Vsili mono kodiranje"
-@@ -2111,10 +2070,6 @@
- "V dinamičnem načinu bodo nove skladbe izbrane in dodane na seznam "
- "predvajanja vsakič, ko se prejšnja skladba konča."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Prejeto"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Vključi ovitek albuma v obvestilo"
-@@ -2143,10 +2098,6 @@
- msgid "Insert..."
- msgstr "Vstavi ..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Nameščeno"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Medmrežje"
-@@ -2449,7 +2400,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2525,10 +2475,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Glavni profil (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Seznam predvajanja naj bo na voljo tudi brez povezave"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Nepravilno oblikovan odziv"
-@@ -2787,10 +2733,6 @@
- msgid "Not enough neighbors"
- msgstr "Ni dovolj sosedov"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Ni nameščeno"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2925,7 +2867,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Geslo"
-@@ -3032,10 +2973,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Stanje vstavka:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3066,7 +3003,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Možnosti"
-@@ -3083,10 +3019,6 @@
- msgid "Preferred audio format"
- msgstr "Prednostna vrsta zvoka"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Prednostna vrsta"
-@@ -3477,18 +3409,6 @@
- msgid "Search Magnatune"
- msgstr "Išči na Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Išči po Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Išči po Spotify (odpre nov zavihek)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Išči po Spotify (odpre nov zavihek) ..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3814,30 +3734,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Napaka med prijavo na Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Vstavek Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Vstavek Spotify ni nameščen"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Običajno"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Z zvezdico"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Predvajaj skladbo, ki je označena v predvajalnem seznamu"
-@@ -3847,7 +3747,6 @@
- msgstr "Začni s prekodiranjem"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3933,18 +3832,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Usklajevanje mape Spotify - prejeto"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Usklajevanje seznama predvajanja Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Usklajevanje označenih skladb v Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Zavihki na vrhu"
-@@ -4322,10 +4209,6 @@
- msgid "Use the system proxy settings"
- msgstr "Uporabi nastavitve posredniškega strežnika sistema"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Uporabljeno"
-@@ -4341,7 +4224,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Uporabniško ime"
-@@ -4575,20 +4457,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "To je vaša priljubljena skladba"
-@@ -4655,7 +4523,6 @@
- msgstr "Vaši seznami predvajanih skladb: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4744,8 +4611,6 @@
- msgstr "v zadnjih"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kb/s"
-
-diff -rauN clementine-1.0.1/src/translations/sr@latin.po clementine-libre-1.0.1/src/translations/sr@latin.po
---- clementine-1.0.1/src/translations/sr@latin.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/sr@latin.po 2012-05-29 17:42:43.256419021 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr ""
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr ""
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr ""
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4501,20 +4385,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4574,7 +4444,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4663,8 +4532,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/sr.po clementine-libre-1.0.1/src/translations/sr.po
---- clementine-1.0.1/src/translations/sr.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/sr.po 2012-05-29 17:41:46.463085756 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Потребан је Spotify Premium налог"
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -311,7 +307,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -584,14 +579,6 @@
- msgid "Always start playing"
- msgstr "Увек почни да свираш"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Додатак је потребан да би се користио Spotify у Клементини. Да ли желиш да "
--"га преузмеш и одмах уградиш?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Дошло је до грешке услед копирања базе података iTunes из уређаја"
-@@ -817,10 +804,6 @@
- msgid "CUE sheet support"
- msgstr "CUE подршка листа"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Otkaži"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Промени слику насловне"
-@@ -1030,10 +1013,6 @@
- msgid "Configure Shortcuts"
- msgstr "Подеси пречице"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Подеси Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Подеси библиотеку"
-@@ -1051,10 +1030,6 @@
- msgid "Connect device"
- msgstr "Повежи уређај"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Повежи се на Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Константан битни проток"
-@@ -1470,10 +1445,6 @@
- msgid "Download this album..."
- msgstr "Preuzmi ovaj albm"
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Preuzmi..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Преузимање Icecast директоријума"
-@@ -1486,10 +1457,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Преузми Магнатјунов каталог"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Преузимање Spotify додатка"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Преузимање метаподатака"
-@@ -1641,10 +1608,6 @@
- msgid "Error deleting songs"
- msgstr "Грешка при брисању песама"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Грешка преузимања Spotify додатка"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1828,10 +1791,6 @@
- msgid "Font size"
- msgstr "Veličina fonta"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Због лиценцираниг разлога Spotify подршка је на посебном додатку."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Присили моно енкодирање"
-@@ -2102,10 +2061,6 @@
- "У промењивом режиму нове нумере ће бити изабране и додате листи сваки пут "
- "кад се песма заврши."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Сандуче"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Укључи омоте албума у обавештења"
-@@ -2134,10 +2089,6 @@
- msgid "Insert..."
- msgstr "Убаци..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Instalirano"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Интернет"
-@@ -2441,7 +2392,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2517,10 +2467,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Главни налог (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Направи листу доступну ван мреже"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Лош одговор"
-@@ -2778,10 +2724,6 @@
- msgid "Not enough neighbors"
- msgstr "Нема довољно комшија"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Није уграђен"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2916,7 +2858,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Лозинка"
-@@ -3023,10 +2964,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Статус додатка:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Поп"
-@@ -3057,7 +2994,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Поставке"
-@@ -3074,10 +3010,6 @@
- msgid "Preferred audio format"
- msgstr "Пожељни формат звука"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Жељени формат"
-@@ -3468,18 +3400,6 @@
- msgid "Search Magnatune"
- msgstr "Претражи Магнатјун"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Потражи Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Потражи Spotify (отвара нову картицу)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Потражи Spotify (отвара нову картицу)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3804,30 +3724,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify грешка пријављивања"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify додатак"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify додатак није уграђен"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Стандард"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Звездицом"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Почни листу тренутно пуштаним"
-@@ -3837,7 +3737,6 @@
- msgstr "Започни транскодирање"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3923,18 +3822,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Усаглашавање Spotify сандучета"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Усаглашавање Spotify листе"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Усаглашавање Spotify оцењених нумера"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Картице на врх"
-@@ -4313,10 +4200,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "искоришћено"
-@@ -4332,7 +4215,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Корисничко име"
-@@ -4560,20 +4442,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4633,7 +4501,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4722,8 +4589,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kb/s"
-
-diff -rauN clementine-1.0.1/src/translations/sv.po clementine-libre-1.0.1/src/translations/sv.po
---- clementine-1.0.1/src/translations/sv.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/sv.po 2012-05-29 17:43:39.719752433 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Ett Grooveshark Anywhere konto krävs."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Kräver ett Spotify Premium-konto."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -316,7 +312,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -589,14 +584,6 @@
- msgid "Always start playing"
- msgstr "Starta alltid att spela"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Ett ytterligare insticksprogram krävs för att använda Spotify i Clementine. "
--"Vill du ladda ner och installera det nu?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Ett fel uppstod vid kopiering av iTunes-databasen från enheten"
-@@ -822,10 +809,6 @@
- msgid "CUE sheet support"
- msgstr "Stöd för CUE-filer"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Avbryt"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Ändra omslag"
-@@ -1039,10 +1022,6 @@
- msgid "Configure Shortcuts"
- msgstr "Konfigurera snabbtangenter"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Anpassa Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Konfigurera biblioteket..."
-@@ -1060,10 +1039,6 @@
- msgid "Connect device"
- msgstr "Anslut enhet"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Ansluter till Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Konstant bithastighet"
-@@ -1479,10 +1454,6 @@
- msgid "Download this album..."
- msgstr "Ladda ner det här albumet ..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Ladda ner..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Ladda ner Icecast-katalog"
-@@ -1495,10 +1466,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Hämtar katalog från Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Laddar ner Spotify-insticket"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Hämtar metadata"
-@@ -1650,10 +1617,6 @@
- msgid "Error deleting songs"
- msgstr "Fel vid borttagning av låtar"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Fel vid hämtning av Spotify-insticket"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1835,10 +1798,6 @@
- msgid "Font size"
- msgstr "Typsnittsstorlek"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Av licensskäl finns Spotify-stöd i ett separat insticksprogram."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Tvinga enkanalskodning"
-@@ -2109,10 +2068,6 @@
- "I dynamiskt läge kommer nya spår väljas och läggas till i spellistan varje "
- "gång en låt tar slut."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Inkorg"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Inkludera albumomslag i notifieringen"
-@@ -2141,10 +2096,6 @@
- msgid "Insert..."
- msgstr "Infoga..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Installerad"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2447,7 +2398,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2523,10 +2473,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Huvudprofil (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Gör spellista tillgänglig offline"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Felformaterat svar"
-@@ -2784,10 +2730,6 @@
- msgid "Not enough neighbors"
- msgstr "Inte tillräckligt med grannar"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Inte installerad"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2922,7 +2864,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Lösenord"
-@@ -3029,10 +2970,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Instickstatus:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3063,7 +3000,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Inställningar"
-@@ -3080,10 +3016,6 @@
- msgid "Preferred audio format"
- msgstr "Önskat ljudformat"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Önskat format"
-@@ -3474,18 +3406,6 @@
- msgid "Search Magnatune"
- msgstr "Sök i Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Sök på Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Sök på Spotify (öppnar en ny flik)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Sök på Spotify (öppnar en ny flik)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3810,30 +3730,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Fel vid inloggning på Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify-insticksprogram"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify-insticksprogrammet är inte installerat"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Stjärnmärkta"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Starta spellistan som spelas för närvarande"
-@@ -3843,7 +3743,6 @@
- msgstr "Starta omkodning"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3929,18 +3828,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Synkroniserar Spotify-inkorg"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Synkroniserar Spotify-spellista"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Synkroniserar stjärnmärkta spår i Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Flikar längst upp"
-@@ -4321,10 +4208,6 @@
- msgid "Use the system proxy settings"
- msgstr "Använd systemets proxy inställningar"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Använd"
-@@ -4340,7 +4223,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Användarnamn"
-@@ -4574,20 +4456,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Du älskar detta spår"
-@@ -4655,7 +4523,6 @@
- msgstr "Dina skrobblingar: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4744,8 +4611,6 @@
- msgstr "de senaste"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/translations.pot clementine-libre-1.0.1/src/translations/translations.pot
---- clementine-1.0.1/src/translations/translations.pot 2012-01-22 07:43:21.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/translations.pot 2012-05-29 17:45:10.709752528 -0400
-@@ -239,10 +239,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -297,7 +293,6 @@
-
- #: ../mingw/src/ui_groovesharksettingspage.h:113
- #: ../mingw/src/ui_magnatunesettingspage.h:155
--#: ../mingw/src/ui_spotifysettingspage.h:209
- #: ../mingw/src/ui_remotesettingspage.h:203
- #: ../mingw/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -571,12 +566,6 @@
- msgid "Always start playing"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -803,10 +792,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../mingw/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1005,10 +990,6 @@
- msgid "Configure Shortcuts"
- msgstr ""
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:490
- msgid "Configure library..."
- msgstr ""
-@@ -1026,10 +1007,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../mingw/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1431,10 +1408,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../mingw/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1447,10 +1420,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr ""
-@@ -1600,10 +1569,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1785,10 +1750,6 @@
- msgid "Font size"
- msgstr ""
-
--#: ../mingw/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../mingw/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2053,10 +2014,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../mingw/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr ""
-@@ -2086,10 +2043,6 @@
- msgid "Insert..."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:252
- msgid "Internet"
- msgstr ""
-@@ -2391,7 +2344,6 @@
- #: ../mingw/src/ui_digitallyimportedsettingspage.h:163
- #: ../mingw/src/ui_groovesharksettingspage.h:116
- #: ../mingw/src/ui_magnatunesettingspage.h:164
--#: ../mingw/src/ui_spotifysettingspage.h:212
- #: ../mingw/src/ui_remotesettingspage.h:205
- #: ../mingw/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2468,10 +2420,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr ""
-@@ -2730,10 +2678,6 @@
- msgid "Not enough neighbors"
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2868,7 +2812,6 @@
-
- #: ../mingw/src/ui_groovesharksettingspage.h:115
- #: ../mingw/src/ui_magnatunesettingspage.h:165
--#: ../mingw/src/ui_spotifysettingspage.h:211
- #: ../mingw/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr ""
-@@ -2975,10 +2918,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../mingw/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr ""
-@@ -3009,7 +2948,6 @@
-
- #: ../mingw/src/ui_digitallyimportedsettingspage.h:166
- #: ../mingw/src/ui_magnatunesettingspage.h:166
--#: ../mingw/src/ui_spotifysettingspage.h:217
- #: ../mingw/src/ui_settingsdialog.h:115
- #: ../mingw/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
-@@ -3027,10 +2965,6 @@
- msgid "Preferred audio format"
- msgstr ""
-
--#: ../mingw/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../mingw/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3422,18 +3356,6 @@
- msgid "Search Magnatune"
- msgstr ""
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../mingw/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3756,30 +3678,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../mingw/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../mingw/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../mingw/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:145
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3789,7 +3691,6 @@
- msgstr ""
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3875,18 +3776,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr ""
-@@ -4246,10 +4135,6 @@
- msgid "Use the system proxy settings"
- msgstr ""
-
--#: ../mingw/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr ""
-@@ -4265,7 +4150,6 @@
-
- #: ../mingw/src/ui_groovesharksettingspage.h:114
- #: ../mingw/src/ui_magnatunesettingspage.h:163
--#: ../mingw/src/ui_spotifysettingspage.h:210
- #: ../mingw/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr ""
-@@ -4489,20 +4373,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr ""
-@@ -4562,7 +4432,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4651,8 +4520,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr ""
-
-diff -rauN clementine-1.0.1/src/translations/tr.po clementine-libre-1.0.1/src/translations/tr.po
---- clementine-1.0.1/src/translations/tr.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/tr.po 2012-05-29 17:44:19.953085826 -0400
-@@ -256,10 +256,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Grooveshark Anywhere hesabı gereklidir."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Spotify üyeliği gerekli."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -318,7 +314,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Her zaman çalarak başlat"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Spotify'ın Clementine'de kullanılması için harici bir eklenti gerekmektedir."
--" Şimdi indirmek ve kurulumunu yapmak ister misiniz?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Aygıttan iTunes veritabanı kopyalanırken hata oluştu"
-@@ -824,10 +811,6 @@
- msgid "CUE sheet support"
- msgstr "CUE desteği"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "İptal"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Kapak resmini değiştir"
-@@ -1038,10 +1021,6 @@
- msgid "Configure Shortcuts"
- msgstr "Kısayolları Yapılandır"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Spotify Ayarları..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Kütüphaneyi düzenle..."
-@@ -1059,10 +1038,6 @@
- msgid "Connect device"
- msgstr "Aygıtı bağla"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Spotify'a bağlanılıyor."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Sabit bithızı"
-@@ -1478,10 +1453,6 @@
- msgid "Download this album..."
- msgstr "Bu albümü indirin..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "İndir..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Icecast dizini indiriliyor"
-@@ -1494,10 +1465,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Magnatune kataloğu indiriliyor"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Spotify eklentisi indiriliyor"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Üstveri indiriliyor"
-@@ -1652,10 +1619,6 @@
- msgid "Error deleting songs"
- msgstr "Şarkılar silinirken hata"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Spotify eklentisini indirirken hata"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1837,10 +1800,6 @@
- msgid "Font size"
- msgstr "Yazı tipi boyutu"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Lisans sebepleri dolayısıyla Spotify desteği ayrı bir eklentidir."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Mono çözümlemeye zorla"
-@@ -2112,10 +2071,6 @@
- "Dinamik modda yeni şarkılar seçilerek, her şarkı bittiğinde çalma listesine "
- "eklenecektir."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Gelen Kutusu"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Bildirimde albüm resimlendirmesini göster"
-@@ -2144,10 +2099,6 @@
- msgid "Insert..."
- msgstr "Ekle..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Kuruldu"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2454,7 +2405,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2530,10 +2480,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Ana profil (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Çalma listesini çevrim dışındayken kullanılabilir yap"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Bozuk yanıt"
-@@ -2792,10 +2738,6 @@
- msgid "Not enough neighbors"
- msgstr "Yeterli komşu yok"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Kurulu değil"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Giriş yapmadınız"
-@@ -2930,7 +2872,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Parola"
-@@ -3037,10 +2978,6 @@
- msgid "Playlists"
- msgstr "Çalma listeleri"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Eklenti durumu:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3071,7 +3008,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Tercihler"
-@@ -3088,10 +3024,6 @@
- msgid "Preferred audio format"
- msgstr "Tercih edilen ses biçimleri"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Tercih edilen bit oranı"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Tercih edilen biçim"
-@@ -3482,18 +3414,6 @@
- msgid "Search Magnatune"
- msgstr "Magnatune'da Ara"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Spotify'i ara"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Spotify'i ara (yeni sekme açar)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Spotify'i ara (yeni sekme açar)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Tüm kaynaklarınızda arayın (kütüphane, internet servisleri, ...)"
-@@ -3818,30 +3738,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Spotify giriş hatası"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Spotify eklentisi"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Spotify eklentisi kurulu değil"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Standard"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Yıldızlı"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Çalma listesini mevcut çalınanla başlat"
-@@ -3851,7 +3751,6 @@
- msgstr "Dönüştürmeye başla"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Müzik bulmak için yukarıdaki arama kutusuna yazarak başlayın %1 "
-@@ -3937,18 +3836,6 @@
- msgid "Switch provider"
- msgstr "Anahtar sağlayıcı"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Spotify gelen kutusu eşleniyor"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Spotify çalma listesi eşleniyor"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Spotify yıldızlı şarkılar eşleniyor"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Üstteki sekmeler"
-@@ -4320,10 +4207,6 @@
- msgid "Use the system proxy settings"
- msgstr "Sistem vekil sunucu ayarlarını kullan"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Ses normalleştirme kullan"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Kullanılan"
-@@ -4339,7 +4222,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Kullanıcı Adı"
-@@ -4574,22 +4456,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Bir Grooveshark Anywhere hesabınız yok"
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Spotify Premium hesabınız yok."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Spotify servisinden çıktınız, lütfen Ayarlar ekranında parolanızı yeniden "
--"girin."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Spotify servisinden çıktınız, lütfen parolanızı yeniden girin."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Bu şarkıyı seviyorsunuz"
-@@ -4656,7 +4522,6 @@
- msgstr "Skroplarınız: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Kullanıcı adı veya parolanız yanlış."
-
-@@ -4745,8 +4610,6 @@
- msgstr "Sonuncu"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/uk.po clementine-libre-1.0.1/src/translations/uk.po
---- clementine-1.0.1/src/translations/uk.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/uk.po 2012-05-29 17:45:51.199752577 -0400
-@@ -254,10 +254,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Потрібен обліковий запис Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Потрібен обліковий запис Spotify Premium."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -318,7 +314,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -591,14 +586,6 @@
- msgid "Always start playing"
- msgstr "Завжди починати відтворення"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Для користування Spotify в Clementine, потрібний додатковий модуль. "
--"Завантажити і встановити його зараз?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Виникла помилка копіювання бази даних iTunes з пристрою"
-@@ -824,10 +811,6 @@
- msgid "CUE sheet support"
- msgstr "Підтримка листів CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Скасувати"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Змінити обкладинку"
-@@ -1039,10 +1022,6 @@
- msgid "Configure Shortcuts"
- msgstr "Налаштування комбінацій клавіш"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Налаштування Spotify…"
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Налаштувати фонотеку"
-@@ -1060,10 +1039,6 @@
- msgid "Connect device"
- msgstr "З’єднати пристрій"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "З'єднання зі Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Стала бітова швидкість"
-@@ -1479,10 +1454,6 @@
- msgid "Download this album..."
- msgstr "Завантажити цей альбом…"
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Звантажити…"
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Завантажую каталог Icecast"
-@@ -1495,10 +1466,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Завантаження каталогу Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Завантаження модуля Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Завантажую метадані"
-@@ -1651,10 +1618,6 @@
- msgid "Error deleting songs"
- msgstr "Помилка вилучення композицій"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Помилка завантаження модуля Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1837,11 +1800,6 @@
- msgid "Font size"
- msgstr "Розмір шрифту"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--"З підстав ліцензування, для підтримки Spotify потрібен спеціальний модуль."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Примусове моно-кодування"
-@@ -2113,10 +2071,6 @@
- "У динамічному режимі нові доріжку буде обрано та додано до списку "
- "відтворення кожного разу як завершується пісня."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Вхідні"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Показувати обкладинку в повідомлені"
-@@ -2145,10 +2099,6 @@
- msgid "Insert..."
- msgstr "Вставити…"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Встановлено"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Інтернет"
-@@ -2451,7 +2401,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2527,10 +2476,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Основний профіль (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Зробити список відтворення доступним онлайн"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Спотворений відгук"
-@@ -2789,10 +2734,6 @@
- msgid "Not enough neighbors"
- msgstr "Недостатньо сусідів"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Не встановлено"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Вхід не здійснено"
-@@ -2927,7 +2868,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Пароль"
-@@ -3034,10 +2974,6 @@
- msgid "Playlists"
- msgstr "Списки відтворення"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Статус модуля:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Поп"
-@@ -3068,7 +3004,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Параметри"
-@@ -3085,10 +3020,6 @@
- msgid "Preferred audio format"
- msgstr "Бажаний аудіо формат"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Бажана бітова швидкість"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Бажаний формат"
-@@ -3479,18 +3410,6 @@
- msgid "Search Magnatune"
- msgstr "Пошук на Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Пошук в Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Пошук в Spotify (у новій вкладці)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Пошук в Spotify (у новій вкладці)…"
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Шукати у всіх джерелах даних (бібліотеці, на службах інтернету тощо)"
-@@ -3816,30 +3735,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Помилка входу до Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Модуль Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Модуль Spotify не встановлено"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Типово"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Оцінені"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Запустити список відтворення, що відтворюється на цей час"
-@@ -3849,7 +3748,6 @@
- msgstr "Почати перекодування"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3937,18 +3835,6 @@
- msgid "Switch provider"
- msgstr "Перемкнути джерело"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Синхронізація вхідних Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Синхронізація списку відтворення Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Синхронізація оцінених доріжок Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Вкладки зверху"
-@@ -4323,10 +4209,6 @@
- msgid "Use the system proxy settings"
- msgstr "Використовувати системні налаштування проксі"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Використати нормалізацію гучності"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Використано"
-@@ -4342,7 +4224,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Користувач"
-@@ -4579,21 +4460,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "У вас немає облікового запису Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "У вас немає облікового запису Spotify Premium."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Ви вийшли зі Spotify, введіть ваш пароль знов у налаштуваннях, будь ласка."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Ви вийшли зі Spotify, введіть ваш пароль знов, будь ласка."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Улюблена композиція"
-@@ -4661,7 +4527,6 @@
- msgstr "%1 відтворень у вас"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Вами вказано помилкове ім’я користувача або пароль."
-
-@@ -4750,8 +4615,6 @@
- msgstr "за останні"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "кбіт/с"
-
-diff -rauN clementine-1.0.1/src/translations/vi.po clementine-libre-1.0.1/src/translations/vi.po
---- clementine-1.0.1/src/translations/vi.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/vi.po 2012-05-29 17:46:32.973085951 -0400
-@@ -256,10 +256,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr "Cần có tài khoản Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr "Yêu cầu một tài khoản Premium của Spotify."
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -320,7 +316,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -593,14 +588,6 @@
- msgid "Always start playing"
- msgstr "Bắt đầu phát nhạc"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--"Cần phải có một trình cắm thêm để sử dụng Spotify trong Clementine. Bạn có "
--"muốn tải nó về và cài đặt ngay không?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "Một lỗi đã xảy ra khi sao chép cơ sở dữ liệu iTunes từ thiết bị"
-@@ -826,10 +813,6 @@
- msgid "CUE sheet support"
- msgstr "Hỗ trợ danh sách CUE"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr "Hủy bỏ"
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "Đổi ảnh bìa"
-@@ -1040,10 +1023,6 @@
- msgid "Configure Shortcuts"
- msgstr "Phím tắt"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "Cấu hình Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "Cấu hình thư viện..."
-@@ -1061,10 +1040,6 @@
- msgid "Connect device"
- msgstr "Kết nối thiết bị"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "Kết nối đến Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "Bitrate cố định"
-@@ -1480,10 +1455,6 @@
- msgid "Download this album..."
- msgstr "Tải album này..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "Tải về..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "Đang tải thư mục Icecast"
-@@ -1496,10 +1467,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "Đang tải mục lục Magnatune"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "Tải trình cắm thêm Spotify"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "Đang tải thông tin dữ liệu"
-@@ -1653,10 +1620,6 @@
- msgid "Error deleting songs"
- msgstr "Lỗi xóa các bài hát"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "Lỗi khi tải trình cắm thêm Spotify"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1841,10 +1804,6 @@
- msgid "Font size"
- msgstr "Kích cỡ phông chữ"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr "Vì lí do giấy phép nên Spotify được hỗ trợ trong một trình cắm riêng."
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr "Buộc mã hóa đơn kênh"
-@@ -2116,10 +2075,6 @@
- "Trong chế độ năng động, các bài hát mới sẽ được chọn và thêm vào danh sách "
- "mỗi khi một bài hát được phát xong."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "Hộp thư đến"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "Kèm theo ảnh bìa album trong thông báo"
-@@ -2148,10 +2103,6 @@
- msgid "Insert..."
- msgstr "Nhập..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr "Đã cài đặt"
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "Internet"
-@@ -2454,7 +2405,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2530,10 +2480,6 @@
- msgid "Main profile (MAIN)"
- msgstr "Hồ sơ chính (MAIN)"
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr "Danh sách sẵn sàng ngoại tuyến"
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "Phản hồi có vẻ xấu"
-@@ -2792,10 +2738,6 @@
- msgid "Not enough neighbors"
- msgstr "Chưa đủ những người lân cận"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr "Chưa cài đặt"
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr "Chưa đăng nh"
-@@ -2930,7 +2872,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "Mật khẩu"
-@@ -3037,10 +2978,6 @@
- msgid "Playlists"
- msgstr "Danh sách"
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "Trạng thái trình cắm:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "Pop"
-@@ -3071,7 +3008,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "Thiết lập"
-@@ -3089,10 +3025,6 @@
- msgid "Preferred audio format"
- msgstr "Định dạng âm thanh được ưu tiên"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr "Bitrate ưu tiên"
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "Định dạng được ưu tiên"
-@@ -3483,18 +3415,6 @@
- msgid "Search Magnatune"
- msgstr "Tìm kiếm trên Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr "Tìm kiếm trong Spotify"
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr "Tìm kiếm trong Spotify (mở trong tab mới)"
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "Tìm kiếm trong Spotify (mở trong tab mới)..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr "Tìm từ tất cả các nguồn (thư viện, các dịch vụ internet, ...)"
-@@ -3819,30 +3739,10 @@
- msgid "Speex"
- msgstr "Speex"
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr "Lỗi đăng nhập Spotify"
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr "Trình cắm Spotify"
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "Trình cắm thêm Spotify chưa được cài đặt"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr "Chuẩn"
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr "Đã bắt đầu"
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "Bắt đầu danh sách hiện đang phát"
-@@ -3852,7 +3752,6 @@
- msgstr "Bắt đầu chuyển mã"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr "Nhập vào hộp tìm kiếm ở trên để tìm nhạc trên %1."
-@@ -3938,18 +3837,6 @@
- msgid "Switch provider"
- msgstr "Đổi nhà cung cấp"
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr "Đang đồng bộ hộp thư đến Spotify"
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr "Đang đồng bộ danh sách Spotify"
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr "Đang đồng bộ các bài hát được đánh dấu sao của Spotify"
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "Các tab ở phía trên"
-@@ -4328,10 +4215,6 @@
- msgid "Use the system proxy settings"
- msgstr "Sử dụng thiết lập proxy của hệ thống"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr "Sử dụng cân bằng âm lượng"
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "Đã dùng"
-@@ -4347,7 +4230,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "Tên người dùng"
-@@ -4584,22 +4466,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr "Bạn không có tài khoản Grooveshark Anywhere."
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr "Bạn không có tài khoản cao cấp của Spotify."
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--"Bạn đã đăng xuất khỏi Spotify, hãy nhập lại mật khẩu trong hộp thoại Thiết "
--"lập."
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr "Bạn đã đăng xuất khỏi Spotify, hãy nhập lại mật khẩu."
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "Bạn thích bài hát này"
-@@ -4666,7 +4532,6 @@
- msgstr "Thông tin bài hát của bạn: %1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr "Tên người dùng hay mật khẩu không đúng."
-
-@@ -4755,8 +4620,6 @@
- msgstr "cuối"
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/zh_CN.po clementine-libre-1.0.1/src/translations/zh_CN.po
---- clementine-1.0.1/src/translations/zh_CN.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/zh_CN.po 2012-05-29 17:47:24.893086011 -0400
-@@ -249,10 +249,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -308,7 +304,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -581,12 +576,6 @@
- msgid "Always start playing"
- msgstr "总是开始播放"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr "Clementine需要安装额外的插件才能使用Spotify.现在就下载并安装吗?"
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr "从 iTunes 复制数据库出错"
-@@ -812,10 +801,6 @@
- msgid "CUE sheet support"
- msgstr "CUE 支持"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr "更改封面"
-@@ -1016,10 +1001,6 @@
- msgid "Configure Shortcuts"
- msgstr "配置快捷键"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr "配置Spotify..."
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "配置音乐库..."
-@@ -1037,10 +1018,6 @@
- msgid "Connect device"
- msgstr "连接设备"
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr "连接Spotify"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr "固定位速率"
-@@ -1450,10 +1427,6 @@
- msgid "Download this album..."
- msgstr "下载此专辑..."
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr "下载..."
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr "正在下载 Icecast 目录"
-@@ -1466,10 +1439,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "正在下载 Magnatune 分类"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr "下载Spotify插件中"
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "下载元数据"
-@@ -1619,10 +1588,6 @@
- msgid "Error deleting songs"
- msgstr "删除曲目出错"
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr "下载Spotify插件出错"
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1804,10 +1769,6 @@
- msgid "Font size"
- msgstr "字号"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2070,10 +2031,6 @@
- "time a song finishes."
- msgstr "在动态模式中, 每次歌曲播放完之后会被选择并添加新歌曲到播放列表.使用动态模式将忽略您的播放列表大小设定值."
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr "收件夹"
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "在提示中中加入专辑封面"
-@@ -2102,10 +2059,6 @@
- msgid "Insert..."
- msgstr "插入..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "互联网"
-@@ -2408,7 +2361,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2484,10 +2436,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "无效的响应"
-@@ -2744,10 +2692,6 @@
- msgid "Not enough neighbors"
- msgstr "邻居不足"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2882,7 +2826,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "密码"
-@@ -2989,10 +2932,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr "插件状态:"
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "流行"
-@@ -3023,7 +2962,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "首选项"
-@@ -3040,10 +2978,6 @@
- msgid "Preferred audio format"
- msgstr "首选音乐格式"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr "首选格式"
-@@ -3434,18 +3368,6 @@
- msgid "Search Magnatune"
- msgstr "搜索 Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr "在新标签栏中查找Spotify..."
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3770,30 +3692,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr "Spotify"
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr "potify 插件未安装"
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr ""
-@@ -3803,7 +3705,6 @@
- msgstr "开始转换"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3889,18 +3790,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "标签在上"
-@@ -4258,10 +4147,6 @@
- msgid "Use the system proxy settings"
- msgstr "使用系统代理设置"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "已使用"
-@@ -4277,7 +4162,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "用户名"
-@@ -4505,20 +4389,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "您喜爱这个音轨"
-@@ -4579,7 +4449,6 @@
- msgstr "提交的音轨:%1"
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4668,8 +4537,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
-diff -rauN clementine-1.0.1/src/translations/zh_TW.po clementine-libre-1.0.1/src/translations/zh_TW.po
---- clementine-1.0.1/src/translations/zh_TW.po 2011-12-27 13:16:09.000000000 -0500
-+++ clementine-libre-1.0.1/src/translations/zh_TW.po 2012-05-29 17:48:16.866419419 -0400
-@@ -253,10 +253,6 @@
- msgid "A Grooveshark Anywhere account is required."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:162
--msgid "A Spotify Premium account is required."
--msgstr ""
--
- #: smartplaylists/wizard.cpp:72
- msgid ""
- "A smart playlist is a dynamic list of songs that come from your library. "
-@@ -312,7 +308,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:113
- #: ../bin/src/ui_magnatunesettingspage.h:155
--#: ../bin/src/ui_spotifysettingspage.h:209
- #: ../bin/src/ui_remotesettingspage.h:203
- #: ../bin/src/ui_lastfmsettingspage.h:145
- msgid "Account details"
-@@ -585,12 +580,6 @@
- msgid "Always start playing"
- msgstr "總是開始播放"
-
--#: internet/spotifyblobdownloader.cpp:59
--msgid ""
--"An additional plugin is required to use Spotify in Clementine. Would you "
--"like to download and install it now?"
--msgstr ""
--
- #: devices/afcdevice.cpp:62
- msgid "An error occurred copying the iTunes database from the device"
- msgstr ""
-@@ -816,10 +805,6 @@
- msgid "CUE sheet support"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Cancel"
--msgstr ""
--
- #: ../bin/src/ui_edittagdialog.h:634
- msgid "Change cover art"
- msgstr ""
-@@ -1020,10 +1005,6 @@
- msgid "Configure Shortcuts"
- msgstr "設定快速鍵"
-
--#: internet/spotifyservice.cpp:491
--msgid "Configure Spotify..."
--msgstr ""
--
- #: ui/mainwindow.cpp:491
- msgid "Configure library..."
- msgstr "設定音樂庫"
-@@ -1041,10 +1022,6 @@
- msgid "Connect device"
- msgstr ""
-
--#: internet/spotifyservice.cpp:246
--msgid "Connecting to Spotify"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:196
- msgid "Constant bitrate"
- msgstr ""
-@@ -1454,10 +1431,6 @@
- msgid "Download this album..."
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:216
--msgid "Download..."
--msgstr ""
--
- #: internet/icecastservice.cpp:97
- msgid "Downloading Icecast directory"
- msgstr ""
-@@ -1470,10 +1443,6 @@
- msgid "Downloading Magnatune catalogue"
- msgstr "下載 Magnatune目錄"
-
--#: internet/spotifyblobdownloader.cpp:43
--msgid "Downloading Spotify plugin"
--msgstr ""
--
- #: musicbrainz/tagfetcher.cpp:101
- msgid "Downloading metadata"
- msgstr "正在下載元數據"
-@@ -1623,10 +1592,6 @@
- msgid "Error deleting songs"
- msgstr ""
-
--#: internet/spotifyblobdownloader.cpp:214
--msgid "Error downloading Spotify plugin"
--msgstr ""
--
- #: playlist/songloaderinserter.cpp:71 playlist/songloaderinserter.cpp:133
- #, qt-format
- msgid "Error loading %1"
-@@ -1808,10 +1773,6 @@
- msgid "Font size"
- msgstr "字型大小"
-
--#: ../bin/src/ui_spotifysettingspage.h:214
--msgid "For licensing reasons Spotify support is in a separate plugin."
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:204
- msgid "Force mono encoding"
- msgstr ""
-@@ -2074,10 +2035,6 @@
- "time a song finishes."
- msgstr ""
-
--#: internet/spotifyservice.cpp:347
--msgid "Inbox"
--msgstr ""
--
- #: ../bin/src/ui_notificationssettingspage.h:408
- msgid "Include album art in the notification"
- msgstr "包括專輯封面的通知"
-@@ -2106,10 +2063,6 @@
- msgid "Insert..."
- msgstr "插入..."
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Installed"
--msgstr ""
--
- #: ui/mainwindow.cpp:253
- msgid "Internet"
- msgstr "網際網路"
-@@ -2412,7 +2365,6 @@
- #: ../bin/src/ui_digitallyimportedsettingspage.h:163
- #: ../bin/src/ui_groovesharksettingspage.h:116
- #: ../bin/src/ui_magnatunesettingspage.h:164
--#: ../bin/src/ui_spotifysettingspage.h:212
- #: ../bin/src/ui_remotesettingspage.h:205
- #: ../bin/src/ui_lastfmsettingspage.h:147
- msgid "Login"
-@@ -2488,10 +2440,6 @@
- msgid "Main profile (MAIN)"
- msgstr ""
-
--#: internet/spotifyservice.cpp:496
--msgid "Make playlist available offline"
--msgstr ""
--
- #: internet/lastfmservice.cpp:449
- msgid "Malformed response"
- msgstr "格式不正確的反應"
-@@ -2748,10 +2696,6 @@
- msgid "Not enough neighbors"
- msgstr "沒有足夠的鄰居"
-
--#: internet/spotifysettingspage.cpp:75
--msgid "Not installed"
--msgstr ""
--
- #: globalsearch/globalsearchsettingspage.cpp:123
- msgid "Not logged in"
- msgstr ""
-@@ -2886,7 +2830,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:115
- #: ../bin/src/ui_magnatunesettingspage.h:165
--#: ../bin/src/ui_spotifysettingspage.h:211
- #: ../bin/src/ui_networkproxysettingspage.h:169
- msgid "Password"
- msgstr "密碼"
-@@ -2993,10 +2936,6 @@
- msgid "Playlists"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:215
--msgid "Plugin status:"
--msgstr ""
--
- #: ui/equalizer.cpp:119
- msgid "Pop"
- msgstr "流行音樂"
-@@ -3027,7 +2966,6 @@
-
- #: ../bin/src/ui_digitallyimportedsettingspage.h:166
- #: ../bin/src/ui_magnatunesettingspage.h:166
--#: ../bin/src/ui_spotifysettingspage.h:217 ../bin/src/ui_settingsdialog.h:115
- #: ../bin/src/ui_lastfmsettingspage.h:149
- msgid "Preferences"
- msgstr "偏好設定"
-@@ -3044,10 +2982,6 @@
- msgid "Preferred audio format"
- msgstr "首選的音頻格式"
-
--#: ../bin/src/ui_spotifysettingspage.h:218
--msgid "Preferred bitrate"
--msgstr ""
--
- #: ../bin/src/ui_deviceproperties.h:380
- msgid "Preferred format"
- msgstr ""
-@@ -3438,18 +3372,6 @@
- msgid "Search Magnatune"
- msgstr "搜尋 Magnatune"
-
--#: internet/spotifysearchplaylisttype.cpp:32 internet/spotifyservice.cpp:604
--msgid "Search Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:338
--msgid "Search Spotify (opens a new tab)"
--msgstr ""
--
--#: internet/spotifyservice.cpp:489
--msgid "Search Spotify (opens a new tab)..."
--msgstr ""
--
- #: ../bin/src/ui_globalsearchwidget.h:61
- msgid "Search around all your sources (library, internet services, ...)"
- msgstr ""
-@@ -3774,30 +3696,10 @@
- msgid "Speex"
- msgstr ""
-
--#: ../bin/src/ui_spotifysettingspage.h:208
--msgid "Spotify"
--msgstr ""
--
--#: internet/spotifyservice.cpp:179
--msgid "Spotify login error"
--msgstr ""
--
--#: ../bin/src/ui_spotifysettingspage.h:213
--msgid "Spotify plugin"
--msgstr ""
--
--#: internet/spotifyblobdownloader.cpp:58
--msgid "Spotify plugin not installed"
--msgstr ""
--
- #: ../bin/src/ui_transcoderoptionsmp3.h:201
- msgid "Standard"
- msgstr ""
-
--#: internet/spotifyservice.cpp:343
--msgid "Starred"
--msgstr ""
--
- #: core/commandlineoptions.cpp:148
- msgid "Start the playlist currently playing"
- msgstr "開始播放目前播放清單"
-@@ -3807,7 +3709,6 @@
- msgstr "開始轉碼"
-
- #: internet/groovesharksearchplaylisttype.cpp:36
--#: internet/spotifysearchplaylisttype.cpp:36
- #, qt-format
- msgid "Start typing in the search box above to find music on %1."
- msgstr ""
-@@ -3893,18 +3794,6 @@
- msgid "Switch provider"
- msgstr ""
-
--#: internet/spotifyservice.cpp:515
--msgid "Syncing Spotify inbox"
--msgstr ""
--
--#: internet/spotifyservice.cpp:510
--msgid "Syncing Spotify playlist"
--msgstr ""
--
--#: internet/spotifyservice.cpp:519
--msgid "Syncing Spotify starred tracks"
--msgstr ""
--
- #: widgets/fancytabwidget.cpp:650
- msgid "Tabs on top"
- msgstr "標籤在上面"
-@@ -4262,10 +4151,6 @@
- msgid "Use the system proxy settings"
- msgstr "使用系統代理伺服器設置"
-
--#: ../bin/src/ui_spotifysettingspage.h:219
--msgid "Use volume normalisation"
--msgstr ""
--
- #: widgets/freespacebar.cpp:47
- msgid "Used"
- msgstr "已用"
-@@ -4281,7 +4166,6 @@
-
- #: ../bin/src/ui_groovesharksettingspage.h:114
- #: ../bin/src/ui_magnatunesettingspage.h:163
--#: ../bin/src/ui_spotifysettingspage.h:210
- #: ../bin/src/ui_networkproxysettingspage.h:168
- msgid "Username"
- msgstr "帳號"
-@@ -4505,20 +4389,6 @@
- msgid "You do not have a Grooveshark Anywhere account."
- msgstr ""
-
--#: internet/spotifysettingspage.cpp:149
--msgid "You do not have a Spotify Premium account."
--msgstr ""
--
--#: internet/spotifyservice.cpp:165
--msgid ""
--"You have been logged out of Spotify, please re-enter your password in the "
--"Settings dialog."
--msgstr ""
--
--#: internet/spotifysettingspage.cpp:158
--msgid "You have been logged out of Spotify, please re-enter your password."
--msgstr ""
--
- #: songinfo/lastfmtrackinfoprovider.cpp:95
- msgid "You love this track"
- msgstr "您愛這首歌曲"
-@@ -4578,7 +4448,6 @@
- msgstr ""
-
- #: internet/groovesharksettingspage.cpp:108
--#: internet/spotifysettingspage.cpp:154
- msgid "Your username or password was incorrect."
- msgstr ""
-
-@@ -4667,8 +4536,6 @@
- msgstr ""
-
- #: playlist/playlistview.cpp:163 ui/edittagdialog.cpp:422
--#: internet/spotifysettingspage.cpp:60 internet/spotifysettingspage.cpp:61
--#: internet/spotifysettingspage.cpp:62
- msgid "kbps"
- msgstr "kbps"
-
diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
index 2aa38fca6..6cfb023cb 100644..100755
--- a/libre/crosstool-ng/PKGBUILD
+++ b/libre/crosstool-ng/PKGBUILD
@@ -1,8 +1,9 @@
# Contributor: jwwolf <jwwolf+arch@gmail.com>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
pkgname=crosstool-ng
-pkgver=1.15.2
+pkgver=1.16.0
pkgrel=1
pkgdesc="A versatile cross toolchain generator (eglibc addons patch)"
arch=('i686' 'x86_64')
@@ -26,4 +27,4 @@ package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
}
-md5sums=('0d03314debb73de37a72014632bf1ab3')
+md5sums=('900f5f72df3ab9b48b6d1efd1d6634b8')
diff --git a/libre/crosstool-ng/libc_ports_short_name.patch b/libre/crosstool-ng/libc_ports_short_name.patch
index b511fa183..b511fa183 100644..100755
--- 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
new file mode 100755
index 000000000..addf86ef3
--- /dev/null
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 166387 2012-09-07 13:33:10Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=cups-filters-libre
+_pkgname=cups-filters
+pkgver=1.0.24
+pkgrel=1
+pkgdesc="OpenPrinting CUPS Filters"
+arch=('i686' 'x86_64')
+url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
+license=('GPL')
+depends=('lcms2' 'poppler>=0.20.3' 'qpdf')
+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=('242ea48cd41f8546d71b00bf2b06c564')
+replaces=("${_pkgname}")
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
+ make
+}
+
+check() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ make -k check
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+ # drop static lib
+ rm -f ${pkgdir}/usr/lib/*.a
+}
diff --git a/libre/cups-libre/PKGBUILD b/libre/cups-libre/PKGBUILD
index e46b5d356..105bea193 100644..100755
--- a/libre/cups-libre/PKGBUILD
+++ b/libre/cups-libre/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 159509 2012-05-25 16:34:34Z andyrtr $
+# $Id: PKGBUILD 160055 2012-05-28 16:48:32Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups-libre')
pkgver=1.5.3
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme')
source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
cups-avahi-1-config.patch
@@ -22,8 +22,8 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
cups cups.logrotate cups.pam)
#options=('!emptydirs')
md5sums=('e1ad15257aa6f162414ea3beae0c5df8'
- '8ec0d9d4b6fe3a8902042ed2432fb8b4'
- 'c80bd1ff8d342cdf379ce5f445b9e944'
+ '12c8af5bcd3b8f84240280b3dfaf9e89'
+ 'cdc1322c8014297ae349e2db78a03c5a'
'1a5112f63958643f2888abc9418dbcac'
'c37d1bf1bb76acc3fe93362c80d91b7c'
'5d302860559960042f3b47a91b97c5fe'
@@ -119,11 +119,8 @@ backup=(etc/cups/cupsd.conf
etc/logrotate.d/cups
etc/pam.d/cups
etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme')
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'hicolor-icon-theme')
optdepends=('php: for included phpcups.so module'
- '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'
'xdg-utils: xdg .desktop file support')
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -143,14 +140,10 @@ optdepends=('php: for included phpcups.so module'
chmod 755 ${pkgdir}/var/spool
chmod 755 ${pkgdir}/etc
- # serial backend needs to run as root (http://bugs.archlinux.org/task/20396)
- chmod 700 ${pkgdir}/usr/lib/cups/backend/serial
-
# install ssl directory where to store the certs, solves some samba issues
install -dm700 -g lp ${pkgdir}/etc/cups/ssl
# remove directory from package, we create it in cups rc.d file
rm -rf ${pkgdir}/var/run
-# install -dm511 -g lp ${pkgdir}/var/run/cups/certs
# install some more configuration files that will get filled by cupsd
touch ${pkgdir}/etc/cups/printers.conf
@@ -166,4 +159,10 @@ optdepends=('php: for included phpcups.so module'
# remove client.conf man page
rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
+
+ # remove files now part of cups-filters
+ rm -v ${pkgdir}/usr/lib/cups/backend/{parallel,serial}
+ rm -v ${pkgdir}/usr/lib/cups/filter/{commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
+ rm -v ${pkgdir}/usr/share/cups/banners/{classified,confidential,secret,standard,topsecret,unclassified}
+ rm -v ${pkgdir}/usr/share/cups/data/testprint
}
diff --git a/libre/cups-libre/cups b/libre/cups-libre/cups
index 744c8e663..744c8e663 100644..100755
--- a/libre/cups-libre/cups
+++ b/libre/cups-libre/cups
diff --git a/libre/cups-libre/cups-avahi-1-config.patch b/libre/cups-libre/cups-avahi-1-config.patch
index 516e01fa9..516e01fa9 100644..100755
--- a/libre/cups-libre/cups-avahi-1-config.patch
+++ b/libre/cups-libre/cups-avahi-1-config.patch
diff --git a/libre/cups-libre/cups-avahi-2-backend.patch b/libre/cups-libre/cups-avahi-2-backend.patch
index 9fa367729..9fa367729 100644..100755
--- a/libre/cups-libre/cups-avahi-2-backend.patch
+++ b/libre/cups-libre/cups-avahi-2-backend.patch
diff --git a/libre/cups-libre/cups-avahi-3-timeouts.patch b/libre/cups-libre/cups-avahi-3-timeouts.patch
index daf852a0f..daf852a0f 100644..100755
--- a/libre/cups-libre/cups-avahi-3-timeouts.patch
+++ b/libre/cups-libre/cups-avahi-3-timeouts.patch
diff --git a/libre/cups-libre/cups-avahi-4-poll.patch b/libre/cups-libre/cups-avahi-4-poll.patch
index d7fa5fd56..d7fa5fd56 100644..100755
--- a/libre/cups-libre/cups-avahi-4-poll.patch
+++ b/libre/cups-libre/cups-avahi-4-poll.patch
diff --git a/libre/cups-libre/cups-avahi-5-services.patch b/libre/cups-libre/cups-avahi-5-services.patch
index 820b3c32b..820b3c32b 100644..100755
--- a/libre/cups-libre/cups-avahi-5-services.patch
+++ b/libre/cups-libre/cups-avahi-5-services.patch
diff --git a/libre/cups-libre/cups-no-export-ssllibs.patch b/libre/cups-libre/cups-no-export-ssllibs.patch
index 9be3c819b..9be3c819b 100644..100755
--- a/libre/cups-libre/cups-no-export-ssllibs.patch
+++ b/libre/cups-libre/cups-no-export-ssllibs.patch
diff --git a/libre/cups-libre/cups-no-gcrypt.patch b/libre/cups-libre/cups-no-gcrypt.patch
index 42f71d0d4..42f71d0d4 100644..100755
--- a/libre/cups-libre/cups-no-gcrypt.patch
+++ b/libre/cups-libre/cups-no-gcrypt.patch
diff --git a/libre/cups-libre/cups-no-gzip-man.patch b/libre/cups-libre/cups-no-gzip-man.patch
index 6786c4430..6786c4430 100644..100755
--- a/libre/cups-libre/cups-no-gzip-man.patch
+++ b/libre/cups-libre/cups-no-gzip-man.patch
diff --git a/libre/cups-libre/cups.install b/libre/cups-libre/cups.install
index 47c3d9b82..47c3d9b82 100644..100755
--- a/libre/cups-libre/cups.install
+++ b/libre/cups-libre/cups.install
diff --git a/libre/cups-libre/cups.logrotate b/libre/cups-libre/cups.logrotate
index 9c49bbdaf..9c49bbdaf 100644..100755
--- a/libre/cups-libre/cups.logrotate
+++ b/libre/cups-libre/cups.logrotate
diff --git a/libre/cups-libre/cups.pam b/libre/cups-libre/cups.pam
index 53724d1f8..53724d1f8 100644..100755
--- a/libre/cups-libre/cups.pam
+++ b/libre/cups-libre/cups.pam
diff --git a/libre/cups-libre/rePKGBUILD b/libre/cups-libre/rePKGBUILD
index 5f55000cc..5f55000cc 100644..100755
--- a/libre/cups-libre/rePKGBUILD
+++ b/libre/cups-libre/rePKGBUILD
diff --git a/libre/debhelper/PKGBUILD b/libre/debhelper/PKGBUILD
index 60ff8f267..60ff8f267 100644..100755
--- a/libre/debhelper/PKGBUILD
+++ b/libre/debhelper/PKGBUILD
diff --git a/libre/django13/PKGBUILD b/libre/django13/PKGBUILD
new file mode 100644
index 000000000..554acccc7
--- /dev/null
+++ b/libre/django13/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Contributor: Shahar Weiss <sweiss4@gmx.net>
+
+pkgname=django
+pkgver=1.3.1
+pkgrel=2
+pkgdesc="A high-level Python Web framework."
+arch=('any')
+license=('BSD')
+url="http://www.djangoproject.com/"
+depends=('python2')
+makedepends=('python2-distribute')
+optdepends=('mysql-python: for MySQL backend'
+ 'python2-psycopg2: for PostgreSQL backend')
+source=("https://www.djangoproject.com/m/releases/1.3/Django-$pkgver.tar.gz"
+ diff-django_branches_releases_1.3.X-from-16768-to-17460.diff)
+md5sums=('62d8642fd06b9a0bf8544178f8500767'
+ 'd09d8f9e156b9aa1b580a1b43209b99f')
+sha256sums=('af9118c4e8a063deb0b8cda901fcff2b805e7cf496c93fd43507163f3cde156b'
+ '8e08b5b5bbe7c042a1df4d5615a9d068ec6718fd00bef627c0a9a9e48ee58c15')
+
+build() {
+ cd "$srcdir/Django-$pkgver"
+ patch -Np1 -i ../diff-django_branches_releases_1.3.X-from-16768-to-17460.diff
+ python2 setup.py build
+}
+
+package() {
+ cd "$srcdir/Django-$pkgver"
+ python2 setup.py install --root="$pkgdir" --optimize=1
+
+ install -Dm644 extras/django_bash_completion \
+ "$pkgdir"/etc/bash_completion.d/django
+
+ find "$pkgdir"/usr/lib/python2.7/site-packages/django/ -name '*.py' | \
+ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+_pkgname=$pkgname
+pkgname=django13
+pkgdesc+=" (legacy version for ParabolaWeb)"
+pkgrel+=.1
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
diff --git a/libre/django13/PKGBUILD.orig b/libre/django13/PKGBUILD.orig
new file mode 100644
index 000000000..c593c5626
--- /dev/null
+++ b/libre/django13/PKGBUILD.orig
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Contributor: Shahar Weiss <sweiss4@gmx.net>
+
+pkgname=django
+pkgver=1.3.1
+pkgrel=2
+pkgdesc="A high-level Python Web framework."
+arch=('any')
+license=('BSD')
+url="http://www.djangoproject.com/"
+depends=('python2')
+makedepends=('python2-distribute')
+optdepends=('mysql-python: for MySQL backend'
+ 'python2-psycopg2: for PostgreSQL backend')
+source=("http://media.djangoproject.com/releases/1.3/Django-$pkgver.tar.gz"
+ diff-django_branches_releases_1.3.X-from-16771-to-17460.diff)
+md5sums=('62d8642fd06b9a0bf8544178f8500767'
+ 'ea3d6cbde2fc2332ffe7f901cb60a974')
+sha256sums=('af9118c4e8a063deb0b8cda901fcff2b805e7cf496c93fd43507163f3cde156b'
+ '84e2652a8249e58fdbbd43bce7cd8d6bb2159058be6a675ebe15661ca3ee9ffc')
+
+build() {
+ cd "$srcdir/Django-$pkgver"
+ patch -Np0 < ../diff-django_branches_releases_1.3.X-from-16771-to-17460.diff
+ python2 setup.py build
+}
+
+package() {
+ cd "$srcdir/Django-$pkgver"
+ python2 setup.py install --root="$pkgdir" --optimize=1
+
+ install -Dm644 extras/django_bash_completion \
+ "$pkgdir"/etc/bash_completion.d/django
+
+ find "$pkgdir"/usr/lib/python2.7/site-packages/django/ -name '*.py' | \
+ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff b/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff
new file mode 100644
index 000000000..c6819c1ab
--- /dev/null
+++ b/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff
@@ -0,0 +1,1573 @@
+diff --git a/README b/README
+index c7d225c..47bfd33 100644
+--- a/README
++++ b/README
+@@ -28,7 +28,7 @@ http://code.djangoproject.com/newticket
+ To get more help:
+
+ * Join the #django channel on irc.freenode.net. Lots of helpful people
+- hang out there. Read the archives at http://botland.oebfare.com/logger/django/.
++ hang out there. Read the archives at http://django-irc-logs.com/.
+
+ * Join the django-users mailing list, or read the archives, at
+ http://groups.google.com/group/django-users.
+diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css
+index 1cedf24..35d0ed7 100644
+--- a/django/contrib/admin/media/css/forms.css
++++ b/django/contrib/admin/media/css/forms.css
+@@ -352,9 +352,3 @@ fieldset.monospace textarea {
+ .empty-form {
+ display: none;
+ }
+-
+-/* IE7 specific bug fixes */
+-
+-.submit-row input {
+- float: right;
+-}
+\ No newline at end of file
+diff --git a/django/contrib/gis/db/backends/spatialite/compiler.py b/django/contrib/gis/db/backends/spatialite/compiler.py
+deleted file mode 100644
+index 3f81ae6..0000000
+--- a/django/contrib/gis/db/backends/spatialite/compiler.py
++++ /dev/null
+@@ -1,32 +0,0 @@
+-from django.db.backends.util import typecast_timestamp
+-from django.db.models.sql import compiler
+-from django.db.models.sql.constants import MULTI
+-from django.contrib.gis.db.models.sql.compiler import GeoSQLCompiler as BaseGeoSQLCompiler
+-
+-SQLCompiler = compiler.SQLCompiler
+-
+-class GeoSQLCompiler(BaseGeoSQLCompiler, SQLCompiler):
+- pass
+-
+-class SQLInsertCompiler(compiler.SQLInsertCompiler, GeoSQLCompiler):
+- pass
+-
+-class SQLDeleteCompiler(compiler.SQLDeleteCompiler, GeoSQLCompiler):
+- pass
+-
+-class SQLUpdateCompiler(compiler.SQLUpdateCompiler, GeoSQLCompiler):
+- pass
+-
+-class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
+- pass
+-
+-class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
+- """
+- This is overridden for GeoDjango to properly cast date columns, see #16757.
+- """
+- def results_iter(self):
+- offset = len(self.query.extra_select)
+- for rows in self.execute_sql(MULTI):
+- for row in rows:
+- date = typecast_timestamp(str(row[offset]))
+- yield date
+diff --git a/django/contrib/gis/db/backends/spatialite/creation.py b/django/contrib/gis/db/backends/spatialite/creation.py
+index c107d96..ee5f9db 100644
+--- a/django/contrib/gis/db/backends/spatialite/creation.py
++++ b/django/contrib/gis/db/backends/spatialite/creation.py
+@@ -56,14 +56,6 @@ class SpatiaLiteCreation(DatabaseCreation):
+ interactive=False,
+ database=self.connection.alias)
+
+- # One effect of calling syncdb followed by flush is that the id of the
+- # default site may or may not be 1, depending on how the sequence was
+- # reset. If the sites app is loaded, then we coerce it.
+- from django.db.models import get_model
+- Site = get_model('sites', 'Site')
+- if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
+- Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
+-
+ from django.core.cache import get_cache
+ from django.core.cache.backends.db import BaseDatabaseCache
+ for cache_alias in settings.CACHES:
+diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py
+index 1dc612c..e6f8409 100644
+--- a/django/contrib/gis/db/backends/spatialite/operations.py
++++ b/django/contrib/gis/db/backends/spatialite/operations.py
+@@ -48,7 +48,7 @@ def get_dist_ops(operator):
+ return (SpatiaLiteDistance(operator),)
+
+ class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
+- compiler_module = 'django.contrib.gis.db.backends.spatialite.compiler'
++ compiler_module = 'django.contrib.gis.db.models.sql.compiler'
+ name = 'spatialite'
+ spatialite = True
+ version_regex = re.compile(r'^(?P<major>\d)\.(?P<minor1>\d)\.(?P<minor2>\d+)')
+diff --git a/django/contrib/gis/db/models/sql/compiler.py b/django/contrib/gis/db/models/sql/compiler.py
+index 782ce78..405a000 100644
+--- a/django/contrib/gis/db/models/sql/compiler.py
++++ b/django/contrib/gis/db/models/sql/compiler.py
+@@ -1,7 +1,7 @@
+ from itertools import izip
+-from django.db.backends.util import truncate_name
++from django.db.backends.util import truncate_name, typecast_timestamp
+ from django.db.models.sql import compiler
+-from django.db.models.sql.constants import TABLE_NAME
++from django.db.models.sql.constants import TABLE_NAME, MULTI
+ from django.db.models.sql.query import get_proxied_model
+
+ SQLCompiler = compiler.SQLCompiler
+@@ -194,7 +194,7 @@ class GeoSQLCompiler(compiler.SQLCompiler):
+ # We resolve the rest of the columns if we're on Oracle or if
+ # the `geo_values` attribute is defined.
+ for value, field in map(None, row[index_start:], fields):
+- values.append(self.query.convert_values(value, field, connection=self.connection))
++ values.append(self.query.convert_values(value, field, self.connection))
+ else:
+ values.extend(row[index_start:])
+ return tuple(values)
+@@ -275,4 +275,24 @@ class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
+ pass
+
+ class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
+- pass
++ """
++ This is overridden for GeoDjango to properly cast date columns, since
++ `GeoQuery.resolve_columns` is used for spatial values.
++ See #14648, #16757.
++ """
++ def results_iter(self):
++ if self.connection.ops.oracle:
++ from django.db.models.fields import DateTimeField
++ fields = [DateTimeField()]
++ else:
++ needs_string_cast = self.connection.features.needs_datetime_string_cast
++
++ offset = len(self.query.extra_select)
++ for rows in self.execute_sql(MULTI):
++ for row in rows:
++ date = row[offset]
++ if self.connection.ops.oracle:
++ date = self.resolve_columns(row, fields)[offset]
++ elif needs_string_cast:
++ date = typecast_timestamp(str(date))
++ yield date
+diff --git a/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz b/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz
+index 68bf54c..8937637 100644
+Binary files a/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz and b/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz differ
+diff --git a/django/contrib/gis/tests/relatedapp/models.py b/django/contrib/gis/tests/relatedapp/models.py
+index 2e9a62b..aec4e15 100644
+--- a/django/contrib/gis/tests/relatedapp/models.py
++++ b/django/contrib/gis/tests/relatedapp/models.py
+@@ -36,6 +36,7 @@ class Parcel(models.Model):
+ # These use the GeoManager but do not have any geographic fields.
+ class Author(models.Model):
+ name = models.CharField(max_length=100)
++ dob = models.DateField()
+ objects = models.GeoManager()
+
+ class Article(models.Model):
+diff --git a/django/contrib/gis/tests/relatedapp/tests.py b/django/contrib/gis/tests/relatedapp/tests.py
+index 250783b..1a6197c 100644
+--- a/django/contrib/gis/tests/relatedapp/tests.py
++++ b/django/contrib/gis/tests/relatedapp/tests.py
+@@ -1,3 +1,4 @@
++from datetime import date
+ from django.test import TestCase
+
+ from django.contrib.gis.geos import GEOSGeometry, Point, MultiPoint
+@@ -281,4 +282,11 @@ class RelatedGeoModelTest(TestCase):
+ # evaluated as list generation swallows TypeError in CPython.
+ sql = str(qs.query)
+
++ def test16_annotated_date_queryset(self):
++ "Ensure annotated date querysets work if spatial backend is used. See #14648."
++ birth_years = [dt.year for dt in
++ list(Author.objects.annotate(num_books=Count('books')).dates('dob', 'year'))]
++ birth_years.sort()
++ self.assertEqual([1950, 1974], birth_years)
++
+ # TODO: Related tests for KML, GML, and distance lookups.
+diff --git a/django/contrib/sites/management.py b/django/contrib/sites/management.py
+index 1987274..9bf5a14 100644
+--- a/django/contrib/sites/management.py
++++ b/django/contrib/sites/management.py
+@@ -3,15 +3,34 @@ Creates the default Site object.
+ """
+
+ from django.db.models import signals
++from django.db import connections
++from django.db import router
+ from django.contrib.sites.models import Site
+ from django.contrib.sites import models as site_app
++from django.core.management.color import no_style
+
+ def create_default_site(app, created_models, verbosity, db, **kwargs):
+- if Site in created_models:
++ # Only create the default sites in databases where Django created the table
++ if Site in created_models and router.allow_syncdb(db, Site) :
++ # The default settings set SITE_ID = 1, and some tests in Django's test
++ # suite rely on this value. However, if database sequences are reused
++ # (e.g. in the test suite after flush/syncdb), it isn't guaranteed that
++ # the next id will be 1, so we coerce it. See #15573 and #16353. This
++ # can also crop up outside of tests - see #15346.
+ if verbosity >= 2:
+ print "Creating example.com Site object"
+- s = Site(domain="example.com", name="example.com")
+- s.save(using=db)
++ Site(pk=1, domain="example.com", name="example.com").save(using=db)
++
++ # We set an explicit pk instead of relying on auto-incrementation,
++ # so we need to reset the database sequence.
++ sequence_sql = connections[db].ops.sequence_reset_sql(no_style(), [Site])
++ if sequence_sql:
++ if verbosity >= 2:
++ print "Resetting sequence"
++ cursor = connections[db].cursor()
++ for command in sequence_sql:
++ cursor.execute(command)
++
+ Site.objects.clear_cache()
+
+ signals.post_syncdb.connect(create_default_site, sender=site_app)
+diff --git a/django/contrib/sites/tests.py b/django/contrib/sites/tests.py
+index 17ab1f2..828badb 100644
+--- a/django/contrib/sites/tests.py
++++ b/django/contrib/sites/tests.py
+@@ -15,6 +15,12 @@ class SitesFrameworkTests(TestCase):
+ def tearDown(self):
+ Site._meta.installed = self.old_Site_meta_installed
+
++ def test_save_another(self):
++ # Regression for #17415
++ # On some backends the sequence needs reset after save with explicit ID.
++ # Test that there is no sequence collisions by saving another site.
++ Site(domain="example2.com", name="example2.com").save()
++
+ def test_site_manager(self):
+ # Make sure that get_current() does not return a deleted Site object.
+ s = Site.objects.get_current()
+diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py
+index e4ce462..039ebb8 100644
+--- a/django/core/management/commands/shell.py
++++ b/django/core/management/commands/shell.py
+@@ -13,9 +13,8 @@ class Command(NoArgsCommand):
+
+ def ipython(self):
+ try:
+- from IPython.frontend.terminal.embed import TerminalInteractiveShell
+- shell = TerminalInteractiveShell()
+- shell.mainloop()
++ from IPython import embed
++ embed()
+ except ImportError:
+ # IPython < 0.11
+ # Explicitly pass an empty list as arguments, because otherwise
+diff --git a/django/core/validators.py b/django/core/validators.py
+index a93c6ac..9dcc2bc 100644
+--- a/django/core/validators.py
++++ b/django/core/validators.py
+@@ -147,7 +147,8 @@ class EmailValidator(RegexValidator):
+
+ email_re = re.compile(
+ r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*" # dot-atom
+- r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string
++ # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5
++ r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"'
+ r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE) # domain
+ validate_email = EmailValidator(email_re, _(u'Enter a valid e-mail address.'), 'invalid')
+
+diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py
+index 57e3f77..ef594b7 100644
+--- a/django/db/backends/creation.py
++++ b/django/db/backends/creation.py
+@@ -374,15 +374,6 @@ class BaseDatabaseCreation(object):
+ verbosity=max(verbosity - 1, 0),
+ interactive=False,
+ database=self.connection.alias)
+-
+- # One effect of calling syncdb followed by flush is that the id of the
+- # default site may or may not be 1, depending on how the sequence was
+- # reset. If the sites app is loaded, then we coerce it.
+- from django.db.models import get_model
+- if 'django.contrib.sites' in settings.INSTALLED_APPS:
+- Site = get_model('sites', 'Site')
+- if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
+- Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
+
+ from django.core.cache import get_cache
+ from django.core.cache.backends.db import BaseDatabaseCache
+diff --git a/django/http/__init__.py b/django/http/__init__.py
+index 68ac45d..07e5a46 100644
+--- a/django/http/__init__.py
++++ b/django/http/__init__.py
+@@ -92,7 +92,7 @@ else:
+ if not _cookie_allows_colon_in_names:
+ def load(self, rawdata, ignore_parse_errors=False):
+ if ignore_parse_errors:
+- self.bad_cookies = []
++ self.bad_cookies = set()
+ self._BaseCookie__set = self._loose_set
+ super(SimpleCookie, self).load(rawdata)
+ if ignore_parse_errors:
+@@ -106,8 +106,8 @@ else:
+ try:
+ self._strict_set(key, real_value, coded_value)
+ except Cookie.CookieError:
+- self.bad_cookies.append(key)
+- dict.__setitem__(self, key, None)
++ self.bad_cookies.add(key)
++ dict.__setitem__(self, key, Cookie.Morsel())
+
+
+ class CompatCookie(SimpleCookie):
+diff --git a/django/http/utils.py b/django/http/utils.py
+index 5eea239..0180864 100644
+--- a/django/http/utils.py
++++ b/django/http/utils.py
+@@ -76,7 +76,8 @@ def fix_IE_for_vary(request, response):
+
+ # The first part of the Content-Type field will be the MIME type,
+ # everything after ';', such as character-set, can be ignored.
+- if response['Content-Type'].split(';')[0] not in safe_mime_types:
++ mime_type = response.get('Content-Type', '').partition(';')[0]
++ if mime_type not in safe_mime_types:
+ try:
+ del response['Vary']
+ except KeyError:
+diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt
+index f5030e9..693f942 100644
+--- a/docs/howto/deployment/modpython.txt
++++ b/docs/howto/deployment/modpython.txt
+@@ -293,11 +293,14 @@ of the admin app, but this is not the case when you use any other server
+ arrangement. You're responsible for setting up Apache, or whichever media
+ server you're using, to serve the admin files.
+
+-The admin files live in (:file:`django/contrib/admin/static/admin`) of the
++The admin files live in (:file:`django/contrib/admin/media/admin`) of the
+ Django distribution.
+
+-We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
+-the admin files, but here are two other approaches:
++We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
++admin files (this means using the :djadmin:`collectstatic` management command
++to collect the static files in :setting:`STATIC_ROOT`, and then configuring
++your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
++here are two other approaches:
+
+ 1. Create a symbolic link to the admin static files from within your
+ document root.
+diff --git a/docs/howto/deployment/modwsgi.txt b/docs/howto/deployment/modwsgi.txt
+index de3a5b6..fdf9d27 100644
+--- a/docs/howto/deployment/modwsgi.txt
++++ b/docs/howto/deployment/modwsgi.txt
+@@ -127,11 +127,14 @@ of the admin app, but this is not the case when you use any other server
+ arrangement. You're responsible for setting up Apache, or whichever media
+ server you're using, to serve the admin files.
+
+-The admin files live in (:file:`django/contrib/admin/static/admin`) of the
++The admin files live in (:file:`django/contrib/admin/media/admin`) of the
+ Django distribution.
+
+-We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
+-the admin files, but here are two other approaches:
++We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
++admin files (this means using the :djadmin:`collectstatic` management command
++to collect the static files in :setting:`STATIC_ROOT`, and then configuring
++your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
++here are two other approaches:
+
+ 1. Create a symbolic link to the admin static files from within your
+ document root.
+diff --git a/docs/index.txt b/docs/index.txt
+index 0cf066e..20a7cec 100644
+--- a/docs/index.txt
++++ b/docs/index.txt
+@@ -28,7 +28,7 @@ Having trouble? We'd like to help!
+ .. _archives of the django-users mailing list: http://groups.google.com/group/django-users/
+ .. _post a question: http://groups.google.com/group/django-users/
+ .. _#django IRC channel: irc://irc.freenode.net/django
+-.. _IRC logs: http://botland.oebfare.com/logger/django/
++.. _IRC logs: http://django-irc-logs.com/
+ .. _ticket tracker: http://code.djangoproject.com/
+
+ First steps
+diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
+index 3f0f998..ca29d15 100644
+--- a/docs/internals/deprecation.txt
++++ b/docs/internals/deprecation.txt
+@@ -177,6 +177,12 @@ their deprecation, as per the :ref:`Django deprecation policy
+ required to end with a trailing slash to ensure there is a consistent
+ way to combine paths in templates.
+
++ * Translations located under the so-called *project path* will be
++ ignored during the translation building process performed at runtime.
++ The :setting:`LOCALE_PATHS` setting can be used for the same task by
++ including the filesystem path to a ``locale`` directory containing
++ non-app-specific translations in its value.
++
+ * 2.0
+ * ``django.views.defaults.shortcut()``. This function has been moved
+ to ``django.contrib.contenttypes.views.shortcut()`` as part of the
+diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt
+index 2a56f0b..799a59e 100644
+--- a/docs/internals/release-process.txt
++++ b/docs/internals/release-process.txt
+@@ -99,6 +99,13 @@ varying levels:
+ * Security fixes will be applied to the current trunk and the previous two
+ minor releases.
+
++* Documentation fixes will generally be more freely backported to the last
++ release branch (at the discretion of the committer), and don't need to meet
++ the "critical fixes only" bar as it's highly advantageous to have the docs
++ for the last release be up-to-date and correct, and the downside of
++ backporting (risk of introducing regressions) is much less of a concern
++ with doc fixes.
++
+ As a concrete example, consider a moment in time halfway between the release of
+ Django 1.3 and 1.4. At this point in time:
+
+@@ -111,6 +118,9 @@ Django 1.3 and 1.4. At this point in time:
+ ``1.2.X`` branch. Security fixes will trigger the release of ``1.3.1``,
+ ``1.2.1``, etc.
+
++* Documentation fixes will be applied to trunk, and if easily backported, to
++ the ``1.3.X`` branch.
++
+ .. _release-process:
+
+ Release process
+diff --git a/docs/intro/index.txt b/docs/intro/index.txt
+index bc61be7..19290a5 100644
+--- a/docs/intro/index.txt
++++ b/docs/intro/index.txt
+@@ -31,6 +31,6 @@ place: read this material to quickly get up and running.
+
+ .. _python: http://python.org/
+ .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers
+- .. _dive into python: http://diveintopython.org/
++ .. _dive into python: http://diveintopython.net/
+ .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20
+ .. _books about Python: http://wiki.python.org/moin/PythonBooks
+\ No newline at end of file
+diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
+index 2f2e049..4dc1e5c 100644
+--- a/docs/intro/tutorial01.txt
++++ b/docs/intro/tutorial01.txt
+@@ -59,7 +59,7 @@ This will create a ``mysite`` directory in your current directory.
+ can be run as a program. To do this, open Terminal.app and navigate (using
+ the ``cd`` command) to the directory where :doc:`django-admin.py
+ </ref/django-admin>` is installed, then run the command
+- ``chmod +x django-admin.py``.
++ ``sudo chmod +x django-admin.py``.
+
+ .. note::
+
+@@ -692,10 +692,9 @@ Save these changes and start a new Python interactive shell by running
+
+ For more information on model relations, see :doc:`Accessing related objects
+ </ref/models/relations>`. For more on how to use double underscores to perform
+-field lookups via the API, see `Field lookups`__. For full details on the
+-database API, see our :doc:`Database API reference </topics/db/queries>`.
+-
+-__ http://docs.djangoproject.com/en/1.2/topics/db/queries/#field-lookups
++field lookups via the API, see :ref:`Field lookups <field-lookups-intro>`. For
++full details on the database API, see our :doc:`Database API reference
++</topics/db/queries>`.
+
+ When you're comfortable with the API, read :doc:`part 2 of this tutorial
+ </intro/tutorial02>` to get Django's automatic admin working.
+diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt
+index 4bd31fb..1e837e6 100644
+--- a/docs/intro/tutorial02.txt
++++ b/docs/intro/tutorial02.txt
+@@ -40,22 +40,22 @@ activate the admin site for your installation, do these three things:
+
+ .. parsed-literal::
+
+- from django.conf.urls.defaults import *
++ from django.conf.urls.defaults import patterns, include, url
+
+ # Uncomment the next two lines to enable the admin:
+ **from django.contrib import admin**
+ **admin.autodiscover()**
+
+ urlpatterns = patterns('',
+- # Example:
+- # (r'^mysite/', include('mysite.foo.urls')),
++ # Examples:
++ # url(r'^$', 'mysite.views.home', name='home'),
++ # url(r'^mysite/', include('mysite.foo.urls')),
+
+- # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
+- # to INSTALLED_APPS to enable admin documentation:
+- # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
++ # Uncomment the admin/doc line below to enable admin documentation:
++ # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+ # Uncomment the next line to enable the admin:
+- **(r'^admin/', include(admin.site.urls)),**
++ **url(r'^admin/', include(admin.site.urls)),**
+ )
+
+ (The bold lines are the ones that needed to be uncommented.)
+diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
+index 41a62a7..566ba55 100644
+--- a/docs/intro/tutorial03.txt
++++ b/docs/intro/tutorial03.txt
+@@ -78,17 +78,17 @@ point at that file::
+
+ Time for an example. Edit ``mysite/urls.py`` so it looks like this::
+
+- from django.conf.urls.defaults import *
++ from django.conf.urls.defaults import patterns, include, url
+
+ from django.contrib import admin
+ admin.autodiscover()
+
+ urlpatterns = patterns('',
+- (r'^polls/$', 'polls.views.index'),
+- (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
+- (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
+- (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
+- (r'^admin/', include(admin.site.urls)),
++ url(r'^polls/$', 'polls.views.index'),
++ url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
++ url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
++ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
++ url(r'^admin/', include(admin.site.urls)),
+ )
+
+ This is worth a review. When somebody requests a page from your Web site -- say,
+@@ -112,7 +112,7 @@ what you can do with them. And there's no need to add URL cruft such as ``.php``
+ -- unless you have a sick sense of humor, in which case you can do something
+ like this::
+
+- (r'^polls/latest\.php$', 'polls.views.index'),
++ url(r'^polls/latest\.php$', 'polls.views.index'),
+
+ But, don't do that. It's silly.
+
+@@ -357,22 +357,23 @@ the list is empty.
+ Write a 404 (page not found) view
+ =================================
+
+-When you raise :exc:`~django.http.Http404` from within a view, Django will load
+-a special view devoted to handling 404 errors. It finds it by looking for the
+-variable ``handler404``, which is a string in Python dotted syntax -- the same
+-format the normal URLconf callbacks use. A 404 view itself has nothing special:
+-It's just a normal view.
+-
+-You normally won't have to bother with writing 404 views. By default, URLconfs
+-have the following line up top::
+-
+- from django.conf.urls.defaults import *
++When you raise :exc:`~django.http.Http404` from within a view, Django
++will load a special view devoted to handling 404 errors. It finds it
++by looking for the variable ``handler404`` in your root URLconf (and
++only in your root URLconf; setting ``handler404`` anywhere else will
++have no effect), which is a string in Python dotted syntax -- the same
++format the normal URLconf callbacks use. A 404 view itself has nothing
++special: It's just a normal view.
+
+-That takes care of setting ``handler404`` in the current module. As you can see
+-in ``django/conf/urls/defaults.py``, ``handler404`` is set to
+-:func:`django.views.defaults.page_not_found` by default.
++You normally won't have to bother with writing 404 views. If you don't set
++``handler404``, the built-in view :func:`django.views.defaults.page_not_found`
++is used by default. In this case, you still have one obligation: To create a
++``404.html`` template in the root of your template directory. The default 404
++view will use that template for all 404 errors. If :setting:`DEBUG` is set to
++``False`` (in your settings module) and if you didn't create a ``404.html``
++file, an ``Http500`` is raised instead. So remember to create a ``404.html``.
+
+-Four more things to note about 404 views:
++A couple more things to note about 404 views:
+
+ * If :setting:`DEBUG` is set to ``True`` (in your settings module) then your
+ 404 view will never be used (and thus the ``404.html`` template will never
+@@ -381,21 +382,12 @@ Four more things to note about 404 views:
+ * The 404 view is also called if Django doesn't find a match after checking
+ every regular expression in the URLconf.
+
+- * If you don't define your own 404 view -- and simply use the default, which
+- is recommended -- you still have one obligation: To create a ``404.html``
+- template in the root of your template directory. The default 404 view will
+- use that template for all 404 errors.
+-
+- * If :setting:`DEBUG` is set to ``False`` (in your settings module) and if
+- you didn't create a ``404.html`` file, an ``Http500`` is raised instead.
+- So remember to create a ``404.html``.
+-
+ Write a 500 (server error) view
+ ===============================
+
+-Similarly, URLconfs may define a ``handler500``, which points to a view to call
+-in case of server errors. Server errors happen when you have runtime errors in
+-view code.
++Similarly, your root URLconf may define a ``handler500``, which points
++to a view to call in case of server errors. Server errors happen when
++you have runtime errors in view code.
+
+ Use the template system
+ =======================
+@@ -432,10 +424,10 @@ Take some time to play around with the views and template system. As you edit
+ the URLconf, you may notice there's a fair bit of redundancy in it::
+
+ urlpatterns = patterns('',
+- (r'^polls/$', 'polls.views.index'),
+- (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
+- (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
+- (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
++ url(r'^polls/$', 'polls.views.index'),
++ url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
++ url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
++ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
+ )
+
+ Namely, ``polls.views`` is in every callback.
+@@ -445,10 +437,10 @@ common prefixes. You can factor out the common prefixes and add them as the
+ first argument to :func:`~django.conf.urls.defaults.patterns`, like so::
+
+ urlpatterns = patterns('polls.views',
+- (r'^polls/$', 'index'),
+- (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
+- (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
+- (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
++ url(r'^polls/$', 'index'),
++ url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
++ url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
++ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
+ )
+
+ This is functionally identical to the previous formatting. It's just a bit
+@@ -459,20 +451,20 @@ callback in your URLconf, you can concatenate multiple
+ :func:`~django.conf.urls.defaults.patterns`. Your full ``mysite/urls.py`` might
+ now look like this::
+
+- from django.conf.urls.defaults import *
++ from django.conf.urls.defaults import patterns, include, url
+
+ from django.contrib import admin
+ admin.autodiscover()
+
+ urlpatterns = patterns('polls.views',
+- (r'^polls/$', 'index'),
+- (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
+- (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
+- (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
++ url(r'^polls/$', 'index'),
++ url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
++ url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
++ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
+ )
+
+ urlpatterns += patterns('',
+- (r'^admin/', include(admin.site.urls)),
++ url(r'^admin/', include(admin.site.urls)),
+ )
+
+ Decoupling the URLconfs
+@@ -502,8 +494,8 @@ Copy the file ``mysite/urls.py`` to ``polls/urls.py``. Then, change
+ admin.autodiscover()
+
+ urlpatterns = patterns('',
+- (r'^polls/', include('polls.urls')),
+- (r'^admin/', include(admin.site.urls)),
++ url(r'^polls/', include('polls.urls')),
++ url(r'^admin/', include(admin.site.urls)),
+ )
+
+ :func:`~django.conf.urls.defaults.include` simply references another URLconf.
+@@ -526,13 +518,13 @@ URLconf by removing the leading "polls/" from each line, and removing the
+ lines registering the admin site. Your ``polls/urls.py`` file should now look like
+ this::
+
+- from django.conf.urls.defaults import *
++ from django.conf.urls.defaults import patterns, include, url
+
+ urlpatterns = patterns('polls.views',
+- (r'^$', 'index'),
+- (r'^(?P<poll_id>\d+)/$', 'detail'),
+- (r'^(?P<poll_id>\d+)/results/$', 'results'),
+- (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
++ url(r'^$', 'index'),
++ url(r'^(?P<poll_id>\d+)/$', 'detail'),
++ url(r'^(?P<poll_id>\d+)/results/$', 'results'),
++ url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
+ )
+
+ The idea behind :func:`~django.conf.urls.defaults.include` and URLconf
+diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt
+index ded5cb2..4c2f2d4 100644
+--- a/docs/intro/tutorial04.txt
++++ b/docs/intro/tutorial04.txt
+@@ -218,13 +218,13 @@ Read on for details.
+ First, open the ``polls/urls.py`` URLconf. It looks like this, according to the
+ tutorial so far::
+
+- from django.conf.urls.defaults import *
++ from django.conf.urls.defaults import patterns, include, url
+
+ urlpatterns = patterns('polls.views',
+- (r'^$', 'index'),
+- (r'^(?P<poll_id>\d+)/$', 'detail'),
+- (r'^(?P<poll_id>\d+)/results/$', 'results'),
+- (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
++ url(r'^$', 'index'),
++ url(r'^(?P<poll_id>\d+)/$', 'detail'),
++ url(r'^(?P<poll_id>\d+)/results/$', 'results'),
++ url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
+ )
+
+ Change it like so::
+@@ -234,12 +234,12 @@ Change it like so::
+ from polls.models import Poll
+
+ urlpatterns = patterns('',
+- (r'^$',
++ url(r'^$',
+ ListView.as_view(
+ queryset=Poll.objects.order_by('-pub_date')[:5],
+ context_object_name='latest_poll_list',
+ template_name='polls/index.html')),
+- (r'^(?P<pk>\d+)/$',
++ url(r'^(?P<pk>\d+)/$',
+ DetailView.as_view(
+ model=Poll,
+ template_name='polls/detail.html')),
+@@ -248,7 +248,7 @@ Change it like so::
+ model=Poll,
+ template_name='polls/results.html'),
+ name='poll_results'),
+- (r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
++ url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
+ )
+
+ We're using two generic views here:
+diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
+index beff94e..7394c3a 100644
+--- a/docs/ref/contrib/admin/index.txt
++++ b/docs/ref/contrib/admin/index.txt
+@@ -19,8 +19,10 @@ There are six steps in activating the Django admin site:
+ 1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS`
+ setting.
+
+- 2. Admin has two dependencies - :mod:`django.contrib.auth` and
+- :mod:`django.contrib.contenttypes`. If these applications are not
++ 2. The admin has four dependencies - :mod:`django.contrib.auth`,
++ :mod:`django.contrib.contenttypes`,
++ :mod:`django.contrib.messages` and
++ :mod:`django.contrib.sessions`. If these applications are not
+ in your :setting:`INSTALLED_APPS` list, add them.
+
+ 3. Determine which of your application's models should be editable in the
+@@ -542,7 +544,7 @@ subclass::
+ Fields in ``list_filter`` can also span relations using the ``__`` lookup::
+
+ class UserAdminWithLookup(UserAdmin):
+- list_filter = ('groups__name')
++ list_filter = ('groups__name',)
+
+ .. attribute:: ModelAdmin.list_per_page
+
+diff --git a/docs/ref/contrib/gis/geoip.txt b/docs/ref/contrib/gis/geoip.txt
+index 6503be7..f5c45e1 100644
+--- a/docs/ref/contrib/gis/geoip.txt
++++ b/docs/ref/contrib/gis/geoip.txt
+@@ -144,7 +144,7 @@ parameters.
+ Returns a dictionary of city information for the given query. Some
+ of the values in the dictionary may be undefined (``None``).
+
+-.. method:: GeoIPcountry(query)
++.. method:: GeoIP.country(query)
+
+ Returns a dictionary with the country code and country for the given
+ query.
+diff --git a/docs/ref/contrib/messages.txt b/docs/ref/contrib/messages.txt
+index ca3212d..ee7e01c 100644
+--- a/docs/ref/contrib/messages.txt
++++ b/docs/ref/contrib/messages.txt
+@@ -210,6 +210,10 @@ If you're using the context processor, your template should be rendered with a
+ ``RequestContext``. Otherwise, ensure ``messages`` is available to
+ the template context.
+
++Even if you know there is only just one message, you should still iterate over
++the ``messages`` sequence, because otherwise the message storage will not be cleared
++for the next request.
++
+ Creating custom message levels
+ ------------------------------
+
+diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
+index 89bc43f..58b86ea 100644
+--- a/docs/ref/django-admin.txt
++++ b/docs/ref/django-admin.txt
+@@ -1156,7 +1156,7 @@ variable.
+ Note that this option is unnecessary in ``manage.py``, because it takes care of
+ setting the Python path for you.
+
+-.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
++.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
+
+ .. django-admin-option:: --settings
+
+diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
+index 3728a09..52c0869 100644
+--- a/docs/ref/models/instances.txt
++++ b/docs/ref/models/instances.txt
+@@ -470,7 +470,7 @@ the URL. For example, if your URLconf contained a line such as::
+
+ Similarly, if you had a URLconf entry that looked like::
+
+- (r'/archive/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', archive_view)
++ (r'/archive/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', archive_view)
+
+ ...you could reference this using ``permalink()`` as follows::
+
+@@ -478,8 +478,8 @@ Similarly, if you had a URLconf entry that looked like::
+ def get_absolute_url(self):
+ return ('archive_view', (), {
+ 'year': self.created.year,
+- 'month': self.created.month,
+- 'day': self.created.day})
++ 'month': self.created.strftime('%m'),
++ 'day': self.created.strftime('%d')})
+
+ Notice that we specify an empty sequence for the second parameter in this case,
+ because we only want to pass keyword parameters, not positional ones.
+diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
+index 4530439..c1beab0 100644
+--- a/docs/ref/models/options.txt
++++ b/docs/ref/models/options.txt
+@@ -166,6 +166,13 @@ Django quotes column and table names behind the scenes.
+ >>> answer.get_previous_in_order()
+ <Answer: 1>
+
++.. admonition:: Changing order_with_respect_to
++
++ ``order_with_respect_to`` adds an additional field/database column
++ named ``_order``, so be sure to handle that as you would any other
++ change to your models if you add or change ``order_with_respect_to``
++ after your initial :djadmin:`syncdb`.
++
+ ``ordering``
+ ------------
+
+@@ -238,6 +245,12 @@ Django quotes column and table names behind the scenes.
+
+ unique_together = ("driver", "restaurant")
+
++ A :class:`~django.db.models.ManyToManyField` cannot be included in
++ unique_together (it's not even clear what that would mean). If you
++ need to validate uniqueness related to a
++ :class:`~django.db.models.ManyToManyField`, look at signals or
++ using an explicit :attr:`through <ManyToManyField.through>` model.
++
+ ``verbose_name``
+ ----------------
+
+diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt
+index e83142e..ad25dce 100644
+--- a/docs/ref/signals.txt
++++ b/docs/ref/signals.txt
+@@ -352,12 +352,16 @@ post_syncdb
+ .. data:: django.db.models.signals.post_syncdb
+ :module:
+
+-Sent by :djadmin:`syncdb` after it installs an application.
++Sent by :djadmin:`syncdb` command after it installs an application, and
++:djadmin:`flush` command.
+
+ Any handlers that listen to this signal need to be written in a particular
+ place: a ``management`` module in one of your :setting:`INSTALLED_APPS`. If
+ handlers are registered anywhere else they may not be loaded by
+-:djadmin:`syncdb`.
++:djadmin:`syncdb`. It is important that handlers of this signal perform
++idempotent changes (e.g. no database alterations) as this may cause the
++:djadmin:`flush` management command to fail if it also ran during the
++:djadmin:`syncdb` command.
+
+ Arguments sent with this signal:
+
+diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
+index 7d24c1d..6c7057a 100644
+--- a/docs/ref/templates/builtins.txt
++++ b/docs/ref/templates/builtins.txt
+@@ -1868,7 +1868,7 @@ slice
+ Returns a slice of the list.
+
+ Uses the same syntax as Python's list slicing. See
+-http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice
++http://diveintopython.net/native_data_types/lists.html#odbchelper.list.slice
+ for an introduction.
+
+ Example::
+diff --git a/docs/releases/0.95.txt b/docs/releases/0.95.txt
+index 7409bff..3632c31 100644
+--- a/docs/releases/0.95.txt
++++ b/docs/releases/0.95.txt
+@@ -92,15 +92,15 @@ changes is described in the `Removing The Magic`_ wiki page. There is also an
+ easy checklist_ for reference when undertaking the porting operation.
+
+ .. _Removing The Magic: http://code.djangoproject.com/wiki/RemovingTheMagic
+-.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet1
++.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet
+
+ Problem reports and getting help
+ ================================
+
+-Need help resolving a problem with Django? The documentation in the distribution
+-is also available online_ at the `Django Web site`_. The :doc:`FAQ </faq/index>`
+-document is especially recommended, as it contains a number of issues that come
+-up time and again.
++Need help resolving a problem with Django? The documentation in the
++distribution is also available :doc:`online </index>` at the `Django Web
++site`_. The :doc:`FAQ </faq/index>` document is especially recommended, as it
++contains a number of issues that come up time and again.
+
+ For more personalized help, the `django-users`_ mailing list is a very active
+ list, with more than 2,000 subscribers who can help you solve any sort of
+@@ -113,7 +113,6 @@ there's a #django channel on irc.freenode.net that is regularly populated by
+ Django users and developers from around the world. Friendly people are usually
+ available at any hour of the day -- to help, or just to chat.
+
+-.. _online: http://www.djangoproject.com/documentation/0.95/
+ .. _Django Web site: http://www.djangoproject.com/
+ .. _django-users: http://groups.google.com/group/django-users
+
+diff --git a/docs/releases/0.96.txt b/docs/releases/0.96.txt
+index 1224360..8874ccb 100644
+--- a/docs/releases/0.96.txt
++++ b/docs/releases/0.96.txt
+@@ -50,12 +50,10 @@ aside from any necessary security fixes, it will not be actively
+ maintained, and it will be removed in a future release of Django.
+
+ Also, note that some features, like the new :setting:`DATABASE_OPTIONS`
+-setting (see the `databases documentation`_ for details), are only
+-available on the "mysql" backend, and will not be made available for
++setting (see the :doc:`databases documentation </ref/databases>` for details),
++are only available on the "mysql" backend, and will not be made available for
+ "mysql_old".
+
+-.. _databases documentation: http://www.djangoproject.com/documentation/0.96/databases/
+-
+ Database constraint names changed
+ ---------------------------------
+
+@@ -164,10 +162,8 @@ Although the ``newforms`` library will continue to evolve, it's ready for use
+ for most common cases. We recommend that anyone new to form handling skip the
+ old forms system and start with the new.
+
+-For more information about ``django.newforms``, read the `newforms
+-documentation`_.
+-
+-.. _newforms documentation: http://www.djangoproject.com/documentation/0.96/newforms/
++For more information about ``django.newforms``, read the :doc:`newforms
++documentation </topics/forms/index>`.
+
+ URLconf improvements
+ --------------------
+@@ -216,19 +212,15 @@ The test framework
+ ------------------
+
+ Django now includes a test framework so you can start transmuting fear into
+-boredom (with apologies to Kent Beck). You can write tests based on doctest_
+-or unittest_ and test your views with a simple test client.
++boredom (with apologies to Kent Beck). You can write tests based on
++:mod:`doctest` or :mod:`unittest` and test your views with a simple test client.
+
+ There is also new support for "fixtures" -- initial data, stored in any of the
+-supported `serialization formats`_, that will be loaded into your database at the
+-start of your tests. This makes testing with real data much easier.
+-
+-See `the testing documentation`_ for the full details.
++supported :doc:`serialization formats </topics/serialization>`, that will be
++loaded into your database at the start of your tests. This makes testing with
++real data much easier.
+
+-.. _doctest: http://docs.python.org/library/doctest.html
+-.. _unittest: http://docs.python.org/library/unittest.html
+-.. _the testing documentation: http://www.djangoproject.com/documentation/0.96/testing/
+-.. _serialization formats: http://www.djangoproject.com/documentation/0.96/serialization/
++See :doc:`the testing documentation </topics/testing>` for the full details.
+
+ Improvements to the admin interface
+ -----------------------------------
+diff --git a/docs/releases/1.0.1.txt b/docs/releases/1.0.1.txt
+index 780dc53..3550e7c 100644
+--- a/docs/releases/1.0.1.txt
++++ b/docs/releases/1.0.1.txt
+@@ -6,10 +6,10 @@ Welcome to Django 1.0.1!
+
+ This is the first "bugfix" release in the Django 1.0 series, improving
+ the stability and performance of the Django 1.0 codebase. As such,
+-Django 1.0.1 contains no new features (and, pursuant to `our
+-compatibility policy`_, maintains backwards compatibility with Django
+-1.0), but does contain a number of fixes and other
+-improvements. Django 1.0.1 is a recommended upgrade for any
++Django 1.0.1 contains no new features (and, pursuant to :doc:`our
++compatibility policy </misc/api-stability/>`, maintains backwards
++compatibility with Django 1.0), but does contain a number of fixes
++and other improvements. Django 1.0.1 is a recommended upgrade for any
+ development or deployment currently using or targeting Django 1.0.
+
+
+@@ -46,8 +46,9 @@ highlights:
+
+ * A fix to the application of autoescaping for literal strings passed
+ to the ``join`` template filter. Previously, literal strings passed
+- to ``join`` were automatically escaped, contrary to `the documented
+- behavior for autoescaping and literal strings`_. Literal strings
++ to ``join`` were automatically escaped, contrary to :ref:`the
++ documented behavior for autoescaping and literal strings
++ <string-literals-and-automatic-escaping>`. Literal strings
+ passed to ``join`` are no longer automatically escaped, meaning you
+ must now manually escape them; this is an incompatibility if you
+ were relying on this bug, but not if you were relying on escaping
+@@ -60,6 +61,4 @@ highlights:
+ documentation, including both corrections to existing documents and
+ expanded and new documentation.
+
+-.. _our compatibility policy: http://docs.djangoproject.com/en/dev/misc/api-stability/
+ .. _the Subversion log of the 1.0.X branch: http://code.djangoproject.com/log/django/branches/releases/1.0.X
+-.. _the documented behavior for autoescaping and literal strings: http://docs.djangoproject.com/en/dev/topics/templates/#string-literals-and-automatic-escaping
+diff --git a/docs/releases/1.2.6.txt b/docs/releases/1.2.6.txt
+new file mode 100644
+index 0000000..cfd1d9c
+--- /dev/null
++++ b/docs/releases/1.2.6.txt
+@@ -0,0 +1,16 @@
++==========================
++Django 1.2.6 release notes
++==========================
++
++*September 9, 2011*
++
++Welcome to Django 1.2.6!
++
++This is the sixth bugfix/security release in the Django 1.2 series, fixing
++several security issues present in Django 1.2.5. Django 1.2.6 is a
++recommended upgrade for all users of any Django release in the 1.2.X series.
++
++For a full list of issues addressed in this release, see the `security
++advisory`_.
++
++.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
+diff --git a/docs/releases/1.2.7.txt b/docs/releases/1.2.7.txt
+new file mode 100644
+index 0000000..c0cf698
+--- /dev/null
++++ b/docs/releases/1.2.7.txt
+@@ -0,0 +1,16 @@
++==========================
++Django 1.2.7 release notes
++==========================
++
++*September 10, 2011*
++
++Welcome to Django 1.2.7!
++
++This is the seventh bugfix/security release in the Django 1.2 series. It
++replaces Django 1.2.6 due to problems with the 1.2.6 release tarball.
++Django 1.2.7 is a recommended upgrade for all users of any Django release in
++the 1.2.X series.
++
++For more information, see the `release advisory`_.
++
++.. _release advisory: https://www.djangoproject.com/weblog/2011/sep/10/127/
+diff --git a/docs/releases/1.3.1.txt b/docs/releases/1.3.1.txt
+new file mode 100644
+index 0000000..4c28916
+--- /dev/null
++++ b/docs/releases/1.3.1.txt
+@@ -0,0 +1,16 @@
++==========================
++Django 1.3.1 release notes
++==========================
++
++*September 9, 2011*
++
++Welcome to Django 1.3.1!
++
++This is the first security release in the Django 1.3 series, fixing several
++security issues in Django 1.3. Django 1.3.1 is a recommended upgrade for
++all users of Django 1.3.
++
++For a full list of issues addressed in this release, see the `security
++advisory`_.
++
++.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
+diff --git a/docs/releases/index.txt b/docs/releases/index.txt
+index 8d23c28..40fe5b0 100644
+--- a/docs/releases/index.txt
++++ b/docs/releases/index.txt
+@@ -19,6 +19,7 @@ Final releases
+ .. toctree::
+ :maxdepth: 1
+
++ 1.3.1
+ 1.3
+
+ 1.2 release
+@@ -26,6 +27,8 @@ Final releases
+ .. toctree::
+ :maxdepth: 1
+
++ 1.2.7
++ 1.2.6
+ 1.2.5
+ 1.2.4
+ 1.2.2
+diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
+index 635f18f..5a2608a 100644
+--- a/docs/topics/auth.txt
++++ b/docs/topics/auth.txt
+@@ -1251,16 +1251,19 @@ can or cannot do with Task instances, specific to your application::
+ ...
+ class Meta:
+ permissions = (
+- ("can_view", "Can see available tasks"),
+- ("can_change_status", "Can change the status of tasks"),
+- ("can_close", "Can remove a task by setting its status as closed"),
++ ("view_task", "Can see available tasks"),
++ ("change_task_status", "Can change the status of tasks"),
++ ("close_task", "Can remove a task by setting its status as closed"),
+ )
+
+ The only thing this does is create those extra permissions when you run
+ :djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the
+ value of these permissions when an user is trying to access the functionality
+ provided by the application (viewing tasks, changing the status of tasks,
+-closing tasks.)
++closing tasks.) Continuing the above example, the following checks if a user may
++view tasks::
++
++ user.has_perm('app.view_task')
+
+ API reference
+ -------------
+diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
+index 8ef4ea2..9b68353 100644
+--- a/docs/topics/cache.txt
++++ b/docs/topics/cache.txt
+@@ -99,8 +99,9 @@ To use Memcached with Django:
+ on your chosen memcached binding)
+
+ * Set :setting:`LOCATION <CACHES-LOCATION>` to ``ip:port`` values,
+- where ``ip`` is the IP address of the Memcached daemon and
+- ``port`` is the port on which Memcached is running.
++ where ``ip`` is the IP address of the Memcached daemon and ``port`` is the
++ port on which Memcached is running, or to a ``unix:path`` value, where
++ ``path`` is the path to a Memcached Unix socket file.
+
+ In this example, Memcached is running on localhost (127.0.0.1) port 11211, using
+ the ``python-memcached`` binding::
+@@ -112,6 +113,16 @@ the ``python-memcached`` binding::
+ }
+ }
+
++In this example, Memcached is available through a local Unix socket file
++:file:`/tmp/memcached.sock` using the ``python-memcached`` binding::
++
++ CACHES = {
++ 'default': {
++ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
++ 'LOCATION': 'unix:/tmp/memcached.sock',
++ }
++ }
++
+ One excellent feature of Memcached is its ability to share cache over multiple
+ servers. This means you can run Memcached daemons on multiple machines, and the
+ program will treat the group of machines as a *single* cache, without the need
+@@ -526,9 +537,10 @@ you may expect. But once a particular URL (e.g., ``/foo/23/``) has been
+ requested, subsequent requests to that URL will use the cache.
+
+ ``cache_page`` can also take an optional keyword argument, ``cache``,
+-which directs the decorator to use a specific cache alias when caching view
+-results. By default, the ``default`` alias will be used, but you can specify
+-any cache alias you want::
++which directs the decorator to use a specific cache (from your
++:setting:`CACHES` setting) when caching view results. By default, the
++``default`` cache will be used, but you can specify any cache you
++want::
+
+ @cache_page(60 * 15, cache="special_cache")
+ def my_view(request):
+diff --git a/docs/topics/class-based-views.txt b/docs/topics/class-based-views.txt
+index 3831046..4da48ec 100644
+--- a/docs/topics/class-based-views.txt
++++ b/docs/topics/class-based-views.txt
+@@ -380,7 +380,7 @@ Next, we'll write the ``PublisherBookListView`` view itself::
+ class PublisherBookListView(ListView):
+
+ context_object_name = "book_list"
+- template_name = "books/books_by_publisher.html",
++ template_name = "books/books_by_publisher.html"
+
+ def get_queryset(self):
+ publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
+@@ -396,7 +396,7 @@ use it in the template::
+ class PublisherBookListView(ListView):
+
+ context_object_name = "book_list"
+- template_name = "books/books_by_publisher.html",
++ template_name = "books/books_by_publisher.html"
+
+ def get_queryset(self):
+ self.publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
+diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
+index 0e18205..af76344 100644
+--- a/docs/topics/db/models.txt
++++ b/docs/topics/db/models.txt
+@@ -324,11 +324,10 @@ whatever you want. For example::
+ should work; all are optional.
+
+ For details on accessing backwards-related objects, see the
+- `Following relationships backward example`_.
+-
++ :ref:`Following relationships backward example <backwards-related-objects>`.
++
+ For sample code, see the `Many-to-one relationship model tests`_.
+
+- .. _Following relationships backward example: http://docs.djangoproject.com/en/dev/topics/db/queries/#backwards-related-objects
+ .. _Many-to-one relationship model tests: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/many_to_one
+
+ Many-to-many relationships
+diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt
+index fe71736..d9b8b1a 100644
+--- a/docs/topics/db/sql.txt
++++ b/docs/topics/db/sql.txt
+@@ -236,6 +236,30 @@ alias::
+ # Your code here...
+ transaction.commit_unless_managed(using='my_db_alias')
+
++By default, the Python DB API will return results without their field
++names, which means you end up with a ``list`` of values, rather than a
++``dict``. At a small performance cost, you can return results as a
++``dict`` by using something like this::
++
++ def dictfetchall(cursor):
++ "Returns all rows from a cursor as a dict"
++ desc = cursor.description
++ return [
++ dict(zip([col[0] for col in desc], row))
++ for row in cursor.fetchall()
++ ]
++
++Here is an example of the difference between the two::
++
++ >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
++ >>> cursor.fetchall()
++ ((54360982L, None), (54360880L, None))
++
++ >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
++ >>> dictfetchall(cursor)
++ [{'parent_id': None, 'id': 54360982L}, {'parent_id': None, 'id': 54360880L}]
++
++
+ .. _transactions-and-raw-sql:
+
+ Transactions and raw SQL
+diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt
+index 07bc5e3..24e000e 100644
+--- a/docs/topics/forms/modelforms.txt
++++ b/docs/topics/forms/modelforms.txt
+@@ -332,13 +332,17 @@ Since the Author model has only 3 fields, 'name', 'title', and
+ .. note::
+
+ If you specify ``fields`` or ``exclude`` when creating a form with
+- ``ModelForm``, then the fields that are not in the resulting form will not
+- be set by the form's ``save()`` method. Django will prevent any attempt to
+- save an incomplete model, so if the model does not allow the missing fields
+- to be empty, and does not provide a default value for the missing fields,
+- any attempt to ``save()`` a ``ModelForm`` with missing fields will fail.
+- To avoid this failure, you must instantiate your model with initial values
+- for the missing, but required fields::
++ ``ModelForm``, then the fields that are not in the resulting form
++ will not be set by the form's ``save()`` method. Also, if you
++ manually add the excluded fields back to the form, they will not
++ be initialized from the model instance.
++
++ Django will prevent any attempt to save an incomplete model, so if
++ the model does not allow the missing fields to be empty, and does
++ not provide a default value for the missing fields, any attempt to
++ ``save()`` a ``ModelForm`` with missing fields will fail. To
++ avoid this failure, you must instantiate your model with initial
++ values for the missing, but required fields::
+
+ author = Author(title='Mr')
+ form = PartialAuthorForm(request.POST, instance=author)
+@@ -633,6 +637,12 @@ database. If a given instance's data didn't change in the bound data, the
+ instance won't be saved to the database and won't be included in the return
+ value (``instances``, in the above example).
+
++When fields are missing from the form (for example because they have
++been excluded), these fields will not be set by the ``save()``
++method. You can find more information about this restriction, which
++also holds for regular ``ModelForms``, in `Using a subset of fields on
++the form`_.
++
+ Pass ``commit=False`` to return the unsaved model instances::
+
+ # don't save to the database
+diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
+index 1caa801..7a0e724 100644
+--- a/docs/topics/http/urls.txt
++++ b/docs/topics/http/urls.txt
+@@ -54,6 +54,10 @@ algorithm the system follows to determine which Python code to execute:
+ :class:`~django.http.HttpRequest` as its first argument and any values
+ captured in the regex as remaining arguments.
+
++ 5. If no regex matches, or if an exception is raised during any
++ point in this process, Django invokes an appropriate
++ error-handling view. See `Error handling`_ below.
++
+ Example
+ =======
+
+@@ -99,10 +103,10 @@ Example requests:
+ * ``/articles/2003`` would not match any of these patterns, because each
+ pattern requires that the URL end with a slash.
+
+- * ``/articles/2003/03/3/`` would match the final pattern. Django would call
+- the function ``news.views.article_detail(request, '2003', '03', '3')``.
++ * ``/articles/2003/03/03/`` would match the final pattern. Django would call
++ the function ``news.views.article_detail(request, '2003', '03', '03')``.
+
+-.. _Dive Into Python's explanation: http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3
++.. _Dive Into Python's explanation: http://diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3
+
+ Named groups
+ ============
+@@ -123,7 +127,7 @@ Here's the above example URLconf, rewritten to use named groups::
+ (r'^articles/2003/$', 'news.views.special_case_2003'),
+ (r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
+ (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'),
+- (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d+)/$', 'news.views.article_detail'),
++ (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'),
+ )
+
+ This accomplishes exactly the same thing as the previous example, with one
+@@ -134,8 +138,8 @@ arguments rather than positional arguments. For example:
+ ``news.views.month_archive(request, year='2005', month='03')``, instead
+ of ``news.views.month_archive(request, '2005', '03')``.
+
+- * A request to ``/articles/2003/03/3/`` would call the function
+- ``news.views.article_detail(request, year='2003', month='03', day='3')``.
++ * A request to ``/articles/2003/03/03/`` would call the function
++ ``news.views.article_detail(request, year='2003', month='03', day='03')``.
+
+ In practice, this means your URLconfs are slightly more explicit and less prone
+ to argument-order bugs -- and you can reorder the arguments in your views'
+@@ -246,6 +250,31 @@ The ``prefix`` parameter has the same meaning as the first argument to
+ ``patterns()`` and is only relevant when you're passing a string as the
+ ``view`` parameter.
+
++include
++-------
++
++.. function:: include(<module or pattern_list>)
++
++A function that takes a full Python import path to another URLconf module that
++should be "included" in this place.
++
++:func:`include` also accepts as an argument an iterable that returns URL
++patterns.
++
++See `Including other URLconfs`_ below.
++
++Error handling
++==============
++
++When Django can't find a regex matching the requested URL, or when an
++exception is raised, Django will invoke an error-handling view. The
++views to use for these cases are specified by two variables which can
++be set in your root URLconf. Setting these variables in any other
++URLconf will have no effect.
++
++See the documentation on :ref:`customizing error views
++<customizing-error-views>` for more details.
++
+ handler404
+ ----------
+
+@@ -275,19 +304,6 @@ value should suffice.
+ .. versionchanged:: 1.2
+ Previous versions of Django only accepted strings representing import paths.
+
+-include
+--------
+-
+-.. function:: include(<module or pattern_list>)
+-
+-A function that takes a full Python import path to another URLconf module that
+-should be "included" in this place.
+-
+-:func:`include` also accepts as an argument an iterable that returns URL
+-patterns.
+-
+-See `Including other URLconfs`_ below.
+-
+ Notes on capturing text in URLs
+ ===============================
+
+@@ -420,8 +436,8 @@ directly the pattern list as returned by `patterns`_ instead. For example::
+ from django.conf.urls.defaults import *
+
+ extra_patterns = patterns('',
+- url(r'reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
+- url(r'charge/$', 'credit.views.charge', name='credit-charge'),
++ url(r'^reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
++ url(r'^charge/$', 'credit.views.charge', name='credit-charge'),
+ )
+
+ urlpatterns = patterns('',
+diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt
+index 99359ab..83a52cb 100644
+--- a/docs/topics/http/views.txt
++++ b/docs/topics/http/views.txt
+@@ -122,6 +122,8 @@ In order to use the ``Http404`` exception to its fullest, you should create a
+ template that is displayed when a 404 error is raised. This template should be
+ called ``404.html`` and located in the top level of your template tree.
+
++.. _customizing-error-views:
++
+ Customizing error views
+ =======================
+
+diff --git a/docs/topics/i18n/internationalization.txt b/docs/topics/i18n/internationalization.txt
+index 5d50fa7..a83299c 100644
+--- a/docs/topics/i18n/internationalization.txt
++++ b/docs/topics/i18n/internationalization.txt
+@@ -477,7 +477,7 @@ for use within the translation block. Examples::
+
+ You can use multiple expressions inside a single ``blocktrans`` tag::
+
+- {% blocktrans with book_t=book|title and author_t=author|title %}
++ {% blocktrans with book_t=book|title author_t=author|title %}
+ This is {{ book_t }} by {{ author_t }}
+ {% endblocktrans %}
+
+diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt
+index 61ddf8c..bda51f2 100644
+--- a/docs/topics/settings.txt
++++ b/docs/topics/settings.txt
+@@ -39,7 +39,7 @@ The value of ``DJANGO_SETTINGS_MODULE`` should be in Python path syntax, e.g.
+ ``mysite.settings``. Note that the settings module should be on the
+ Python `import search path`_.
+
+-.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
++.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
+
+ The django-admin.py utility
+ ---------------------------
+diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
+index 83269ae..fc2cd3f 100644
+--- a/docs/topics/templates.txt
++++ b/docs/topics/templates.txt
+@@ -555,6 +555,8 @@ variable that needs escaping. When auto-escaping is on, there's no danger of
+ the ``escape`` filter *double-escaping* data -- the ``escape`` filter does not
+ affect auto-escaped variables.
+
++.. _string-literals-and-automatic-escaping:
++
+ String literals and automatic escaping
+ --------------------------------------
+
+diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt
+index 0a86f0d..8262b57 100644
+--- a/docs/topics/testing.txt
++++ b/docs/topics/testing.txt
+@@ -1586,7 +1586,7 @@ skipUnlessDBFeature
+ Skip the decorated test if the named database feature is *not*
+ supported.
+
+-For example, the following test will not be executed if the database
++For example, the following test will only be executed if the database
+ supports transactions (e.g., it would run under PostgreSQL, but *not*
+ under MySQL with MyISAM tables)::
+
+diff --git a/tests/modeltests/validators/tests.py b/tests/modeltests/validators/tests.py
+index e585262..4bd5827 100644
+--- a/tests/modeltests/validators/tests.py
++++ b/tests/modeltests/validators/tests.py
+@@ -28,6 +28,9 @@ TEST_DATA = (
+ (validate_email, 'abc', ValidationError),
+ (validate_email, 'a @x.cz', ValidationError),
+ (validate_email, 'something@@somewhere.com', ValidationError),
++ # Quoted-string format (CR not allowed)
++ (validate_email, '"\\\011"@here.com', None),
++ (validate_email, '"\\\012"@here.com', ValidationError),
+
+ (validate_slug, 'slug-ok', None),
+ (validate_slug, 'longer-slug-still-ok', None),
+diff --git a/tests/regressiontests/httpwrappers/tests.py b/tests/regressiontests/httpwrappers/tests.py
+index 2e2932f..6aabfe6 100644
+--- a/tests/regressiontests/httpwrappers/tests.py
++++ b/tests/regressiontests/httpwrappers/tests.py
+@@ -281,3 +281,9 @@ class CookieTests(unittest.TestCase):
+ Test that a single non-standard cookie name doesn't affect all cookies. Ticket #13007.
+ """
+ self.assertTrue('good_cookie' in parse_cookie('good_cookie=yes;bad:cookie=yes').keys())
++
++ def test_repeated_nonstandard_keys(self):
++ """
++ Test that a repeated non-standard name doesn't affect all cookies. Ticket #15852
++ """
++ self.assertTrue('good_cookie' in parse_cookie('a,=b; a,=c; good_cookie=yes').keys())
+diff --git a/tests/regressiontests/utils/http.py b/tests/regressiontests/utils/http.py
+index 83a4a7f..666d04f 100644
+--- a/tests/regressiontests/utils/http.py
++++ b/tests/regressiontests/utils/http.py
+@@ -1,5 +1,7 @@
+ from django.utils import http
+ from django.utils import unittest
++from django.http import HttpResponse, utils
++from django.test import RequestFactory
+
+ class TestUtilsHttp(unittest.TestCase):
+
+@@ -21,3 +23,49 @@ class TestUtilsHttp(unittest.TestCase):
+ self.assertFalse(http.same_origin('http://foo.com', 'http://foo.com.evil.com'))
+ # Different port
+ self.assertFalse(http.same_origin('http://foo.com:8000', 'http://foo.com:8001'))
++
++ def test_fix_IE_for_vary(self):
++ """
++ Regression for #16632.
++
++ `fix_IE_for_vary` shouldn't crash when there's no Content-Type header.
++ """
++
++ # functions to generate responses
++ def response_with_unsafe_content_type():
++ r = HttpResponse(content_type="text/unsafe")
++ r['Vary'] = 'Cookie'
++ return r
++
++ def no_content_response_with_unsafe_content_type():
++ # 'Content-Type' always defaulted, so delete it
++ r = response_with_unsafe_content_type()
++ del r['Content-Type']
++ return r
++
++ # request with & without IE user agent
++ rf = RequestFactory()
++ request = rf.get('/')
++ ie_request = rf.get('/', HTTP_USER_AGENT='MSIE')
++
++ # not IE, unsafe_content_type
++ response = response_with_unsafe_content_type()
++ utils.fix_IE_for_vary(request, response)
++ self.assertTrue('Vary' in response)
++
++ # IE, unsafe_content_type
++ response = response_with_unsafe_content_type()
++ utils.fix_IE_for_vary(ie_request, response)
++ self.assertFalse('Vary' in response)
++
++ # not IE, no_content
++ response = no_content_response_with_unsafe_content_type()
++ utils.fix_IE_for_vary(request, response)
++ self.assertTrue('Vary' in response)
++
++ # IE, no_content
++ response = no_content_response_with_unsafe_content_type()
++ utils.fix_IE_for_vary(ie_request, response)
++ self.assertFalse('Vary' in response)
++
++
diff --git a/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff b/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff
new file mode 100644
index 000000000..ebbf80993
--- /dev/null
+++ b/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff
@@ -0,0 +1,1575 @@
+Index: django/http/__init__.py
+===================================================================
+--- django/http/__init__.py (revision 16771)
++++ django/http/__init__.py (revision 17460)
+@@ -92,7 +92,7 @@
+ if not _cookie_allows_colon_in_names:
+ def load(self, rawdata, ignore_parse_errors=False):
+ if ignore_parse_errors:
+- self.bad_cookies = []
++ self.bad_cookies = set()
+ self._BaseCookie__set = self._loose_set
+ super(SimpleCookie, self).load(rawdata)
+ if ignore_parse_errors:
+@@ -106,8 +106,8 @@
+ try:
+ self._strict_set(key, real_value, coded_value)
+ except Cookie.CookieError:
+- self.bad_cookies.append(key)
+- dict.__setitem__(self, key, None)
++ self.bad_cookies.add(key)
++ dict.__setitem__(self, key, Cookie.Morsel())
+
+
+ class CompatCookie(SimpleCookie):
+Index: django/http/utils.py
+===================================================================
+--- django/http/utils.py (revision 16771)
++++ django/http/utils.py (revision 17460)
+@@ -76,7 +76,8 @@
+
+ # The first part of the Content-Type field will be the MIME type,
+ # everything after ';', such as character-set, can be ignored.
+- if response['Content-Type'].split(';')[0] not in safe_mime_types:
++ mime_type = response.get('Content-Type', '').partition(';')[0]
++ if mime_type not in safe_mime_types:
+ try:
+ del response['Vary']
+ except KeyError:
+Index: django/db/backends/creation.py
+===================================================================
+--- django/db/backends/creation.py (revision 16771)
++++ django/db/backends/creation.py (revision 17460)
+@@ -374,15 +374,6 @@
+ verbosity=max(verbosity - 1, 0),
+ interactive=False,
+ database=self.connection.alias)
+-
+- # One effect of calling syncdb followed by flush is that the id of the
+- # default site may or may not be 1, depending on how the sequence was
+- # reset. If the sites app is loaded, then we coerce it.
+- from django.db.models import get_model
+- if 'django.contrib.sites' in settings.INSTALLED_APPS:
+- Site = get_model('sites', 'Site')
+- if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
+- Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
+
+ from django.core.cache import get_cache
+ from django.core.cache.backends.db import BaseDatabaseCache
+Index: django/core/validators.py
+===================================================================
+--- django/core/validators.py (revision 16771)
++++ django/core/validators.py (revision 17460)
+@@ -147,7 +147,8 @@
+
+ email_re = re.compile(
+ r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*" # dot-atom
+- r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string
++ # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5
++ r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"'
+ r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE) # domain
+ validate_email = EmailValidator(email_re, _(u'Enter a valid e-mail address.'), 'invalid')
+
+Index: django/core/management/commands/shell.py
+===================================================================
+--- django/core/management/commands/shell.py (revision 16771)
++++ django/core/management/commands/shell.py (revision 17460)
+@@ -13,9 +13,8 @@
+
+ def ipython(self):
+ try:
+- from IPython.frontend.terminal.embed import TerminalInteractiveShell
+- shell = TerminalInteractiveShell()
+- shell.mainloop()
++ from IPython import embed
++ embed()
+ except ImportError:
+ # IPython < 0.11
+ # Explicitly pass an empty list as arguments, because otherwise
+Index: django/contrib/gis/db/models/sql/compiler.py
+===================================================================
+--- django/contrib/gis/db/models/sql/compiler.py (revision 16771)
++++ django/contrib/gis/db/models/sql/compiler.py (revision 17460)
+@@ -1,7 +1,7 @@
+ from itertools import izip
+-from django.db.backends.util import truncate_name
++from django.db.backends.util import truncate_name, typecast_timestamp
+ from django.db.models.sql import compiler
+-from django.db.models.sql.constants import TABLE_NAME
++from django.db.models.sql.constants import TABLE_NAME, MULTI
+ from django.db.models.sql.query import get_proxied_model
+
+ SQLCompiler = compiler.SQLCompiler
+@@ -194,7 +194,7 @@
+ # We resolve the rest of the columns if we're on Oracle or if
+ # the `geo_values` attribute is defined.
+ for value, field in map(None, row[index_start:], fields):
+- values.append(self.query.convert_values(value, field, connection=self.connection))
++ values.append(self.query.convert_values(value, field, self.connection))
+ else:
+ values.extend(row[index_start:])
+ return tuple(values)
+@@ -275,4 +275,24 @@
+ pass
+
+ class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
+- pass
++ """
++ This is overridden for GeoDjango to properly cast date columns, since
++ `GeoQuery.resolve_columns` is used for spatial values.
++ See #14648, #16757.
++ """
++ def results_iter(self):
++ if self.connection.ops.oracle:
++ from django.db.models.fields import DateTimeField
++ fields = [DateTimeField()]
++ else:
++ needs_string_cast = self.connection.features.needs_datetime_string_cast
++
++ offset = len(self.query.extra_select)
++ for rows in self.execute_sql(MULTI):
++ for row in rows:
++ date = row[offset]
++ if self.connection.ops.oracle:
++ date = self.resolve_columns(row, fields)[offset]
++ elif needs_string_cast:
++ date = typecast_timestamp(str(date))
++ yield date
+Index: django/contrib/gis/db/backends/spatialite/compiler.py
+===================================================================
+--- django/contrib/gis/db/backends/spatialite/compiler.py (revision 16771)
++++ django/contrib/gis/db/backends/spatialite/compiler.py (revision 17460)
+@@ -1,32 +0,0 @@
+-from django.db.backends.util import typecast_timestamp
+-from django.db.models.sql import compiler
+-from django.db.models.sql.constants import MULTI
+-from django.contrib.gis.db.models.sql.compiler import GeoSQLCompiler as BaseGeoSQLCompiler
+-
+-SQLCompiler = compiler.SQLCompiler
+-
+-class GeoSQLCompiler(BaseGeoSQLCompiler, SQLCompiler):
+- pass
+-
+-class SQLInsertCompiler(compiler.SQLInsertCompiler, GeoSQLCompiler):
+- pass
+-
+-class SQLDeleteCompiler(compiler.SQLDeleteCompiler, GeoSQLCompiler):
+- pass
+-
+-class SQLUpdateCompiler(compiler.SQLUpdateCompiler, GeoSQLCompiler):
+- pass
+-
+-class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
+- pass
+-
+-class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
+- """
+- This is overridden for GeoDjango to properly cast date columns, see #16757.
+- """
+- def results_iter(self):
+- offset = len(self.query.extra_select)
+- for rows in self.execute_sql(MULTI):
+- for row in rows:
+- date = typecast_timestamp(str(row[offset]))
+- yield date
+Index: django/contrib/gis/db/backends/spatialite/operations.py
+===================================================================
+--- django/contrib/gis/db/backends/spatialite/operations.py (revision 16771)
++++ django/contrib/gis/db/backends/spatialite/operations.py (revision 17460)
+@@ -48,7 +48,7 @@
+ return (SpatiaLiteDistance(operator),)
+
+ class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
+- compiler_module = 'django.contrib.gis.db.backends.spatialite.compiler'
++ compiler_module = 'django.contrib.gis.db.models.sql.compiler'
+ name = 'spatialite'
+ spatialite = True
+ version_regex = re.compile(r'^(?P<major>\d)\.(?P<minor1>\d)\.(?P<minor2>\d+)')
+Index: django/contrib/gis/db/backends/spatialite/creation.py
+===================================================================
+--- django/contrib/gis/db/backends/spatialite/creation.py (revision 16771)
++++ django/contrib/gis/db/backends/spatialite/creation.py (revision 17460)
+@@ -56,14 +56,6 @@
+ interactive=False,
+ database=self.connection.alias)
+
+- # One effect of calling syncdb followed by flush is that the id of the
+- # default site may or may not be 1, depending on how the sequence was
+- # reset. If the sites app is loaded, then we coerce it.
+- from django.db.models import get_model
+- Site = get_model('sites', 'Site')
+- if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
+- Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
+-
+ from django.core.cache import get_cache
+ from django.core.cache.backends.db import BaseDatabaseCache
+ for cache_alias in settings.CACHES:
+Index: django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: django/contrib/gis/tests/relatedapp/tests.py
+===================================================================
+--- django/contrib/gis/tests/relatedapp/tests.py (revision 16771)
++++ django/contrib/gis/tests/relatedapp/tests.py (revision 17460)
+@@ -1,3 +1,4 @@
++from datetime import date
+ from django.test import TestCase
+
+ from django.contrib.gis.geos import GEOSGeometry, Point, MultiPoint
+@@ -281,4 +282,11 @@
+ # evaluated as list generation swallows TypeError in CPython.
+ sql = str(qs.query)
+
++ def test16_annotated_date_queryset(self):
++ "Ensure annotated date querysets work if spatial backend is used. See #14648."
++ birth_years = [dt.year for dt in
++ list(Author.objects.annotate(num_books=Count('books')).dates('dob', 'year'))]
++ birth_years.sort()
++ self.assertEqual([1950, 1974], birth_years)
++
+ # TODO: Related tests for KML, GML, and distance lookups.
+Index: django/contrib/gis/tests/relatedapp/models.py
+===================================================================
+--- django/contrib/gis/tests/relatedapp/models.py (revision 16771)
++++ django/contrib/gis/tests/relatedapp/models.py (revision 17460)
+@@ -36,6 +36,7 @@
+ # These use the GeoManager but do not have any geographic fields.
+ class Author(models.Model):
+ name = models.CharField(max_length=100)
++ dob = models.DateField()
+ objects = models.GeoManager()
+
+ class Article(models.Model):
+Index: django/contrib/sites/management.py
+===================================================================
+--- django/contrib/sites/management.py (revision 16771)
++++ django/contrib/sites/management.py (revision 17460)
+@@ -3,15 +3,34 @@
+ """
+
+ from django.db.models import signals
++from django.db import connections
++from django.db import router
+ from django.contrib.sites.models import Site
+ from django.contrib.sites import models as site_app
++from django.core.management.color import no_style
+
+ def create_default_site(app, created_models, verbosity, db, **kwargs):
+- if Site in created_models:
++ # Only create the default sites in databases where Django created the table
++ if Site in created_models and router.allow_syncdb(db, Site) :
++ # The default settings set SITE_ID = 1, and some tests in Django's test
++ # suite rely on this value. However, if database sequences are reused
++ # (e.g. in the test suite after flush/syncdb), it isn't guaranteed that
++ # the next id will be 1, so we coerce it. See #15573 and #16353. This
++ # can also crop up outside of tests - see #15346.
+ if verbosity >= 2:
+ print "Creating example.com Site object"
+- s = Site(domain="example.com", name="example.com")
+- s.save(using=db)
++ Site(pk=1, domain="example.com", name="example.com").save(using=db)
++
++ # We set an explicit pk instead of relying on auto-incrementation,
++ # so we need to reset the database sequence.
++ sequence_sql = connections[db].ops.sequence_reset_sql(no_style(), [Site])
++ if sequence_sql:
++ if verbosity >= 2:
++ print "Resetting sequence"
++ cursor = connections[db].cursor()
++ for command in sequence_sql:
++ cursor.execute(command)
++
+ Site.objects.clear_cache()
+
+ signals.post_syncdb.connect(create_default_site, sender=site_app)
+Index: django/contrib/sites/tests.py
+===================================================================
+--- django/contrib/sites/tests.py (revision 16771)
++++ django/contrib/sites/tests.py (revision 17460)
+@@ -15,6 +15,12 @@
+ def tearDown(self):
+ Site._meta.installed = self.old_Site_meta_installed
+
++ def test_save_another(self):
++ # Regression for #17415
++ # On some backends the sequence needs reset after save with explicit ID.
++ # Test that there is no sequence collisions by saving another site.
++ Site(domain="example2.com", name="example2.com").save()
++
+ def test_site_manager(self):
+ # Make sure that get_current() does not return a deleted Site object.
+ s = Site.objects.get_current()
+Index: django/contrib/admin/media/css/forms.css
+===================================================================
+--- django/contrib/admin/media/css/forms.css (revision 16771)
++++ django/contrib/admin/media/css/forms.css (revision 17460)
+@@ -352,9 +352,3 @@
+ .empty-form {
+ display: none;
+ }
+-
+-/* IE7 specific bug fixes */
+-
+-.submit-row input {
+- float: right;
+-}
+\ No newline at end of file
+Index: tests/modeltests/validators/tests.py
+===================================================================
+--- tests/modeltests/validators/tests.py (revision 16771)
++++ tests/modeltests/validators/tests.py (revision 17460)
+@@ -28,6 +28,9 @@
+ (validate_email, 'abc', ValidationError),
+ (validate_email, 'a @x.cz', ValidationError),
+ (validate_email, 'something@@somewhere.com', ValidationError),
++ # Quoted-string format (CR not allowed)
++ (validate_email, '"\\\011"@here.com', None),
++ (validate_email, '"\\\012"@here.com', ValidationError),
+
+ (validate_slug, 'slug-ok', None),
+ (validate_slug, 'longer-slug-still-ok', None),
+Index: tests/regressiontests/utils/http.py
+===================================================================
+--- tests/regressiontests/utils/http.py (revision 16771)
++++ tests/regressiontests/utils/http.py (revision 17460)
+@@ -1,5 +1,7 @@
+ from django.utils import http
+ from django.utils import unittest
++from django.http import HttpResponse, utils
++from django.test import RequestFactory
+
+ class TestUtilsHttp(unittest.TestCase):
+
+@@ -21,3 +23,49 @@
+ self.assertFalse(http.same_origin('http://foo.com', 'http://foo.com.evil.com'))
+ # Different port
+ self.assertFalse(http.same_origin('http://foo.com:8000', 'http://foo.com:8001'))
++
++ def test_fix_IE_for_vary(self):
++ """
++ Regression for #16632.
++
++ `fix_IE_for_vary` shouldn't crash when there's no Content-Type header.
++ """
++
++ # functions to generate responses
++ def response_with_unsafe_content_type():
++ r = HttpResponse(content_type="text/unsafe")
++ r['Vary'] = 'Cookie'
++ return r
++
++ def no_content_response_with_unsafe_content_type():
++ # 'Content-Type' always defaulted, so delete it
++ r = response_with_unsafe_content_type()
++ del r['Content-Type']
++ return r
++
++ # request with & without IE user agent
++ rf = RequestFactory()
++ request = rf.get('/')
++ ie_request = rf.get('/', HTTP_USER_AGENT='MSIE')
++
++ # not IE, unsafe_content_type
++ response = response_with_unsafe_content_type()
++ utils.fix_IE_for_vary(request, response)
++ self.assertTrue('Vary' in response)
++
++ # IE, unsafe_content_type
++ response = response_with_unsafe_content_type()
++ utils.fix_IE_for_vary(ie_request, response)
++ self.assertFalse('Vary' in response)
++
++ # not IE, no_content
++ response = no_content_response_with_unsafe_content_type()
++ utils.fix_IE_for_vary(request, response)
++ self.assertTrue('Vary' in response)
++
++ # IE, no_content
++ response = no_content_response_with_unsafe_content_type()
++ utils.fix_IE_for_vary(ie_request, response)
++ self.assertFalse('Vary' in response)
++
++
+Index: tests/regressiontests/httpwrappers/tests.py
+===================================================================
+--- tests/regressiontests/httpwrappers/tests.py (revision 16771)
++++ tests/regressiontests/httpwrappers/tests.py (revision 17460)
+@@ -281,3 +281,9 @@
+ Test that a single non-standard cookie name doesn't affect all cookies. Ticket #13007.
+ """
+ self.assertTrue('good_cookie' in parse_cookie('good_cookie=yes;bad:cookie=yes').keys())
++
++ def test_repeated_nonstandard_keys(self):
++ """
++ Test that a repeated non-standard name doesn't affect all cookies. Ticket #15852
++ """
++ self.assertTrue('good_cookie' in parse_cookie('a,=b; a,=c; good_cookie=yes').keys())
+Index: docs/index.txt
+===================================================================
+--- docs/index.txt (revision 16771)
++++ docs/index.txt (revision 17460)
+@@ -28,7 +28,7 @@
+ .. _archives of the django-users mailing list: http://groups.google.com/group/django-users/
+ .. _post a question: http://groups.google.com/group/django-users/
+ .. _#django IRC channel: irc://irc.freenode.net/django
+-.. _IRC logs: http://botland.oebfare.com/logger/django/
++.. _IRC logs: http://django-irc-logs.com/
+ .. _ticket tracker: http://code.djangoproject.com/
+
+ First steps
+Index: docs/intro/tutorial01.txt
+===================================================================
+--- docs/intro/tutorial01.txt (revision 16771)
++++ docs/intro/tutorial01.txt (revision 17460)
+@@ -59,7 +59,7 @@
+ can be run as a program. To do this, open Terminal.app and navigate (using
+ the ``cd`` command) to the directory where :doc:`django-admin.py
+ </ref/django-admin>` is installed, then run the command
+- ``chmod +x django-admin.py``.
++ ``sudo chmod +x django-admin.py``.
+
+ .. note::
+
+@@ -692,10 +692,9 @@
+
+ For more information on model relations, see :doc:`Accessing related objects
+ </ref/models/relations>`. For more on how to use double underscores to perform
+-field lookups via the API, see `Field lookups`__. For full details on the
+-database API, see our :doc:`Database API reference </topics/db/queries>`.
++field lookups via the API, see :ref:`Field lookups <field-lookups-intro>`. For
++full details on the database API, see our :doc:`Database API reference
++</topics/db/queries>`.
+
+-__ http://docs.djangoproject.com/en/1.2/topics/db/queries/#field-lookups
+-
+ When you're comfortable with the API, read :doc:`part 2 of this tutorial
+ </intro/tutorial02>` to get Django's automatic admin working.
+Index: docs/intro/tutorial02.txt
+===================================================================
+--- docs/intro/tutorial02.txt (revision 16771)
++++ docs/intro/tutorial02.txt (revision 17460)
+@@ -40,22 +40,22 @@
+
+ .. parsed-literal::
+
+- from django.conf.urls.defaults import *
++ from django.conf.urls.defaults import patterns, include, url
+
+ # Uncomment the next two lines to enable the admin:
+ **from django.contrib import admin**
+ **admin.autodiscover()**
+
+ urlpatterns = patterns('',
+- # Example:
+- # (r'^mysite/', include('mysite.foo.urls')),
++ # Examples:
++ # url(r'^$', 'mysite.views.home', name='home'),
++ # url(r'^mysite/', include('mysite.foo.urls')),
+
+- # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
+- # to INSTALLED_APPS to enable admin documentation:
+- # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
++ # Uncomment the admin/doc line below to enable admin documentation:
++ # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+ # Uncomment the next line to enable the admin:
+- **(r'^admin/', include(admin.site.urls)),**
++ **url(r'^admin/', include(admin.site.urls)),**
+ )
+
+ (The bold lines are the ones that needed to be uncommented.)
+Index: docs/intro/tutorial03.txt
+===================================================================
+--- docs/intro/tutorial03.txt (revision 16771)
++++ docs/intro/tutorial03.txt (revision 17460)
+@@ -78,17 +78,17 @@
+
+ Time for an example. Edit ``mysite/urls.py`` so it looks like this::
+
+- from django.conf.urls.defaults import *
++ from django.conf.urls.defaults import patterns, include, url
+
+ from django.contrib import admin
+ admin.autodiscover()
+
+ urlpatterns = patterns('',
+- (r'^polls/$', 'polls.views.index'),
+- (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
+- (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
+- (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
+- (r'^admin/', include(admin.site.urls)),
++ url(r'^polls/$', 'polls.views.index'),
++ url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
++ url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
++ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
++ url(r'^admin/', include(admin.site.urls)),
+ )
+
+ This is worth a review. When somebody requests a page from your Web site -- say,
+@@ -112,7 +112,7 @@
+ -- unless you have a sick sense of humor, in which case you can do something
+ like this::
+
+- (r'^polls/latest\.php$', 'polls.views.index'),
++ url(r'^polls/latest\.php$', 'polls.views.index'),
+
+ But, don't do that. It's silly.
+
+@@ -357,23 +357,24 @@
+ Write a 404 (page not found) view
+ =================================
+
+-When you raise :exc:`~django.http.Http404` from within a view, Django will load
+-a special view devoted to handling 404 errors. It finds it by looking for the
+-variable ``handler404``, which is a string in Python dotted syntax -- the same
+-format the normal URLconf callbacks use. A 404 view itself has nothing special:
+-It's just a normal view.
++When you raise :exc:`~django.http.Http404` from within a view, Django
++will load a special view devoted to handling 404 errors. It finds it
++by looking for the variable ``handler404`` in your root URLconf (and
++only in your root URLconf; setting ``handler404`` anywhere else will
++have no effect), which is a string in Python dotted syntax -- the same
++format the normal URLconf callbacks use. A 404 view itself has nothing
++special: It's just a normal view.
+
+-You normally won't have to bother with writing 404 views. By default, URLconfs
+-have the following line up top::
++You normally won't have to bother with writing 404 views. If you don't set
++``handler404``, the built-in view :func:`django.views.defaults.page_not_found`
++is used by default. In this case, you still have one obligation: To create a
++``404.html`` template in the root of your template directory. The default 404
++view will use that template for all 404 errors. If :setting:`DEBUG` is set to
++``False`` (in your settings module) and if you didn't create a ``404.html``
++file, an ``Http500`` is raised instead. So remember to create a ``404.html``.
+
+- from django.conf.urls.defaults import *
++A couple more things to note about 404 views:
+
+-That takes care of setting ``handler404`` in the current module. As you can see
+-in ``django/conf/urls/defaults.py``, ``handler404`` is set to
+-:func:`django.views.defaults.page_not_found` by default.
+-
+-Four more things to note about 404 views:
+-
+ * If :setting:`DEBUG` is set to ``True`` (in your settings module) then your
+ 404 view will never be used (and thus the ``404.html`` template will never
+ be rendered) because the traceback will be displayed instead.
+@@ -381,21 +382,12 @@
+ * The 404 view is also called if Django doesn't find a match after checking
+ every regular expression in the URLconf.
+
+- * If you don't define your own 404 view -- and simply use the default, which
+- is recommended -- you still have one obligation: To create a ``404.html``
+- template in the root of your template directory. The default 404 view will
+- use that template for all 404 errors.
+-
+- * If :setting:`DEBUG` is set to ``False`` (in your settings module) and if
+- you didn't create a ``404.html`` file, an ``Http500`` is raised instead.
+- So remember to create a ``404.html``.
+-
+ Write a 500 (server error) view
+ ===============================
+
+-Similarly, URLconfs may define a ``handler500``, which points to a view to call
+-in case of server errors. Server errors happen when you have runtime errors in
+-view code.
++Similarly, your root URLconf may define a ``handler500``, which points
++to a view to call in case of server errors. Server errors happen when
++you have runtime errors in view code.
+
+ Use the template system
+ =======================
+@@ -432,10 +424,10 @@
+ the URLconf, you may notice there's a fair bit of redundancy in it::
+
+ urlpatterns = patterns('',
+- (r'^polls/$', 'polls.views.index'),
+- (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
+- (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
+- (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
++ url(r'^polls/$', 'polls.views.index'),
++ url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
++ url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
++ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
+ )
+
+ Namely, ``polls.views`` is in every callback.
+@@ -445,10 +437,10 @@
+ first argument to :func:`~django.conf.urls.defaults.patterns`, like so::
+
+ urlpatterns = patterns('polls.views',
+- (r'^polls/$', 'index'),
+- (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
+- (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
+- (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
++ url(r'^polls/$', 'index'),
++ url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
++ url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
++ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
+ )
+
+ This is functionally identical to the previous formatting. It's just a bit
+@@ -459,20 +451,20 @@
+ :func:`~django.conf.urls.defaults.patterns`. Your full ``mysite/urls.py`` might
+ now look like this::
+
+- from django.conf.urls.defaults import *
++ from django.conf.urls.defaults import patterns, include, url
+
+ from django.contrib import admin
+ admin.autodiscover()
+
+ urlpatterns = patterns('polls.views',
+- (r'^polls/$', 'index'),
+- (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
+- (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
+- (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
++ url(r'^polls/$', 'index'),
++ url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
++ url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
++ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
+ )
+
+ urlpatterns += patterns('',
+- (r'^admin/', include(admin.site.urls)),
++ url(r'^admin/', include(admin.site.urls)),
+ )
+
+ Decoupling the URLconfs
+@@ -502,8 +494,8 @@
+ admin.autodiscover()
+
+ urlpatterns = patterns('',
+- (r'^polls/', include('polls.urls')),
+- (r'^admin/', include(admin.site.urls)),
++ url(r'^polls/', include('polls.urls')),
++ url(r'^admin/', include(admin.site.urls)),
+ )
+
+ :func:`~django.conf.urls.defaults.include` simply references another URLconf.
+@@ -526,13 +518,13 @@
+ lines registering the admin site. Your ``polls/urls.py`` file should now look like
+ this::
+
+- from django.conf.urls.defaults import *
++ from django.conf.urls.defaults import patterns, include, url
+
+ urlpatterns = patterns('polls.views',
+- (r'^$', 'index'),
+- (r'^(?P<poll_id>\d+)/$', 'detail'),
+- (r'^(?P<poll_id>\d+)/results/$', 'results'),
+- (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
++ url(r'^$', 'index'),
++ url(r'^(?P<poll_id>\d+)/$', 'detail'),
++ url(r'^(?P<poll_id>\d+)/results/$', 'results'),
++ url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
+ )
+
+ The idea behind :func:`~django.conf.urls.defaults.include` and URLconf
+Index: docs/intro/index.txt
+===================================================================
+--- docs/intro/index.txt (revision 16771)
++++ docs/intro/index.txt (revision 17460)
+@@ -31,6 +31,6 @@
+
+ .. _python: http://python.org/
+ .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers
+- .. _dive into python: http://diveintopython.org/
++ .. _dive into python: http://diveintopython.net/
+ .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20
+ .. _books about Python: http://wiki.python.org/moin/PythonBooks
+\ No newline at end of file
+Index: docs/intro/tutorial04.txt
+===================================================================
+--- docs/intro/tutorial04.txt (revision 16771)
++++ docs/intro/tutorial04.txt (revision 17460)
+@@ -218,13 +218,13 @@
+ First, open the ``polls/urls.py`` URLconf. It looks like this, according to the
+ tutorial so far::
+
+- from django.conf.urls.defaults import *
++ from django.conf.urls.defaults import patterns, include, url
+
+ urlpatterns = patterns('polls.views',
+- (r'^$', 'index'),
+- (r'^(?P<poll_id>\d+)/$', 'detail'),
+- (r'^(?P<poll_id>\d+)/results/$', 'results'),
+- (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
++ url(r'^$', 'index'),
++ url(r'^(?P<poll_id>\d+)/$', 'detail'),
++ url(r'^(?P<poll_id>\d+)/results/$', 'results'),
++ url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
+ )
+
+ Change it like so::
+@@ -234,12 +234,12 @@
+ from polls.models import Poll
+
+ urlpatterns = patterns('',
+- (r'^$',
++ url(r'^$',
+ ListView.as_view(
+ queryset=Poll.objects.order_by('-pub_date')[:5],
+ context_object_name='latest_poll_list',
+ template_name='polls/index.html')),
+- (r'^(?P<pk>\d+)/$',
++ url(r'^(?P<pk>\d+)/$',
+ DetailView.as_view(
+ model=Poll,
+ template_name='polls/detail.html')),
+@@ -248,7 +248,7 @@
+ model=Poll,
+ template_name='polls/results.html'),
+ name='poll_results'),
+- (r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
++ url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
+ )
+
+ We're using two generic views here:
+Index: docs/internals/release-process.txt
+===================================================================
+--- docs/internals/release-process.txt (revision 16771)
++++ docs/internals/release-process.txt (revision 17460)
+@@ -99,6 +99,13 @@
+ * Security fixes will be applied to the current trunk and the previous two
+ minor releases.
+
++* Documentation fixes will generally be more freely backported to the last
++ release branch (at the discretion of the committer), and don't need to meet
++ the "critical fixes only" bar as it's highly advantageous to have the docs
++ for the last release be up-to-date and correct, and the downside of
++ backporting (risk of introducing regressions) is much less of a concern
++ with doc fixes.
++
+ As a concrete example, consider a moment in time halfway between the release of
+ Django 1.3 and 1.4. At this point in time:
+
+@@ -111,6 +118,9 @@
+ ``1.2.X`` branch. Security fixes will trigger the release of ``1.3.1``,
+ ``1.2.1``, etc.
+
++* Documentation fixes will be applied to trunk, and if easily backported, to
++ the ``1.3.X`` branch.
++
+ .. _release-process:
+
+ Release process
+Index: docs/internals/deprecation.txt
+===================================================================
+--- docs/internals/deprecation.txt (revision 16771)
++++ docs/internals/deprecation.txt (revision 17460)
+@@ -177,6 +177,12 @@
+ required to end with a trailing slash to ensure there is a consistent
+ way to combine paths in templates.
+
++ * Translations located under the so-called *project path* will be
++ ignored during the translation building process performed at runtime.
++ The :setting:`LOCALE_PATHS` setting can be used for the same task by
++ including the filesystem path to a ``locale`` directory containing
++ non-app-specific translations in its value.
++
+ * 2.0
+ * ``django.views.defaults.shortcut()``. This function has been moved
+ to ``django.contrib.contenttypes.views.shortcut()`` as part of the
+Index: docs/howto/deployment/modpython.txt
+===================================================================
+--- docs/howto/deployment/modpython.txt (revision 16771)
++++ docs/howto/deployment/modpython.txt (revision 17460)
+@@ -293,11 +293,14 @@
+ arrangement. You're responsible for setting up Apache, or whichever media
+ server you're using, to serve the admin files.
+
+-The admin files live in (:file:`django/contrib/admin/static/admin`) of the
++The admin files live in (:file:`django/contrib/admin/media/admin`) of the
+ Django distribution.
+
+-We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
+-the admin files, but here are two other approaches:
++We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
++admin files (this means using the :djadmin:`collectstatic` management command
++to collect the static files in :setting:`STATIC_ROOT`, and then configuring
++your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
++here are two other approaches:
+
+ 1. Create a symbolic link to the admin static files from within your
+ document root.
+Index: docs/howto/deployment/modwsgi.txt
+===================================================================
+--- docs/howto/deployment/modwsgi.txt (revision 16771)
++++ docs/howto/deployment/modwsgi.txt (revision 17460)
+@@ -127,11 +127,14 @@
+ arrangement. You're responsible for setting up Apache, or whichever media
+ server you're using, to serve the admin files.
+
+-The admin files live in (:file:`django/contrib/admin/static/admin`) of the
++The admin files live in (:file:`django/contrib/admin/media/admin`) of the
+ Django distribution.
+
+-We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
+-the admin files, but here are two other approaches:
++We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
++admin files (this means using the :djadmin:`collectstatic` management command
++to collect the static files in :setting:`STATIC_ROOT`, and then configuring
++your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
++here are two other approaches:
+
+ 1. Create a symbolic link to the admin static files from within your
+ document root.
+Index: docs/topics/auth.txt
+===================================================================
+--- docs/topics/auth.txt (revision 16771)
++++ docs/topics/auth.txt (revision 17460)
+@@ -1251,17 +1251,20 @@
+ ...
+ class Meta:
+ permissions = (
+- ("can_view", "Can see available tasks"),
+- ("can_change_status", "Can change the status of tasks"),
+- ("can_close", "Can remove a task by setting its status as closed"),
++ ("view_task", "Can see available tasks"),
++ ("change_task_status", "Can change the status of tasks"),
++ ("close_task", "Can remove a task by setting its status as closed"),
+ )
+
+ The only thing this does is create those extra permissions when you run
+ :djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the
+ value of these permissions when an user is trying to access the functionality
+ provided by the application (viewing tasks, changing the status of tasks,
+-closing tasks.)
++closing tasks.) Continuing the above example, the following checks if a user may
++view tasks::
+
++ user.has_perm('app.view_task')
++
+ API reference
+ -------------
+
+Index: docs/topics/http/urls.txt
+===================================================================
+--- docs/topics/http/urls.txt (revision 16771)
++++ docs/topics/http/urls.txt (revision 17460)
+@@ -54,6 +54,10 @@
+ :class:`~django.http.HttpRequest` as its first argument and any values
+ captured in the regex as remaining arguments.
+
++ 5. If no regex matches, or if an exception is raised during any
++ point in this process, Django invokes an appropriate
++ error-handling view. See `Error handling`_ below.
++
+ Example
+ =======
+
+@@ -99,10 +103,10 @@
+ * ``/articles/2003`` would not match any of these patterns, because each
+ pattern requires that the URL end with a slash.
+
+- * ``/articles/2003/03/3/`` would match the final pattern. Django would call
+- the function ``news.views.article_detail(request, '2003', '03', '3')``.
++ * ``/articles/2003/03/03/`` would match the final pattern. Django would call
++ the function ``news.views.article_detail(request, '2003', '03', '03')``.
+
+-.. _Dive Into Python's explanation: http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3
++.. _Dive Into Python's explanation: http://diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3
+
+ Named groups
+ ============
+@@ -123,7 +127,7 @@
+ (r'^articles/2003/$', 'news.views.special_case_2003'),
+ (r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
+ (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'),
+- (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d+)/$', 'news.views.article_detail'),
++ (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'),
+ )
+
+ This accomplishes exactly the same thing as the previous example, with one
+@@ -134,8 +138,8 @@
+ ``news.views.month_archive(request, year='2005', month='03')``, instead
+ of ``news.views.month_archive(request, '2005', '03')``.
+
+- * A request to ``/articles/2003/03/3/`` would call the function
+- ``news.views.article_detail(request, year='2003', month='03', day='3')``.
++ * A request to ``/articles/2003/03/03/`` would call the function
++ ``news.views.article_detail(request, year='2003', month='03', day='03')``.
+
+ In practice, this means your URLconfs are slightly more explicit and less prone
+ to argument-order bugs -- and you can reorder the arguments in your views'
+@@ -246,6 +250,31 @@
+ ``patterns()`` and is only relevant when you're passing a string as the
+ ``view`` parameter.
+
++include
++-------
++
++.. function:: include(<module or pattern_list>)
++
++A function that takes a full Python import path to another URLconf module that
++should be "included" in this place.
++
++:func:`include` also accepts as an argument an iterable that returns URL
++patterns.
++
++See `Including other URLconfs`_ below.
++
++Error handling
++==============
++
++When Django can't find a regex matching the requested URL, or when an
++exception is raised, Django will invoke an error-handling view. The
++views to use for these cases are specified by two variables which can
++be set in your root URLconf. Setting these variables in any other
++URLconf will have no effect.
++
++See the documentation on :ref:`customizing error views
++<customizing-error-views>` for more details.
++
+ handler404
+ ----------
+
+@@ -275,19 +304,6 @@
+ .. versionchanged:: 1.2
+ Previous versions of Django only accepted strings representing import paths.
+
+-include
+--------
+-
+-.. function:: include(<module or pattern_list>)
+-
+-A function that takes a full Python import path to another URLconf module that
+-should be "included" in this place.
+-
+-:func:`include` also accepts as an argument an iterable that returns URL
+-patterns.
+-
+-See `Including other URLconfs`_ below.
+-
+ Notes on capturing text in URLs
+ ===============================
+
+@@ -420,8 +436,8 @@
+ from django.conf.urls.defaults import *
+
+ extra_patterns = patterns('',
+- url(r'reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
+- url(r'charge/$', 'credit.views.charge', name='credit-charge'),
++ url(r'^reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
++ url(r'^charge/$', 'credit.views.charge', name='credit-charge'),
+ )
+
+ urlpatterns = patterns('',
+Index: docs/topics/http/views.txt
+===================================================================
+--- docs/topics/http/views.txt (revision 16771)
++++ docs/topics/http/views.txt (revision 17460)
+@@ -122,6 +122,8 @@
+ template that is displayed when a 404 error is raised. This template should be
+ called ``404.html`` and located in the top level of your template tree.
+
++.. _customizing-error-views:
++
+ Customizing error views
+ =======================
+
+Index: docs/topics/i18n/internationalization.txt
+===================================================================
+--- docs/topics/i18n/internationalization.txt (revision 16771)
++++ docs/topics/i18n/internationalization.txt (revision 17460)
+@@ -477,7 +477,7 @@
+
+ You can use multiple expressions inside a single ``blocktrans`` tag::
+
+- {% blocktrans with book_t=book|title and author_t=author|title %}
++ {% blocktrans with book_t=book|title author_t=author|title %}
+ This is {{ book_t }} by {{ author_t }}
+ {% endblocktrans %}
+
+Index: docs/topics/cache.txt
+===================================================================
+--- docs/topics/cache.txt (revision 16771)
++++ docs/topics/cache.txt (revision 17460)
+@@ -99,8 +99,9 @@
+ on your chosen memcached binding)
+
+ * Set :setting:`LOCATION <CACHES-LOCATION>` to ``ip:port`` values,
+- where ``ip`` is the IP address of the Memcached daemon and
+- ``port`` is the port on which Memcached is running.
++ where ``ip`` is the IP address of the Memcached daemon and ``port`` is the
++ port on which Memcached is running, or to a ``unix:path`` value, where
++ ``path`` is the path to a Memcached Unix socket file.
+
+ In this example, Memcached is running on localhost (127.0.0.1) port 11211, using
+ the ``python-memcached`` binding::
+@@ -112,6 +113,16 @@
+ }
+ }
+
++In this example, Memcached is available through a local Unix socket file
++:file:`/tmp/memcached.sock` using the ``python-memcached`` binding::
++
++ CACHES = {
++ 'default': {
++ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
++ 'LOCATION': 'unix:/tmp/memcached.sock',
++ }
++ }
++
+ One excellent feature of Memcached is its ability to share cache over multiple
+ servers. This means you can run Memcached daemons on multiple machines, and the
+ program will treat the group of machines as a *single* cache, without the need
+@@ -526,9 +537,10 @@
+ requested, subsequent requests to that URL will use the cache.
+
+ ``cache_page`` can also take an optional keyword argument, ``cache``,
+-which directs the decorator to use a specific cache alias when caching view
+-results. By default, the ``default`` alias will be used, but you can specify
+-any cache alias you want::
++which directs the decorator to use a specific cache (from your
++:setting:`CACHES` setting) when caching view results. By default, the
++``default`` cache will be used, but you can specify any cache you
++want::
+
+ @cache_page(60 * 15, cache="special_cache")
+ def my_view(request):
+Index: docs/topics/db/models.txt
+===================================================================
+--- docs/topics/db/models.txt (revision 16771)
++++ docs/topics/db/models.txt (revision 17460)
+@@ -324,11 +324,10 @@
+ should work; all are optional.
+
+ For details on accessing backwards-related objects, see the
+- `Following relationships backward example`_.
+-
++ :ref:`Following relationships backward example <backwards-related-objects>`.
++
+ For sample code, see the `Many-to-one relationship model tests`_.
+
+- .. _Following relationships backward example: http://docs.djangoproject.com/en/dev/topics/db/queries/#backwards-related-objects
+ .. _Many-to-one relationship model tests: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/many_to_one
+
+ Many-to-many relationships
+Index: docs/topics/db/sql.txt
+===================================================================
+--- docs/topics/db/sql.txt (revision 16771)
++++ docs/topics/db/sql.txt (revision 17460)
+@@ -236,6 +236,30 @@
+ # Your code here...
+ transaction.commit_unless_managed(using='my_db_alias')
+
++By default, the Python DB API will return results without their field
++names, which means you end up with a ``list`` of values, rather than a
++``dict``. At a small performance cost, you can return results as a
++``dict`` by using something like this::
++
++ def dictfetchall(cursor):
++ "Returns all rows from a cursor as a dict"
++ desc = cursor.description
++ return [
++ dict(zip([col[0] for col in desc], row))
++ for row in cursor.fetchall()
++ ]
++
++Here is an example of the difference between the two::
++
++ >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
++ >>> cursor.fetchall()
++ ((54360982L, None), (54360880L, None))
++
++ >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
++ >>> dictfetchall(cursor)
++ [{'parent_id': None, 'id': 54360982L}, {'parent_id': None, 'id': 54360880L}]
++
++
+ .. _transactions-and-raw-sql:
+
+ Transactions and raw SQL
+Index: docs/topics/forms/modelforms.txt
+===================================================================
+--- docs/topics/forms/modelforms.txt (revision 16771)
++++ docs/topics/forms/modelforms.txt (revision 17460)
+@@ -332,14 +332,18 @@
+ .. note::
+
+ If you specify ``fields`` or ``exclude`` when creating a form with
+- ``ModelForm``, then the fields that are not in the resulting form will not
+- be set by the form's ``save()`` method. Django will prevent any attempt to
+- save an incomplete model, so if the model does not allow the missing fields
+- to be empty, and does not provide a default value for the missing fields,
+- any attempt to ``save()`` a ``ModelForm`` with missing fields will fail.
+- To avoid this failure, you must instantiate your model with initial values
+- for the missing, but required fields::
++ ``ModelForm``, then the fields that are not in the resulting form
++ will not be set by the form's ``save()`` method. Also, if you
++ manually add the excluded fields back to the form, they will not
++ be initialized from the model instance.
+
++ Django will prevent any attempt to save an incomplete model, so if
++ the model does not allow the missing fields to be empty, and does
++ not provide a default value for the missing fields, any attempt to
++ ``save()`` a ``ModelForm`` with missing fields will fail. To
++ avoid this failure, you must instantiate your model with initial
++ values for the missing, but required fields::
++
+ author = Author(title='Mr')
+ form = PartialAuthorForm(request.POST, instance=author)
+ form.save()
+@@ -633,6 +637,12 @@
+ instance won't be saved to the database and won't be included in the return
+ value (``instances``, in the above example).
+
++When fields are missing from the form (for example because they have
++been excluded), these fields will not be set by the ``save()``
++method. You can find more information about this restriction, which
++also holds for regular ``ModelForms``, in `Using a subset of fields on
++the form`_.
++
+ Pass ``commit=False`` to return the unsaved model instances::
+
+ # don't save to the database
+Index: docs/topics/class-based-views.txt
+===================================================================
+--- docs/topics/class-based-views.txt (revision 16771)
++++ docs/topics/class-based-views.txt (revision 17460)
+@@ -380,7 +380,7 @@
+ class PublisherBookListView(ListView):
+
+ context_object_name = "book_list"
+- template_name = "books/books_by_publisher.html",
++ template_name = "books/books_by_publisher.html"
+
+ def get_queryset(self):
+ publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
+@@ -396,7 +396,7 @@
+ class PublisherBookListView(ListView):
+
+ context_object_name = "book_list"
+- template_name = "books/books_by_publisher.html",
++ template_name = "books/books_by_publisher.html"
+
+ def get_queryset(self):
+ self.publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
+Index: docs/topics/testing.txt
+===================================================================
+--- docs/topics/testing.txt (revision 16771)
++++ docs/topics/testing.txt (revision 17460)
+@@ -1586,7 +1586,7 @@
+ Skip the decorated test if the named database feature is *not*
+ supported.
+
+-For example, the following test will not be executed if the database
++For example, the following test will only be executed if the database
+ supports transactions (e.g., it would run under PostgreSQL, but *not*
+ under MySQL with MyISAM tables)::
+
+Index: docs/topics/templates.txt
+===================================================================
+--- docs/topics/templates.txt (revision 16771)
++++ docs/topics/templates.txt (revision 17460)
+@@ -555,6 +555,8 @@
+ the ``escape`` filter *double-escaping* data -- the ``escape`` filter does not
+ affect auto-escaped variables.
+
++.. _string-literals-and-automatic-escaping:
++
+ String literals and automatic escaping
+ --------------------------------------
+
+Index: docs/topics/settings.txt
+===================================================================
+--- docs/topics/settings.txt (revision 16771)
++++ docs/topics/settings.txt (revision 17460)
+@@ -39,7 +39,7 @@
+ ``mysite.settings``. Note that the settings module should be on the
+ Python `import search path`_.
+
+-.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
++.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
+
+ The django-admin.py utility
+ ---------------------------
+Index: docs/releases/1.2.6.txt
+===================================================================
+--- docs/releases/1.2.6.txt (revision 0)
++++ docs/releases/1.2.6.txt (revision 17460)
+@@ -0,0 +1,16 @@
++==========================
++Django 1.2.6 release notes
++==========================
++
++*September 9, 2011*
++
++Welcome to Django 1.2.6!
++
++This is the sixth bugfix/security release in the Django 1.2 series, fixing
++several security issues present in Django 1.2.5. Django 1.2.6 is a
++recommended upgrade for all users of any Django release in the 1.2.X series.
++
++For a full list of issues addressed in this release, see the `security
++advisory`_.
++
++.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
+Index: docs/releases/1.2.7.txt
+===================================================================
+--- docs/releases/1.2.7.txt (revision 0)
++++ docs/releases/1.2.7.txt (revision 17460)
+@@ -0,0 +1,16 @@
++==========================
++Django 1.2.7 release notes
++==========================
++
++*September 10, 2011*
++
++Welcome to Django 1.2.7!
++
++This is the seventh bugfix/security release in the Django 1.2 series. It
++replaces Django 1.2.6 due to problems with the 1.2.6 release tarball.
++Django 1.2.7 is a recommended upgrade for all users of any Django release in
++the 1.2.X series.
++
++For more information, see the `release advisory`_.
++
++.. _release advisory: https://www.djangoproject.com/weblog/2011/sep/10/127/
+Index: docs/releases/index.txt
+===================================================================
+--- docs/releases/index.txt (revision 16771)
++++ docs/releases/index.txt (revision 17460)
+@@ -19,6 +19,7 @@
+ .. toctree::
+ :maxdepth: 1
+
++ 1.3.1
+ 1.3
+
+ 1.2 release
+@@ -26,6 +27,8 @@
+ .. toctree::
+ :maxdepth: 1
+
++ 1.2.7
++ 1.2.6
+ 1.2.5
+ 1.2.4
+ 1.2.2
+Index: docs/releases/0.95.txt
+===================================================================
+--- docs/releases/0.95.txt (revision 16771)
++++ docs/releases/0.95.txt (revision 17460)
+@@ -92,15 +92,15 @@
+ easy checklist_ for reference when undertaking the porting operation.
+
+ .. _Removing The Magic: http://code.djangoproject.com/wiki/RemovingTheMagic
+-.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet1
++.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet
+
+ Problem reports and getting help
+ ================================
+
+-Need help resolving a problem with Django? The documentation in the distribution
+-is also available online_ at the `Django Web site`_. The :doc:`FAQ </faq/index>`
+-document is especially recommended, as it contains a number of issues that come
+-up time and again.
++Need help resolving a problem with Django? The documentation in the
++distribution is also available :doc:`online </index>` at the `Django Web
++site`_. The :doc:`FAQ </faq/index>` document is especially recommended, as it
++contains a number of issues that come up time and again.
+
+ For more personalized help, the `django-users`_ mailing list is a very active
+ list, with more than 2,000 subscribers who can help you solve any sort of
+@@ -113,7 +113,6 @@
+ Django users and developers from around the world. Friendly people are usually
+ available at any hour of the day -- to help, or just to chat.
+
+-.. _online: http://www.djangoproject.com/documentation/0.95/
+ .. _Django Web site: http://www.djangoproject.com/
+ .. _django-users: http://groups.google.com/group/django-users
+
+Index: docs/releases/0.96.txt
+===================================================================
+--- docs/releases/0.96.txt (revision 16771)
++++ docs/releases/0.96.txt (revision 17460)
+@@ -50,12 +50,10 @@
+ maintained, and it will be removed in a future release of Django.
+
+ Also, note that some features, like the new :setting:`DATABASE_OPTIONS`
+-setting (see the `databases documentation`_ for details), are only
+-available on the "mysql" backend, and will not be made available for
++setting (see the :doc:`databases documentation </ref/databases>` for details),
++are only available on the "mysql" backend, and will not be made available for
+ "mysql_old".
+
+-.. _databases documentation: http://www.djangoproject.com/documentation/0.96/databases/
+-
+ Database constraint names changed
+ ---------------------------------
+
+@@ -164,11 +162,9 @@
+ for most common cases. We recommend that anyone new to form handling skip the
+ old forms system and start with the new.
+
+-For more information about ``django.newforms``, read the `newforms
+-documentation`_.
++For more information about ``django.newforms``, read the :doc:`newforms
++documentation </topics/forms/index>`.
+
+-.. _newforms documentation: http://www.djangoproject.com/documentation/0.96/newforms/
+-
+ URLconf improvements
+ --------------------
+
+@@ -216,20 +212,16 @@
+ ------------------
+
+ Django now includes a test framework so you can start transmuting fear into
+-boredom (with apologies to Kent Beck). You can write tests based on doctest_
+-or unittest_ and test your views with a simple test client.
++boredom (with apologies to Kent Beck). You can write tests based on
++:mod:`doctest` or :mod:`unittest` and test your views with a simple test client.
+
+ There is also new support for "fixtures" -- initial data, stored in any of the
+-supported `serialization formats`_, that will be loaded into your database at the
+-start of your tests. This makes testing with real data much easier.
++supported :doc:`serialization formats </topics/serialization>`, that will be
++loaded into your database at the start of your tests. This makes testing with
++real data much easier.
+
+-See `the testing documentation`_ for the full details.
++See :doc:`the testing documentation </topics/testing>` for the full details.
+
+-.. _doctest: http://docs.python.org/library/doctest.html
+-.. _unittest: http://docs.python.org/library/unittest.html
+-.. _the testing documentation: http://www.djangoproject.com/documentation/0.96/testing/
+-.. _serialization formats: http://www.djangoproject.com/documentation/0.96/serialization/
+-
+ Improvements to the admin interface
+ -----------------------------------
+
+Index: docs/releases/1.0.1.txt
+===================================================================
+--- docs/releases/1.0.1.txt (revision 16771)
++++ docs/releases/1.0.1.txt (revision 17460)
+@@ -6,10 +6,10 @@
+
+ This is the first "bugfix" release in the Django 1.0 series, improving
+ the stability and performance of the Django 1.0 codebase. As such,
+-Django 1.0.1 contains no new features (and, pursuant to `our
+-compatibility policy`_, maintains backwards compatibility with Django
+-1.0), but does contain a number of fixes and other
+-improvements. Django 1.0.1 is a recommended upgrade for any
++Django 1.0.1 contains no new features (and, pursuant to :doc:`our
++compatibility policy </misc/api-stability/>`, maintains backwards
++compatibility with Django 1.0), but does contain a number of fixes
++and other improvements. Django 1.0.1 is a recommended upgrade for any
+ development or deployment currently using or targeting Django 1.0.
+
+
+@@ -46,8 +46,9 @@
+
+ * A fix to the application of autoescaping for literal strings passed
+ to the ``join`` template filter. Previously, literal strings passed
+- to ``join`` were automatically escaped, contrary to `the documented
+- behavior for autoescaping and literal strings`_. Literal strings
++ to ``join`` were automatically escaped, contrary to :ref:`the
++ documented behavior for autoescaping and literal strings
++ <string-literals-and-automatic-escaping>`. Literal strings
+ passed to ``join`` are no longer automatically escaped, meaning you
+ must now manually escape them; this is an incompatibility if you
+ were relying on this bug, but not if you were relying on escaping
+@@ -60,6 +61,4 @@
+ documentation, including both corrections to existing documents and
+ expanded and new documentation.
+
+-.. _our compatibility policy: http://docs.djangoproject.com/en/dev/misc/api-stability/
+ .. _the Subversion log of the 1.0.X branch: http://code.djangoproject.com/log/django/branches/releases/1.0.X
+-.. _the documented behavior for autoescaping and literal strings: http://docs.djangoproject.com/en/dev/topics/templates/#string-literals-and-automatic-escaping
+Index: docs/releases/1.3.1.txt
+===================================================================
+--- docs/releases/1.3.1.txt (revision 0)
++++ docs/releases/1.3.1.txt (revision 17460)
+@@ -0,0 +1,16 @@
++==========================
++Django 1.3.1 release notes
++==========================
++
++*September 9, 2011*
++
++Welcome to Django 1.3.1!
++
++This is the first security release in the Django 1.3 series, fixing several
++security issues in Django 1.3. Django 1.3.1 is a recommended upgrade for
++all users of Django 1.3.
++
++For a full list of issues addressed in this release, see the `security
++advisory`_.
++
++.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
+Index: docs/ref/models/instances.txt
+===================================================================
+--- docs/ref/models/instances.txt (revision 16771)
++++ docs/ref/models/instances.txt (revision 17460)
+@@ -470,7 +470,7 @@
+
+ Similarly, if you had a URLconf entry that looked like::
+
+- (r'/archive/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', archive_view)
++ (r'/archive/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', archive_view)
+
+ ...you could reference this using ``permalink()`` as follows::
+
+@@ -478,8 +478,8 @@
+ def get_absolute_url(self):
+ return ('archive_view', (), {
+ 'year': self.created.year,
+- 'month': self.created.month,
+- 'day': self.created.day})
++ 'month': self.created.strftime('%m'),
++ 'day': self.created.strftime('%d')})
+
+ Notice that we specify an empty sequence for the second parameter in this case,
+ because we only want to pass keyword parameters, not positional ones.
+Index: docs/ref/models/options.txt
+===================================================================
+--- docs/ref/models/options.txt (revision 16771)
++++ docs/ref/models/options.txt (revision 17460)
+@@ -166,6 +166,13 @@
+ >>> answer.get_previous_in_order()
+ <Answer: 1>
+
++.. admonition:: Changing order_with_respect_to
++
++ ``order_with_respect_to`` adds an additional field/database column
++ named ``_order``, so be sure to handle that as you would any other
++ change to your models if you add or change ``order_with_respect_to``
++ after your initial :djadmin:`syncdb`.
++
+ ``ordering``
+ ------------
+
+@@ -238,6 +245,12 @@
+
+ unique_together = ("driver", "restaurant")
+
++ A :class:`~django.db.models.ManyToManyField` cannot be included in
++ unique_together (it's not even clear what that would mean). If you
++ need to validate uniqueness related to a
++ :class:`~django.db.models.ManyToManyField`, look at signals or
++ using an explicit :attr:`through <ManyToManyField.through>` model.
++
+ ``verbose_name``
+ ----------------
+
+Index: docs/ref/templates/builtins.txt
+===================================================================
+--- docs/ref/templates/builtins.txt (revision 16771)
++++ docs/ref/templates/builtins.txt (revision 17460)
+@@ -1868,7 +1868,7 @@
+ Returns a slice of the list.
+
+ Uses the same syntax as Python's list slicing. See
+-http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice
++http://diveintopython.net/native_data_types/lists.html#odbchelper.list.slice
+ for an introduction.
+
+ Example::
+Index: docs/ref/contrib/gis/geoip.txt
+===================================================================
+--- docs/ref/contrib/gis/geoip.txt (revision 16771)
++++ docs/ref/contrib/gis/geoip.txt (revision 17460)
+@@ -144,7 +144,7 @@
+ Returns a dictionary of city information for the given query. Some
+ of the values in the dictionary may be undefined (``None``).
+
+-.. method:: GeoIPcountry(query)
++.. method:: GeoIP.country(query)
+
+ Returns a dictionary with the country code and country for the given
+ query.
+Index: docs/ref/contrib/messages.txt
+===================================================================
+--- docs/ref/contrib/messages.txt (revision 16771)
++++ docs/ref/contrib/messages.txt (revision 17460)
+@@ -210,6 +210,10 @@
+ ``RequestContext``. Otherwise, ensure ``messages`` is available to
+ the template context.
+
++Even if you know there is only just one message, you should still iterate over
++the ``messages`` sequence, because otherwise the message storage will not be cleared
++for the next request.
++
+ Creating custom message levels
+ ------------------------------
+
+Index: docs/ref/contrib/admin/index.txt
+===================================================================
+--- docs/ref/contrib/admin/index.txt (revision 16771)
++++ docs/ref/contrib/admin/index.txt (revision 17460)
+@@ -19,8 +19,10 @@
+ 1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS`
+ setting.
+
+- 2. Admin has two dependencies - :mod:`django.contrib.auth` and
+- :mod:`django.contrib.contenttypes`. If these applications are not
++ 2. The admin has four dependencies - :mod:`django.contrib.auth`,
++ :mod:`django.contrib.contenttypes`,
++ :mod:`django.contrib.messages` and
++ :mod:`django.contrib.sessions`. If these applications are not
+ in your :setting:`INSTALLED_APPS` list, add them.
+
+ 3. Determine which of your application's models should be editable in the
+@@ -542,7 +544,7 @@
+ Fields in ``list_filter`` can also span relations using the ``__`` lookup::
+
+ class UserAdminWithLookup(UserAdmin):
+- list_filter = ('groups__name')
++ list_filter = ('groups__name',)
+
+ .. attribute:: ModelAdmin.list_per_page
+
+Index: docs/ref/django-admin.txt
+===================================================================
+--- docs/ref/django-admin.txt (revision 16771)
++++ docs/ref/django-admin.txt (revision 17460)
+@@ -1156,7 +1156,7 @@
+ Note that this option is unnecessary in ``manage.py``, because it takes care of
+ setting the Python path for you.
+
+-.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
++.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
+
+ .. django-admin-option:: --settings
+
+Index: docs/ref/signals.txt
+===================================================================
+--- docs/ref/signals.txt (revision 16771)
++++ docs/ref/signals.txt (revision 17460)
+@@ -352,12 +352,16 @@
+ .. data:: django.db.models.signals.post_syncdb
+ :module:
+
+-Sent by :djadmin:`syncdb` after it installs an application.
++Sent by :djadmin:`syncdb` command after it installs an application, and
++:djadmin:`flush` command.
+
+ Any handlers that listen to this signal need to be written in a particular
+ place: a ``management`` module in one of your :setting:`INSTALLED_APPS`. If
+ handlers are registered anywhere else they may not be loaded by
+-:djadmin:`syncdb`.
++:djadmin:`syncdb`. It is important that handlers of this signal perform
++idempotent changes (e.g. no database alterations) as this may cause the
++:djadmin:`flush` management command to fail if it also ran during the
++:djadmin:`syncdb` command.
+
+ Arguments sent with this signal:
+
+Index: README
+===================================================================
+--- README (revision 16771)
++++ README (revision 17460)
+@@ -28,7 +28,7 @@
+ To get more help:
+
+ * Join the #django channel on irc.freenode.net. Lots of helpful people
+- hang out there. Read the archives at http://botland.oebfare.com/logger/django/.
++ hang out there. Read the archives at http://django-irc-logs.com/.
+
+ * Join the django-users mailing list, or read the archives, at
+ http://groups.google.com/group/django-users.
diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
new file mode 100644
index 000000000..5eee8985c
--- /dev/null
+++ b/libre/doublecmd-libre/PKGBUILD
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
+# Contributor: (sirocco AT ngs.ru)
+
+_pkgbase=doublecmd
+pkgbase=doublecmd-libre
+pkgname=('doublecmd-gtk2-libre' 'doublecmd-qt-libre')
+pkgver=0.5.4
+_helpver=0.5.1
+pkgrel=2.1
+url="http://doublecmd.sourceforge.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+install="$_pkgbase.install"
+makedepends=('lazarus' 'qt4pas' 'gtk2')
+optdepends=('lua: scripting' 'p7zip: support for 7zip archives')
+source=("http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
+ "http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz"
+)
+sha256sums=('480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7'
+ 'd9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5')
+
+build() {
+ cp -a $_pkgbase-$pkgver $_pkgbase-gtk
+ cp -a $_pkgbase-$pkgver $_pkgbase-qt
+
+ cd "$srcdir/$_pkgbase-gtk"
+ ./build.sh beta gtk2
+
+ cd "$srcdir/$_pkgbase-qt"
+ ./build.sh beta qt
+}
+
+package_doublecmd-gtk2-libre() {
+ pkgdesc="twin-panel (commander-style) file manager (GTK)"
+ depends=('gtk2')
+ conflicts=('doublecmd-gtk2')
+ replaces=('doublecmd-gtk2')
+ provides=("doublecmd-gtk2=${pkgver}" 'doublecmd')
+ cd "$srcdir/$_pkgbase-gtk"
+ sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
+ ./install/linux/install.sh --install-prefix="$pkgdir"
+
+ # install doc
+ cd "$srcdir/$_pkgbase-help-$_helpver"
+ cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
+}
+
+package_doublecmd-qt-libre() {
+ pkgdesc="twin-panel (commander-style) file manager (QT)"
+ depends=('qt4pas')
+ conflicts=('doublecmd-qt')
+ replaces=('doublecmd-qt')
+ provides=("doublecmd-qt=${pkgver}" 'doublecmd')
+ cd "$srcdir/$_pkgbase-qt"
+ sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
+ ./install/linux/install.sh --install-prefix="$pkgdir"
+
+ # install doc
+ cd "$srcdir/$_pkgbase-help-$_helpver"
+ cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
+}
diff --git a/libre/doublecmd-libre/doublecmd.install b/libre/doublecmd-libre/doublecmd.install
new file mode 100644
index 000000000..40d56528f
--- /dev/null
+++ b/libre/doublecmd-libre/doublecmd.install
@@ -0,0 +1,34 @@
+update_icons() {
+
+ # Setup Menus
+ if which update-desktop-database
+ then
+ update-desktop-database -q /usr/share/applications
+ fi
+
+ # Setup MIME types
+ if which update-mime-database
+ then
+ update-mime-database /usr/share/mime >/dev/null
+ fi
+
+ # Setup Icons
+ touch -c /usr/share/icons/hicolor
+ if which gtk-update-icon-cache
+ then
+ gtk-update-icon-cache -tq /usr/share/icons/hicolor
+ fi
+
+}
+
+post_install() {
+ update_icons
+}
+
+post_upgrade() {
+ update_icons
+}
+
+post_remove() {
+ update_icons
+}
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 175b80610..175b80610 100644..100755
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
diff --git a/libre/dpkg/dpkg-arch.patch b/libre/dpkg/dpkg-arch.patch
index 66e7a2ef2..66e7a2ef2 100644..100755
--- a/libre/dpkg/dpkg-arch.patch
+++ b/libre/dpkg/dpkg-arch.patch
diff --git a/libre/dpkg/dpkg-rsyncable.patch b/libre/dpkg/dpkg-rsyncable.patch
index e7e58dfdf..e7e58dfdf 100644..100755
--- a/libre/dpkg/dpkg-rsyncable.patch
+++ b/libre/dpkg/dpkg-rsyncable.patch
diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD
index b9cd0c8ff..2069f1c8a 100644..100755
--- a/libre/dvdrip-libre/PKGBUILD
+++ b/libre/dvdrip-libre/PKGBUILD
@@ -1,12 +1,12 @@
# $Id$
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=dvdrip
pkgname=dvdrip-libre
pkgver=0.98.11
-pkgrel=10
+pkgrel=10.1
pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and unfree rar dependencies"
arch=('i686' 'x86_64')
license=('custom')
diff --git a/libre/dvdrip-libre/dvdrip.desktop b/libre/dvdrip-libre/dvdrip.desktop
index dd19b4aae..dd19b4aae 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 9923ad1cf..28c77eed8 100644..100755
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -3,11 +3,12 @@
# Maintainer: schuay <jakob.gruber@gmail.com>
# Contributor: Tom K <tomk@runbox.com>
# Contributor: Thayer Williams <thayer@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
pkgname=epdfview-libre
_pkgname=epdfview
pkgver=0.1.8
-pkgrel=3
+pkgrel=4
pkgdesc="A free lightweight PDF document viewer."
url="http://www.emma-soft.com/projects/epdfview/"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,9 +21,11 @@ replaces=('epdfview')
install='epdfview.install'
source=("http://www.emma-soft.com/projects/${_pkgname}/chrome/site/releases/${_pkgname}-${pkgver}.tar.bz2"
"${_pkgname}.desktop.patch"
+ "glib2_headers.patch"
"0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
md5sums=('e50285b01612169b2594fea375f53ae4'
'fbf22bbabdbb7544db615ac5775d57e2'
+ '41b30f53f20472cbc2fcd4eae161125e'
'7f9ea101a41f5b4e999fd024f423d41f')
build() {
@@ -30,6 +33,7 @@ build() {
patch -Np0 -i "${srcdir}/${_pkgname}.desktop.patch"
patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
+ patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116
# Use xdg-open as default browser.
sed -r '/DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE/s/firefox[^ ]*/xdg-open/' -i src/Config.cxx
diff --git a/libre/epdfview-libre/epdfview.desktop.patch b/libre/epdfview-libre/epdfview.desktop.patch
index d86fc3088..d86fc3088 100644..100755
--- 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 100644..100755
--- 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
new file mode 100755
index 000000000..b5bc5c211
--- /dev/null
+++ b/libre/epdfview-libre/glib2_headers.patch
@@ -0,0 +1,12 @@
+diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
+index c142a7a..58fcf2e 100644
+--- a/src/gtk/StockIcons.h
++++ b/src/gtk/StockIcons.h
+@@ -18,7 +18,7 @@
+ #if !defined (__STOCK_ICONS_H__)
+ #define __STOCK_ICONS_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index 3fe40c4a9..3fe40c4a9 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/libre/file-roller-libre/rePKGBUILD
+++ b/libre/file-roller-libre/rePKGBUILD
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 94d5390ab..6fc74fe5a 100644..100755
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,41 +1,31 @@
-# $Id: PKGBUILD 158070 2012-05-02 11:53:48Z tomegun $
+# $Id: PKGBUILD 169557 2012-10-23 14:38:06Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=filesystem
-pkgver=2012.2
-pkgrel=5
+pkgver=2012.10
+pkgrel=2
pkgdesc='Base filesystem for Parabola'
arch=('any')
license=('GPL')
url='https://parabolagnulinux.org'
groups=('base')
install='filesystem.install'
-depends=('iana-etc' 'bash' 'coreutils')
+makedepends=('asciidoc')
+depends=('iana-etc' 'bash' 'coreutils' 'nss-myhostname')
backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
- 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells'
- 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
-md5sums=('772fe869b921698cc3e6fde73c4ac85a'
- '6be47d893fd49b2e4a8c0e811b350861'
- '13753e4e0964f3652b0cc60a28528bdf'
- '4c4540eeb748bf1f71d631b8c1dcf0b3'
- 'f28150d4c0b22a017be51b9f7f9977ed'
- '6e488ffecc8ba142c0cf7e2d7aeb832e'
- '8a9042a2cedf6b6b47eb8973f14289cb'
- 'b8355d9d2782f424f4cedcf682651be0'
- 'ca716f853860199c1286e7939b2f2666'
- 'e5d8323a4dbee7a6d0d2a19cbf4b819f'
- '7bc65f234dfb6abf24e7c3b03e86f4ff'
- 'd41d8cd98f00b204e9800998ecf8427e'
- '6f48288b6fcaf0065fcb7b0e525413e0'
- '22518e922891f9359f971f4f5b4e793c'
- 'd2dc4e39dbdea75b107f91789e3274ab'
- 'f3b6ae7db8adffaaa4bffc6099dcbd50'
- 'a8a962370cd0128465d514e6a1f74130')
+ 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
+ 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt'
+ 'locale.sh')
+
+build() {
+ cd ${srcdir}
+ a2x -d manpage -f manpage parabola.7.txt
+}
package() {
cd ${pkgdir}
@@ -43,10 +33,11 @@ package() {
#
# setup root filesystem
#
- for d in bin boot dev etc home media mnt sbin usr var opt srv/http sys run; do
+ for d in boot dev etc home media mnt usr var opt srv/http run; do
install -d -m755 ${d}
done
install -d -m555 proc
+ install -d -m555 sys
install -d -m0750 root
install -d -m1777 tmp
# vsftpd won't run with write perms on /srv/ftp
@@ -54,7 +45,7 @@ package() {
# setup /etc
install -d etc/{ld.so.conf.d,skel,profile.d}
- for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
+ for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do
install -m644 ${srcdir}/${f} etc/
done
ln -s /proc/self/mounts etc/mtab
@@ -63,19 +54,18 @@ package() {
done
touch etc/arch-release
install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
+ install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh
# setup /var
- for d in cache/man local opt log/old lib/misc empty run; do
+ for d in cache/man local opt log/old lib/misc empty; do
install -d -m755 var/${d}
done
- install -d -m1777 var/{tmp,spool/mail,lock}
+ install -d -m1777 var/{tmp,spool/mail}
# allow setgid games to write scores
install -d -m775 -g games var/games
ln -s spool/mail var/mail
- # not ready yet, needs possible change in pacman or other magic
- # is fixed by initscripts on next boot
-# ln -s ../run var/run
-# ln -s ../run/lock var/lock
+ ln -s ../run var/run
+ ln -s ../run/lock var/lock
#
# setup /usr hierarchy
@@ -87,6 +77,10 @@ package() {
install -d -m755 usr/share/man/man${d}
done
+ #
+ # install parabola(7) manpage
+ #
+ install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7
#
# setup /usr/local hierarchy
@@ -96,3 +90,23 @@ package() {
done
ln -s ../man usr/local/share/man
}
+md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
+ '6be47d893fd49b2e4a8c0e811b350861'
+ '9e4533df61f0c82d6b2e2371f7376282'
+ '4c4540eeb748bf1f71d631b8c1dcf0b3'
+ 'f28150d4c0b22a017be51b9f7f9977ed'
+ '6e488ffecc8ba142c0cf7e2d7aeb832e'
+ '455b78cada80f40b6f6968f5cbd97a2e'
+ '01249bb0ba4468f95e2cc3a627f5e6e3'
+ 'ca716f853860199c1286e7939b2f2666'
+ '1745349eb24ed21b4cfaa6f423bddb76'
+ '7bc65f234dfb6abf24e7c3b03e86f4ff'
+ 'd41d8cd98f00b204e9800998ecf8427e'
+ '0e145e18fea8fd190b30d45764f5707c'
+ '6f48288b6fcaf0065fcb7b0e525413e0'
+ '22518e922891f9359f971f4f5b4e793c'
+ '677523dbe94b79299aa91b35ed8203b6'
+ 'f3b6ae7db8adffaaa4bffc6099dcbd50'
+ 'a8a962370cd0128465d514e6a1f74130'
+ '9f445ef4f7785d04504886fb223ee401'
+ '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/crypttab b/libre/filesystem/crypttab
index dd6994b5a..195945a74 100644..100755
--- a/libre/filesystem/crypttab
+++ b/libre/filesystem/crypttab
@@ -1,33 +1,17 @@
-# crypttab: Mappings for encrypted partitions
+# crypttab: mappings for encrypted partitions
#
# Each mapped device will be created in /dev/mapper, so your /etc/fstab
-# should use the /dev/mapper/{NAME} paths for encrypted devices.
+# should use the /dev/mapper/<name> paths for encrypted devices.
#
-# Each PASSWORD field can be an absolute pathname to a key file (starting
-# with a slash, recommended) or a literal string that will be used as
-# a passphrase. To use special characters in the passphrase, surround it
-# by quotes, the usual bash quoting rules apply.
-# There are two special keywords that cannot be used as passphrases:
-# - ASK ask for a passphrase on boot
-# - SWAP use a random key and create a swapspace afterwards
-# WARNING: use the SWAP keyword carefully, as it overwrites the data
-# on the specified partition
-#
-# To create a key file:
-# hashalot -n 32 ripemd160 >/etc/crytfs.key
-# or
-# dd if=/dev/urandom of=/etc/cryptfs.key bs=256 count=1
-#
-# To pass additional options to cryptsetup for non-LUKS partitions, use the
-# fourth column.
+# The Arch specific syntax has been deprecated, see crypttab(5) for the
+# new supported syntax.
#
# NOTE: Do not list your root (/) partition here, it must be set up
# beforehand by the initramfs (/etc/mkinitcpio.conf).
-
-# NAME SOURCE DEVICE PASSWORD OPTIONS
-#home /dev/hda4 mypassword
-#data1 /dev/hda3 "my \"password\""
-#data2 /dev/hda5 /etc/cryptfs.key
-#swap /dev/hdx4 SWAP -c aes-cbc-essiv:sha256 -s 256
-#vol /dev/hdb7 ASK
+# <name> <device> <password> <options>
+# home /dev/hda4 /etc/mypassword1
+# data1 /dev/hda3 /etc/mypassword2
+# data2 /dev/hda5 /etc/cryptfs.key
+# swap /dev/hdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256
+# vol /dev/hdb7 none
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 8cef64bb6..34fcc0dee 100644..100755
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -1,11 +1,11 @@
post_install() {
- [ -f var/log/lastlog ] || : >var/log/lastlog
- [ -f var/log/wtmp ] || : >var/log/wtmp
- [ -f var/log/btmp ] || (: >var/log/btmp && chmod 600 var/log/btmp)
+ [ -f var/log/lastlog ] || : >var/log/lastlog
+ [ -f var/log/wtmp ] || : >var/log/wtmp
+ [ -f var/log/btmp ] || { : >var/log/btmp && chmod 600 var/log/btmp; }
# workaround for bug #7194
# readded due to bug #9465
# please do not remove!
- chmod 1777 var/spool/mail tmp var/tmp var/lock
+ chmod 1777 var/spool/mail tmp var/tmp
}
# args: <group> [options]
@@ -40,9 +40,12 @@ post_upgrade() {
_adduser http -u 33 -d /srv/http -g http -s /bin/false
_addgroup scanner -g 96
_addgroup rfkill -g 24
+ _addgroup lock -g 54
+ _addgroup uuidd -g 68
+ _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin
- # sync gshadow to group (fixes FS#19869
- if ! grep -q '^rfkill:' etc/gshadow; then
+ # sync gshadow to group (fixes FS#19869)
+ if ! grep -q '^lock:' etc/gshadow; then
grpconv >/dev/null
fi
diff --git a/libre/filesystem/fstab b/libre/filesystem/fstab
index f7f9298d4..f7f9298d4 100644..100755
--- a/libre/filesystem/fstab
+++ b/libre/filesystem/fstab
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 261746d9e..cfee1f23e 100644..100755
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -19,6 +19,8 @@ rfkill:x:24:
smmsp:x:25:
http:x:33:
games:x:50:
+lock:x:54:
+uuidd:x:68:
network:x:90:
video:x:91:
audio:x:92:
diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow
index ed176823e..c5ac18581 100644..100755
--- a/libre/filesystem/gshadow
+++ b/libre/filesystem/gshadow
@@ -19,6 +19,8 @@ rfkill:x::
smmsp:::
http:::
games:::
+lock:::
+uuidd:!::
network:x::
video:x::
audio:::
diff --git a/libre/filesystem/host.conf b/libre/filesystem/host.conf
index cf52fe561..cf52fe561 100644..100755
--- a/libre/filesystem/host.conf
+++ b/libre/filesystem/host.conf
diff --git a/libre/filesystem/hosts b/libre/filesystem/hosts
index 1747f9196..1747f9196 100644..100755
--- a/libre/filesystem/hosts
+++ b/libre/filesystem/hosts
diff --git a/libre/filesystem/issue b/libre/filesystem/issue
index b001c55dd..b001c55dd 100644..100755
--- 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 100644..100755
--- a/libre/filesystem/ld.so.conf
+++ b/libre/filesystem/ld.so.conf
diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh
new file mode 100644
index 000000000..5fd4174d5
--- /dev/null
+++ b/libre/filesystem/locale.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \
+ LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
+
+if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
+ . "$XDG_CONFIG_HOME/locale.conf"
+elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
+ . "$HOME/.config/locale.conf"
+elif [ -r /etc/locale.conf ]; then
+ . /etc/locale.conf
+elif [ -r /etc/rc.conf ]; then
+ LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE")
+fi
+
+export LANG="${LANG:-C}"
+[ -n "$LC_CTYPE" ] && export LC_CTYPE
+[ -n "$LC_NUMERIC" ] && export LC_NUMERIC
+[ -n "$LC_TIME" ] && export LC_TIME
+[ -n "$LC_COLLATE" ] && export LC_COLLATE
+[ -n "$LC_MONETARY" ] && export LC_MONETARY
+[ -n "$LC_MESSAGES" ] && export LC_MESSAGES
+[ -n "$LC_PAPER" ] && export LC_PAPER
+[ -n "$LC_NAME" ] && export LC_NAME
+[ -n "$LC_ADDRESS" ] && export LC_ADDRESS
+[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE
+[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT
+[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION
diff --git a/libre/filesystem/modprobe.d.usb-load-ehci-first b/libre/filesystem/modprobe.d.usb-load-ehci-first
index 947379411..947379411 100644..100755
--- 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 100644..100755
--- a/libre/filesystem/motd
+++ b/libre/filesystem/motd
diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem/nsswitch.conf
index 6e459adb6..4a4f5770d 100644..100755
--- a/libre/filesystem/nsswitch.conf
+++ b/libre/filesystem/nsswitch.conf
@@ -6,7 +6,7 @@ shadow: files
publickey: files
-hosts: files dns
+hosts: files dns myhostname
networks: files
protocols: files
diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release
new file mode 100755
index 000000000..fe5f20b4f
--- /dev/null
+++ b/libre/filesystem/os-release
@@ -0,0 +1,8 @@
+NAME="Parabola"
+ID=parabola
+ID_LIKE=arch
+PRETTY_NAME="Parabola GNU/Linux-libre"
+ANSI_COLOR="1;35"
+HOME_URL="https://parabolagnulinux.org/"
+BUG_REPORT_URL="https://labs.parabola.nu/"
+
diff --git a/libre/filesystem/parabola.7.txt b/libre/filesystem/parabola.7.txt
new file mode 100644
index 000000000..23a44bb22
--- /dev/null
+++ b/libre/filesystem/parabola.7.txt
@@ -0,0 +1,80 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet:
+/////
+parabola(7)
+============
+
+NAME
+----
+parabola - basic configuration
+
+SYNOPSIS
+--------
+Overview of the basic configuration of Parabola GNU/Linux-libre.
+
+DESCRIPTION
+-----------
+Parabola exposes the user to the system without hiding any details. This manpage gives a
+brief overview of the configuration files that should be set up on a fresh install.
+
+SYSTEM SERVICES[[S]]
+--------------------
+System services to be started at boot can be enabled using 'systemctl enable <name>.service'. To view
+available services use 'systemctl list-unit-files'.
+
+HOSTNAME[[H]]
+-------------
+The hostname of the machine can be set using 'hostnamectl set-hostname <hostname>'. It will then be
+written to /etc/hostname.
+
+LOCALIZATION[[L]]
+-----------------
+Various locales may be enabled in /etc/locale.gen, and generated by locale-gen. The system-wide locale to be used
+can be configured in /etc/locale.conf. These settings can be overridden on a per-user basis by keeping a
+user-specific locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists.
+
+VIRTUAL CONSOLE[[V]]
+--------------------
+The virtual console is configured in /etc/vconsole.conf. It allows you to set a font and a keyboard layout, among
+other things. Note that these settings only apply to the console, and not if you use X.
+
+TIME[[T]]
+---------
+The local timezone is configured by calling 'timedatectl set-timezone <Region/City>'. A *symlink* is then created
+from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. E.g.,
+
+ /etc/localtime -> ../usr/share/zoneinfo/Europe/Paris
+
+The real-time clock, which keeps track of time when the computer is off, can be configured to either
+be in UTC or in localtime by calling 'timedatectl set-local-rtc <false|true>'. The default is UTC.
+
+FILESYSTEMS[[F]]
+----------------
+Filesystems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab.
+
+INITRAMFS[[R]]
+--------------
+The initramfs is generated by mkinitcpio, and can be configured in /etc/mkinitcpio.conf.
+
+PACKAGE MANAGER[[P]]
+--------------------
+The package manager, pacman, is configured in /etc/pacman.conf.
+
+BOOTLOADER[[B]]
+---------------
+GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.cfg
+
+MODULES[[M]]
+------------
+Most modules should be loaded on-demand. Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/,
+and modules to be blacklisted from auto-loading can be configured in /etc/modprobe.d/.
+
+SEE ALSO
+--------
+
+systemctl(1), hostnamectl(1), hostname(5), locale.conf(5), vconsole.conf(5), timedatectl(1), timezone(3), hwclock(8), fstab(5),
+crypttab(5), mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5)
+
+AUTHORS
+-------
+Written by Tom Gundersen. Rebranded for Parabola by Nicolás Reynolds and André Silva.
diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd
index a4a24e34f..cb9fec7ff 100644..100755
--- a/libre/filesystem/passwd
+++ b/libre/filesystem/passwd
@@ -4,4 +4,5 @@ daemon:x:2:2:daemon:/sbin:/bin/false
mail:x:8:12:mail:/var/spool/mail:/bin/false
ftp:x:14:11:ftp:/srv/ftp:/bin/false
http:x:33:33:http:/srv/http:/bin/false
+uuidd:x:68:68:uuidd:/:/sbin/nologin
nobody:x:99:99:nobody:/:/bin/false
diff --git a/libre/filesystem/profile b/libre/filesystem/profile
index 3bc22db9f..3bc22db9f 100644..100755
--- a/libre/filesystem/profile
+++ b/libre/filesystem/profile
diff --git a/libre/filesystem/resolv.conf b/libre/filesystem/resolv.conf
index cecafba03..cecafba03 100644..100755
--- a/libre/filesystem/resolv.conf
+++ b/libre/filesystem/resolv.conf
diff --git a/libre/filesystem/securetty b/libre/filesystem/securetty
index 5a2235ce7..5a2235ce7 100644..100755
--- a/libre/filesystem/securetty
+++ b/libre/filesystem/securetty
diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow
index ccab68d33..5eff4935c 100644..100755
--- a/libre/filesystem/shadow
+++ b/libre/filesystem/shadow
@@ -4,4 +4,5 @@ daemon:x:14871::::::
mail:x:14871::::::
ftp:x:14871::::::
http:x:14871::::::
+uuidd:x:14871::::::
nobody:x:14871::::::
diff --git a/libre/filesystem/shells b/libre/filesystem/shells
index 18c1aeffa..18c1aeffa 100644..100755
--- a/libre/filesystem/shells
+++ b/libre/filesystem/shells
diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD
index 1149a2558..73a7af6c4 100644..100755
--- a/libre/foomatic-filters-libre/PKGBUILD
+++ b/libre/foomatic-filters-libre/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 155770 2012-04-06 10:08:29Z andyrtr $
+# $Id$
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
pkgbase="foomatic"
pkgname=('foomatic-filters-libre')
arch=('i686' 'x86_64' 'mips64el') # needs to be changed in the subpackages when makepkg will support it
-_snapdate=20120406
-_filtersver=4.0.15
+_snapdate=20120712
+_filtersver=4.0.17
pkgver=${_filtersver}_${_snapdate}
-pkgrel=1.2
+pkgrel=1
epoch=1
makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
-#_url=http://www.openprinting.org/download/foomatic/ # switch after build
-_url=ftp://ftp.archlinux.org/other/foomatic/
-source=(${_url}/$pkgbase-filters-${_filtersver}.tar.gz)
+source=(http://www.openprinting.org/download/foomatic/$pkgbase-filters-${_filtersver}.tar.gz)
url="http://www.linuxprinting.org/foomatic.html"
options=('!emptydirs')
-md5sums=('1b7efcdc57340915647daa5b5c15b0ef')
+md5sums=('b05f5dcbfe359f198eef3df5b283d896')
package_foomatic-filters-libre() {
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index b89a3095b..656f49fb5 100644..100755
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149732 2012-02-09 20:34:33Z andyrtr $
+# $Id: PKGBUILD 165015 2012-08-08 19:40:10Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer (Parabola): xihh
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=ghostscript
pkgname=ghostscript-libre
-pkgver=9.05
+pkgver=9.06
pkgrel=1
pkgdesc="An interpreter for the PostScript language without non-free files"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,18 +15,19 @@ makedepends=('gtk2' 'gnutls')
optdepends=('texlive-core: needed for dvipdf'
'gtk2: needed for gsx')
conflicts=('ghostscript')
-replaces=('ghostscript-lrpng' 'ghostscript')
-provides=('ghostscript-lprng' "ghostscript=$pkgver")
+replaces=('ghostscript')
+provides=("ghostscript=$pkgver")
url="http://www.ghostscript.com/"
source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
options=('!libtool' '!makeflags')
-md5sums=('8bcef1f33ddf8a4d12b2cf8da385c191')
+md5sums=('46f9ebe40dc52755287b30704270db11')
build() {
cd ${srcdir}/ghostscript-${pkgver}
# delete non-free packages
grep -l "are not altered" Resource/CMap/* | xargs rm -fv
+ grep -l "not be copied" Resource/CMap/* | xargs rm -fv
# force it to use system-libs
rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
diff --git a/libre/ghostscript-libre/svn_rev11948.diff b/libre/ghostscript-libre/svn_rev11948.diff
index 92abb0d98..92abb0d98 100644..100755
--- 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 c7f952833..3270a3d4d 100644..100755
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -1,33 +1,29 @@
-# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+# Maintainer: André Silva <emulatorman@lavabit.com>
+_pkgname=ghostscript
pkgname=gnu-ghostscript
-_pkgver=9.04
-pkgver=9.04.1
+_pkgver=9.05
+pkgver=9.05.0
pkgrel=1
-pkgdesc="An interpreter for the PostScript language from FSF"
+pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
arch=('i686' 'x86_64')
license=('GPL3')
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms2')
makedepends=('gtk2' 'gnutls')
optdepends=('texlive-core: needed for dvipdf'
'gtk2: needed for gsx')
-conflicts=('ghostscript')
-replaces=('ghostscript-lrpng' 'ghostscript')
-provides=('ghostscript-lprng' "ghostscript=$pkgver")
-url="https://www.gnu.org/software/ghostscript/"
-source=(ftp://ftp.gnu.org/gnu/ghostscript/${pkgname}-${pkgver}.tar.xz
- ${pkgname}-cups-rgbw.patch
- libtool.patch)
+conflicts=${_pkgname}
+replaces=${_pkgname}
+provides="${_pkgname}=9.06"
+url="https://www.gnu.org/software/${_pkgname}/"
+source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
+ libtool.patch)
options=('!libtool' '!makeflags')
-md5sums=('aba639a5102afbd2ee30c67831692c27'
- '5a78af559d44a7502978fd09f840e3aa'
+md5sums=('e80423be9abb32fc99cc897ed379a7df'
'5bd5d4966007b460deed866a30a0b3c8')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
- # fix broken color printing https://bugs.archlinux.org/task/25519
- patch -Np1 -i ${srcdir}/${pkgname}-cups-rgbw.patch
# fix libtool version
patch -Np1 -i ${srcdir}/libtool.patch
@@ -35,7 +31,7 @@ build() {
# force it to use system-libs
rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
-LIBS=-lfreetype ./configure --prefix=/usr \
+ ./configure --prefix=/usr \
--enable-dynamic \
--with-ijs \
--with-jbig2dec \
@@ -47,6 +43,7 @@ LIBS=-lfreetype ./configure --prefix=/usr \
--enable-fontconfig \
--enable-freetype \
--without-luratech \
+ --with-system-libtiff \
--disable-compile-inits #--help # needed for linking with system-zlib
make
@@ -64,9 +61,9 @@ package() {
cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
# install missing doc files # http://bugs.archlinux.org/task/18023
- install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$_pkgver/doc/
+ install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/${_pkgname}/$_pkgver/doc/
- mkdir -p ${pkgdir}/usr/share/licenses/ghostscript
+ mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname}
install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/
# remove unwanted localized man-pages
diff --git a/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch b/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch
deleted file mode 100644
index 81b52a2e6..000000000
--- a/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-diff -up gnu-ghostscript-9.04.1/cups/gdevcups.c.cups-rgbw ghostscript-9.04/cups/gdevcups.c
---- gnu-ghostscript-9.04.1/cups/gdevcups.c.cups-rgbw 2011-08-05 12:12:21.000000000 +0100
-+++ gnu-ghostscript-9.04.1/cups/gdevcups.c 2011-08-22 10:54:24.614010581 +0100
-@@ -225,6 +225,7 @@ typedef struct gx_device_cups_s
- unsigned short EncodeLUT[gx_max_color_value + 1];/* RGB value to output color LUT */
- int Density[CUPS_MAX_VALUE + 1];/* Density LUT */
- int Matrix[3][3][CUPS_MAX_VALUE + 1];/* Color transform matrix LUT */
-+ int user_icc;
- int cupsRasterVersion;
-
- /* Used by cups_put_params(): */
-@@ -426,6 +427,7 @@ gx_device_cups gs_cups_device =
- {0x00}, /* EncodeLUT */
- {0x00}, /* Density */
- {0x00}, /* Matrix */
-+ 0,
- 3 /* cupsRasterVersion */
- };
-
-@@ -1182,15 +1184,18 @@ cups_map_cmyk(gx_device *pdev, /* I - D
-
- case CUPS_CSPACE_RGB :
- case CUPS_CSPACE_RGBW :
-+ c0 = c + k;
-+ c1 = m + k;
-+ c2 = y + k;
- if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
-- c0 = c;
-- c1 = m;
-- c2 = y;
-- c3 = k;
-- } else {
-- c0 = c + k;
-- c1 = m + k;
-- c2 = y + k;
-+ if ((k >= frac_1 - 1) ||
-+ ((c0 >= frac_1) && (c1 >= frac_1) && (c2 >= frac_1))) {
-+ c0 = frac_1;
-+ c1 = frac_1;
-+ c2 = frac_1;
-+ c3 = frac_1;
-+ } else
-+ c3 = 0;
- }
-
- if (c0 < 0)
-@@ -1212,11 +1217,12 @@ cups_map_cmyk(gx_device *pdev, /* I - D
- out[2] = frac_1 - (frac)cups->Density[c2];
-
- if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
-- if (c3 < 0)
-- c3 = 0;
-- else if (c3 > frac_1)
-- c3 = frac_1;
-- out[3] = frac_1 - (frac)cups->Density[c3];
-+ if (c3 == 0)
-+ out[3] = frac_1;
-+ else if (c3 == frac_1)
-+ out[3] = 0;
-+ else
-+ out[3] = frac_1;
- }
- break;
-
-@@ -2034,10 +2040,15 @@ cups_map_color_rgb(gx_device *pdev,
- * cups->DecodeLUT actually maps to RGBW, not CMYK...
- */
-
-- k = cups->DecodeLUT[c3];
-- c = cups->DecodeLUT[c0] + k - gx_max_color_value;
-- m = cups->DecodeLUT[c1] + k - gx_max_color_value;
-- y = cups->DecodeLUT[c2] + k - gx_max_color_value;
-+ if (c3 == 0) {
-+ c = 0;
-+ m = 0;
-+ y = 0;
-+ } else {
-+ c = cups->DecodeLUT[c0];
-+ m = cups->DecodeLUT[c1];
-+ y = cups->DecodeLUT[c2];
-+ }
-
- if (c > gx_max_color_value)
- prgb[0] = gx_max_color_value;
-@@ -2282,20 +2293,20 @@ cups_map_rgb_color(gx_device *pdev,
- switch (cups->header.cupsBitsPerColor)
- {
- default :
-- i = 0x0e;
-+ i = 0x00;
- break;
- case 2 :
-- i = 0xfc;
-+ i = 0x00;
- break;
- case 4 :
-- i = 0xfff0;
-+ i = 0x0000;
- break;
- case 8 :
-- i = 0xffffff00;
-+ i = 0x00000000;
- break;
- #ifdef GX_COLOR_INDEX_TYPE
- case 16 :
-- i = 0xffffffffffff0000;
-+ i = 0x0000000000000000;
- break;
- #endif /* GX_COLOR_INDEX_TYPE */
- }
-@@ -2929,7 +2940,10 @@ cups_put_params(gx_device *pdev, /*
- int xflip = 0,
- yflip = 0;
- int found = 0;
--
-+ gs_param_string icc_pro_dummy;
-+ int old_cmps = cups->color_info.num_components;
-+ int old_depth = cups->color_info.depth;
-+
- #ifdef DEBUG
- dprintf2("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist);
- #endif /* DEBUG */
-@@ -3024,6 +3038,11 @@ cups_put_params(gx_device *pdev, /*
- margins_set = param_read_float_array(plist, "Margins", &arrayval) == 0;
- color_set = param_read_int(plist, "cupsColorSpace", &intval) == 0 ||
- param_read_int(plist, "cupsBitsPerColor", &intval) == 0;
-+
-+ if (!cups->user_icc) {
-+ cups->user_icc = param_read_string(plist, "OutputICCProfile", &icc_pro_dummy) == 0;
-+ }
-+
- /* We set the old dimensions to 1 if we have a color depth change, so
- that memory reallocation gets forced. This is perhaps not the correct
- approach to prevent crashes like in bug 690435. We keep it for the
-@@ -3134,12 +3153,20 @@ cups_put_params(gx_device *pdev, /*
- if ((code = gdev_prn_put_params(pdev, plist)) < 0)
- return (code);
-
-+ /* If cups_set_color_info() changed the color model of the device we want to
-+ * force the raster memory to be recreated/reinitialized
-+ */
-+ if (cups->color_info.num_components != old_cmps || cups->color_info.depth != old_depth) {
-+ width_old = 0;
-+ height_old = 0;
-+ }
-+ else {
- /* pdev->width/height may have been changed by the call to
- * gdev_prn_put_params()
- */
-- width_old = pdev->width;
-- height_old = pdev->height;
--
-+ width_old = pdev->width;
-+ height_old = pdev->height;
-+ }
- /*
- * Update margins/sizes as needed...
- */
-@@ -4044,22 +4071,88 @@ cups_set_color_info(gx_device *pdev) /*
- for (k = 0; k <= CUPS_MAX_VALUE; k ++)
- cups->Density[k] = k;
- }
-- /* Set up the ICC profile for ghostscript to use based upon the color space.
-- This is different than the PPD profile above which appears to be some sort
-- of matrix based TRC profile */
-- switch (cups->header.cupsColorSpace) {
-- /* Use RGB profile for this */
-- case CUPS_CSPACE_RGBW:
-- if (pdev->icc_struct == NULL) {
-- pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
-- }
-- if (pdev->icc_struct->device_profile[gsDEFAULTPROFILE] == NULL) {
-- code = gsicc_set_device_profile(pdev, pdev->memory,
-- DEFAULT_RGB_ICC, gsDEFAULTPROFILE);
-- }
-- break;
-- default:
-- break;
-+ if (!cups->user_icc) {
-+ /* Set up the ICC profile for ghostscript to use based upon the color space.
-+ This is different than the PPD profile above which appears to be some sort
-+ of matrix based TRC profile */
-+ switch (cups->header.cupsColorSpace)
-+ {
-+ default :
-+ case CUPS_CSPACE_RGBW :
-+ case CUPS_CSPACE_RGB :
-+ case CUPS_CSPACE_RGBA :
-+ case CUPS_CSPACE_CMY :
-+ case CUPS_CSPACE_YMC :
-+# ifdef CUPS_RASTER_HAVE_COLORIMETRIC
-+ case CUPS_CSPACE_CIELab :
-+ case CUPS_CSPACE_ICC1 :
-+ case CUPS_CSPACE_ICC2 :
-+ case CUPS_CSPACE_ICC3 :
-+ case CUPS_CSPACE_ICC4 :
-+ case CUPS_CSPACE_ICC5 :
-+ case CUPS_CSPACE_ICC6 :
-+ case CUPS_CSPACE_ICC7 :
-+ case CUPS_CSPACE_ICC8 :
-+ case CUPS_CSPACE_ICC9 :
-+ case CUPS_CSPACE_ICCA :
-+ case CUPS_CSPACE_ICCB :
-+ case CUPS_CSPACE_ICCC :
-+ case CUPS_CSPACE_ICCD :
-+ case CUPS_CSPACE_ICCE :
-+ case CUPS_CSPACE_ICCF :
-+# endif /* CUPS_RASTER_HAVE_COLORIMETRIC */
-+ if (!pdev->icc_struct || (pdev->icc_struct &&
-+ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsRGB)) {
-+
-+ if (pdev->icc_struct) {
-+ rc_decrement(pdev->icc_struct, "cups_set_color_info");
-+ }
-+ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
-+
-+ code = gsicc_set_device_profile(pdev, pdev->memory,
-+ (char *)DEFAULT_RGB_ICC, gsDEFAULTPROFILE);
-+ }
-+ break;
-+
-+ case CUPS_CSPACE_W :
-+ case CUPS_CSPACE_WHITE :
-+ case CUPS_CSPACE_K :
-+ case CUPS_CSPACE_GOLD :
-+ case CUPS_CSPACE_SILVER :
-+ if (!pdev->icc_struct || (pdev->icc_struct &&
-+ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsGRAY)) {
-+
-+ if (pdev->icc_struct) {
-+ rc_decrement(pdev->icc_struct, "cups_set_color_info");
-+ }
-+ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
-+
-+ code = gsicc_set_device_profile(pdev, pdev->memory->non_gc_memory,
-+ (char *)DEFAULT_GRAY_ICC, gsDEFAULTPROFILE);
-+ }
-+ break;
-+ case CUPS_CSPACE_KCMYcm :
-+# ifdef CUPS_RASTER_HAVE_COLORIMETRIC
-+ case CUPS_CSPACE_CIEXYZ :
-+#endif
-+ case CUPS_CSPACE_CMYK :
-+ case CUPS_CSPACE_YMCK :
-+ case CUPS_CSPACE_KCMY :
-+ case CUPS_CSPACE_GMCK :
-+ case CUPS_CSPACE_GMCS :
-+ if (!pdev->icc_struct || (pdev->icc_struct &&
-+ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsCMYK)) {
-+
-+ if (pdev->icc_struct) {
-+ rc_decrement(pdev->icc_struct, "cups_set_color_info");
-+ }
-+ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
-+
-+ code = gsicc_set_device_profile(pdev, pdev->memory,
-+ (char *)DEFAULT_CMYK_ICC, gsDEFAULTPROFILE);
-+ }
-+ break;
-+ }
- }
- }
-
diff --git a/libre/gnustep-base-libre/PKGBUILD b/libre/gnustep-base-libre/PKGBUILD
index 4b5fa1731..4b5fa1731 100644..100755
--- a/libre/gnustep-base-libre/PKGBUILD
+++ b/libre/gnustep-base-libre/PKGBUILD
diff --git a/libre/gnustep-make-libre/PKGBUILD b/libre/gnustep-make-libre/PKGBUILD
index 7abc014c6..7abc014c6 100644..100755
--- a/libre/gnustep-make-libre/PKGBUILD
+++ b/libre/gnustep-make-libre/PKGBUILD
diff --git a/libre/grub/040_all_grub-0.96-nxstack.patch b/libre/grub-legacy/040_all_grub-0.96-nxstack.patch
index 121941c75..121941c75 100644
--- a/libre/grub/040_all_grub-0.96-nxstack.patch
+++ b/libre/grub-legacy/040_all_grub-0.96-nxstack.patch
diff --git a/libre/grub/05-grub-0.97-initrdaddr.diff b/libre/grub-legacy/05-grub-0.97-initrdaddr.diff
index ccf5f3e54..ccf5f3e54 100644
--- a/libre/grub/05-grub-0.97-initrdaddr.diff
+++ b/libre/grub-legacy/05-grub-0.97-initrdaddr.diff
diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
new file mode 100644
index 000000000..d63a33ec9
--- /dev/null
+++ b/libre/grub-legacy/PKGBUILD
@@ -0,0 +1,107 @@
+# $Id: PKGBUILD 141999 2011-11-03 21:16:38Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+
+pkgname=grub
+pkgver=0.97
+pkgrel=21.4
+pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnu.org/software/grub/"
+groups=('base')
+depends=('ncurses' 'diffutils' 'sed')
+optdepends=('xfsprogs: freezing of xfs /boot in install-grub script')
+source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
+ menu.lst
+ install-grub
+ 040_all_grub-0.96-nxstack.patch
+ 05-grub-0.97-initrdaddr.diff
+ i2o.patch
+ special-devices.patch
+ more-raid.patch
+ intelmac.patch
+ grub-inode-size.patch
+ ext4.patch
+ grub-0.97-ldflags-objcopy-remove-build-id.patch)
+backup=('boot/grub/menu.lst')
+install=grub.install
+sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
+ 'e13bf0f91510fd6bb9451e6eb1b2a6e4a03e8b5f'
+ '3e23bfee50285c8c7b9ef9ec07964310278b1e09'
+ '157b81dbad3576536b08642242accfa1aeb093a9'
+ 'adbb4685c98797ffb4dc83561ec75698991dddbd'
+ 'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc'
+ 'c5e2c94ed0e759590b9eb38c9d979f075d19d7c0'
+ '45fe668a3779664fb292591f426976b6c784d6c8'
+ '066d7ab1ae442f88e94c9e4f1867ac6682965d06'
+ '0436aa6fa0b6f768289172f983a3f4b69384629e'
+ 'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
+ '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
+
+#set destination architecture here
+#DESTARCH="i686"
+DESTARCH="x86_64"
+
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ fgrep -rlZ pkglib_DATA --include Makefile.am . | xargs -0 sed -i 's/pkglib_DATA/pkgdata_DATA/g'
+
+ # optimizations break the build -- disable them
+ # adding special devices to grub, patches are from fedora
+ patch -Np1 -i ../special-devices.patch
+ patch -Np1 -i ../i2o.patch
+ patch -Np1 -i ../more-raid.patch
+ patch -Np1 -i ../intelmac.patch
+ # Add support for bigger inode size to e2fs_stage1_5
+ patch -Np1 -i ../grub-inode-size.patch
+ # Add ext4 support
+ # http://www.mail-archive.com/bug-grub@gnu.org/msg11458.html
+ patch -Np1 -i ../ext4.patch
+ # binutils fix
+ patch -Np1 -i ../grub-0.97-ldflags-objcopy-remove-build-id.patch
+
+ sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
+ sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
+
+ ## recreate ./configure script with the required changes in LDFLAGS and objcopy
+ aclocal
+ autoconf
+ autoreconf
+ automake
+
+ #arch64 fixes for static build
+ if [ "$CARCH" = "x86_64" ]; then ## correcting problems for new wersion of autotools
+
+ echo "this package has to be built on i686, won't compile on x86_64"
+ sleep 5
+ else
+ if [ "$DESTARCH" = "x86_64" ]; then
+ # patch from gentoo for fixing a segfault
+ patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
+ # patch from frugalware to make it boot when more than 2GB ram installed
+ patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
+ CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+ --mandir=/usr/share/man --infodir=/usr/share/info
+ else
+ CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+ --mandir=/usr/share/man --infodir=/usr/share/info
+ fi
+ fi
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ CFLAGS= make
+ make DESTDIR=$pkgdir install
+ install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst
+ install -D -m755 ../install-grub $pkgdir/sbin/install-grub
+
+ if [ "$DESTARCH" = "x86_64" ]; then
+ # fool makepkg into building a x86_64 package
+ export CARCH="x86_64"
+ fi
+}
diff --git a/libre/grub/ext4.patch b/libre/grub-legacy/ext4.patch
index 8a2f9bdb0..8a2f9bdb0 100644
--- a/libre/grub/ext4.patch
+++ b/libre/grub-legacy/ext4.patch
diff --git a/libre/grub/grub-0.97-gpt.patch b/libre/grub-legacy/grub-0.97-gpt.patch
index 7b1a55cd8..7b1a55cd8 100644
--- a/libre/grub/grub-0.97-gpt.patch
+++ b/libre/grub-legacy/grub-0.97-gpt.patch
diff --git a/libre/grub/grub-0.97-ldflags-objcopy-remove-build-id.patch b/libre/grub-legacy/grub-0.97-ldflags-objcopy-remove-build-id.patch
index 2b7cc32d0..2b7cc32d0 100644
--- a/libre/grub/grub-0.97-ldflags-objcopy-remove-build-id.patch
+++ b/libre/grub-legacy/grub-0.97-ldflags-objcopy-remove-build-id.patch
diff --git a/libre/grub/grub-inode-size.patch b/libre/grub-legacy/grub-inode-size.patch
index f5ceb110b..f5ceb110b 100644
--- a/libre/grub/grub-inode-size.patch
+++ b/libre/grub-legacy/grub-inode-size.patch
diff --git a/libre/grub-legacy/grub.install b/libre/grub-legacy/grub.install
new file mode 100644
index 000000000..c1f077d59
--- /dev/null
+++ b/libre/grub-legacy/grub.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(grub.info multiboot.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
diff --git a/libre/grub/i2o.patch b/libre/grub-legacy/i2o.patch
index 2af846c90..2af846c90 100644
--- a/libre/grub/i2o.patch
+++ b/libre/grub-legacy/i2o.patch
diff --git a/libre/grub/install-grub b/libre/grub-legacy/install-grub
index affc9c38a..affc9c38a 100644
--- a/libre/grub/install-grub
+++ b/libre/grub-legacy/install-grub
diff --git a/libre/grub/intelmac.patch b/libre/grub-legacy/intelmac.patch
index a3fabc733..a3fabc733 100644
--- a/libre/grub/intelmac.patch
+++ b/libre/grub-legacy/intelmac.patch
diff --git a/libre/grub/menu.lst b/libre/grub-legacy/menu.lst
index 43d2ac8db..f405baa91 100644
--- a/libre/grub/menu.lst
+++ b/libre/grub-legacy/menu.lst
@@ -26,7 +26,7 @@
# general configuration:
timeout 5
default 0
-color light-blue/black light-cyan/blue
+color magenta/black white/magenta
# boot sections follow
# each is implicitly numbered from 0 in the order of appearance below
diff --git a/libre/grub/more-raid.patch b/libre/grub-legacy/more-raid.patch
index 39db23474..39db23474 100644
--- a/libre/grub/more-raid.patch
+++ b/libre/grub-legacy/more-raid.patch
diff --git a/libre/grub/rePKGBUILD b/libre/grub-legacy/rePKGBUILD
index b14550034..a73289fb5 100644
--- a/libre/grub/rePKGBUILD
+++ b/libre/grub-legacy/rePKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Contributor: André Silva <andre.paulista@adinet.com.uy>
+# Contributor: André Silva <emulatorman@lavabit.com>
source PKGBUILD
CARCH=i686
unset build package md5sums source
diff --git a/libre/grub/special-devices.patch b/libre/grub-legacy/special-devices.patch
index 894f3e887..894f3e887 100644
--- a/libre/grub/special-devices.patch
+++ b/libre/grub-legacy/special-devices.patch
diff --git a/libre/grub/05_archtheme b/libre/grub/05_archtheme
new file mode 100644
index 000000000..4d1b6fb20
--- /dev/null
+++ b/libre/grub/05_archtheme
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+cat << EOF
+set menu_color_normal=light-blue/black
+set menu_color_highlight=light-cyan/blue
+EOF
diff --git a/libre/grub/20_memtest86+ b/libre/grub/20_memtest86+
new file mode 100644
index 000000000..1d3096f6b
--- /dev/null
+++ b/libre/grub/20_memtest86+
@@ -0,0 +1,29 @@
+#! /bin/sh -e
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system. #
+########################################################
+
+prefix="/usr"
+exec_prefix="${prefix}"
+
+datarootdir="/usr/share"
+datadir="${datarootdir}"
+
+. "${datadir}/grub/grub-mkconfig_lib"
+
+MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then
+ # image exists, create menu entry
+ echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2
+ cat << EOF
+menuentry "Memory test (memtest86+)" $CLASS {
+EOF
+ prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /"
+ cat << EOF
+ linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE`
+}
+EOF
+fi
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 7b9198d8d..8a1c01434 100644..100755
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,107 +1,250 @@
-# $Id: PKGBUILD 141999 2011-11-03 21:16:38Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-pkgname=grub
-pkgver=0.97
-pkgrel=21.3
-pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
+_grub_lua_ver=24
+_grub_ntldr_ver=21
+_grub_915_ver=9
+
+pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
+pkgbase=grub
+pkgver=2.00
+pkgrel=1
+url="https://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnu.org/software/grub/"
-groups=('base')
-depends=('ncurses' 'diffutils' 'sed')
-optdepends=('xfsprogs: freezing of xfs /boot in install-grub script')
-source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
- menu.lst
- install-grub
- 040_all_grub-0.96-nxstack.patch
- 05-grub-0.97-initrdaddr.diff
- i2o.patch
- special-devices.patch
- more-raid.patch
- intelmac.patch
- grub-inode-size.patch
- ext4.patch
- grub-0.97-ldflags-objcopy-remove-build-id.patch)
-backup=('boot/grub/menu.lst')
-install=grub.install
-sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
- 'e13bf0f91510fd6bb9451e6eb1b2a6e4a03e8b5f'
- '3e23bfee50285c8c7b9ef9ec07964310278b1e09'
- '157b81dbad3576536b08642242accfa1aeb093a9'
- 'adbb4685c98797ffb4dc83561ec75698991dddbd'
- 'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc'
- 'c5e2c94ed0e759590b9eb38c9d979f075d19d7c0'
- '45fe668a3779664fb292591f426976b6c784d6c8'
- '066d7ab1ae442f88e94c9e4f1867ac6682965d06'
- '0436aa6fa0b6f768289172f983a3f4b69384629e'
- 'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
- '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
-
-#set destination architecture here
-#DESTARCH="i686"
-DESTARCH="x86_64"
+license=('GPL3')
+makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
+ 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
+
+source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
+ "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
+ "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
+ "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz"
+ 'parabola_grub_mkconfig_fixes.patch'
+ 'grub.default'
+ 'grub.cfg'
+ '20_memtest86+'
+ 'grub_bzr_export.sh')
+
+noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
+ "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
+ "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
+
+sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
+ '89290031b974780c6df76893836d2477d4add895'
+ 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
+ 'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
+ '31aa740fc225b3f3ed4917843038f9e8658a71be'
+ '79a0e597f19e15bd4c256384e0ef998bc6d06cc8'
+ 'fb69af1ff6c0b7fdf7ce7d42d0f048edc1a50a45'
+ 'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
+ '0cfd4e51cdb14a92f06cfd3c607f2aa21f3e55fc')
+
+_build_grub-common_and_bios() {
+
+ ## copy the source for building the common/bios package
+ cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}"
+ cd "${srcdir}/grub_bios-${pkgver}"
+
+ ## Apply Parabola specific fixes to enable grub-mkconfig detect Libre kernels and initramfs
+ patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
+ echo
+
+ ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
+ sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac"
+
+ ## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme
+ sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac"
+
+ ## add the grub-extra sources
+ export GRUB_CONTRIB="${srcdir}/grub_bios-${pkgver}/grub-extras/"
+ install -d "${srcdir}/grub_bios-${pkgver}/grub-extras"
+
+ bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
+ -C "${srcdir}/grub_bios-${pkgver}/grub-extras"
+
+ bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \
+ -C "${srcdir}/grub_bios-${pkgver}/grub-extras"
+
+ bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \
+ -C "${srcdir}/grub_bios-${pkgver}/grub-extras"
+
+ ## Requires python2
+ # sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh"
+
+ ## start the actual build process
+ cd "${srcdir}/grub_bios-${pkgver}"
+ ./autogen.sh
+ echo
+
+ CFLAGS="" ./configure \
+ --with-platform="pc" \
+ --target="i386" \
+ --host="${CARCH}-unknown-linux-gnu" \
+ "${_EFIEMU}" \
+ --enable-mm-debug \
+ --enable-nls \
+ --enable-device-mapper \
+ --enable-cache-stats \
+ --enable-grub-mkfont \
+ --enable-grub-mount \
+ --prefix="/usr" \
+ --bindir="/usr/bin" \
+ --sbindir="/usr/sbin" \
+ --mandir="/usr/share/man" \
+ --infodir="/usr/share/info" \
+ --datarootdir="/usr/share" \
+ --sysconfdir="/etc" \
+ --program-prefix="" \
+ --with-bootdir="/boot" \
+ --with-grubdir="grub" \
+ --disable-werror
+ echo
+
+ CFLAGS="" make
+ echo
+
+}
+
+_build_grub-efi-i386() {
+
+ ## copy the source for building the efi package
+ cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_efi-${pkgver}"
+ cd "${srcdir}/grub_efi-${pkgver}"
+
+ export GRUB_CONTRIB="${srcdir}/grub_efi-${pkgver}/grub-extras/"
+ install -d "${srcdir}/grub_efi-${pkgver}/grub-extras"
+
+ bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
+ -C "${srcdir}/grub_efi-${pkgver}/grub-extras"
+
+ cd "${srcdir}/grub_efi-${pkgver}"
+ ./autogen.sh
+ echo
+
+ CFLAGS="" ./configure \
+ --with-platform="efi" \
+ --target="i386" \
+ --host="${CARCH}-unknown-linux-gnu" \
+ --disable-efiemu \
+ --enable-mm-debug \
+ --enable-nls \
+ --enable-device-mapper \
+ --enable-cache-stats \
+ --enable-grub-mkfont \
+ --enable-grub-mount \
+ --prefix="/usr" \
+ --bindir="/usr/bin" \
+ --sbindir="/usr/sbin" \
+ --mandir="/usr/share/man" \
+ --infodir="/usr/share/info" \
+ --datarootdir="/usr/share" \
+ --sysconfdir="/etc" \
+ --program-prefix="" \
+ --with-bootdir="/boot" \
+ --with-grubdir="grub" \
+ --disable-werror
+ echo
+
+ CFLAGS="" make
+ echo
+}
build() {
- cd $srcdir/$pkgname-$pkgver
- fgrep -rlZ pkglib_DATA --include Makefile.am . | xargs -0 sed -i 's/pkglib_DATA/pkgdata_DATA/g'
-
- # optimizations break the build -- disable them
- # adding special devices to grub, patches are from fedora
- patch -Np1 -i ../special-devices.patch
- patch -Np1 -i ../i2o.patch
- patch -Np1 -i ../more-raid.patch
- patch -Np1 -i ../intelmac.patch
- # Add support for bigger inode size to e2fs_stage1_5
- patch -Np1 -i ../grub-inode-size.patch
- # Add ext4 support
- # http://www.mail-archive.com/bug-grub@gnu.org/msg11458.html
- patch -Np1 -i ../ext4.patch
- # binutils fix
- patch -Np1 -i ../grub-0.97-ldflags-objcopy-remove-build-id.patch
-
- sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
- sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
-
- ## recreate ./configure script with the required changes in LDFLAGS and objcopy
- aclocal
- autoconf
- autoreconf
- automake
-
- #arch64 fixes for static build
- if [ "$CARCH" = "x86_64" ]; then ## correcting problems for new wersion of autotools
-
- echo "this package has to be built on i686, won't compile on x86_64"
- sleep 5
- else
- if [ "$DESTARCH" = "x86_64" ]; then
- # patch from gentoo for fixing a segfault
- patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
- # patch from frugalware to make it boot when more than 2GB ram installed
- patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
- CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
- --mandir=/usr/share/man --infodir=/usr/share/info
- else
- CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
- --mandir=/usr/share/man --infodir=/usr/share/info
- fi
- fi
+
+ ## set architecture dependent variables
+ if [[ "${CARCH}" == 'x86_64' ]]; then
+ _EFIEMU="--enable-efiemu"
+ else
+ _EFIEMU="--disable-efiemu"
+ fi
+
+ _HOST="${CARCH}"
+
+ cd "${srcdir}/grub-${pkgver}"
+ # _get_locale_files
+
+ _build_grub-common_and_bios
+ echo
+
+ _build_grub-efi-i386
+ echo
+
+}
+
+package_grub-common() {
+
+ pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files (Parabola rebranded)"
+ depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse')
+ conflicts=('grub-legacy' 'grub')
+ replaces=('grub2-common')
+ provides=('grub2-common')
+ backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
+ optdepends=('libisoburn: provides xorriso for generating grub rescue iso using grub-mkrescue'
+ 'os-prober: to detect other OSes when generating grub.cfg in BIOS systems'
+ 'mtools: for grub-mkrescue FAT FS support')
+ install="grub.install"
+ options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
+
+ cd "${srcdir}/grub_bios-${pkgver}"
+ make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
+ echo
+
+ ## install extra /etc/grub.d/ files
+ install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+"
+
+ ## install /etc/default/grub (used by grub-mkconfig)
+ install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+
+ ## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here)
+ install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
+
+ # remove platform specific files
+ rm -rf "${pkgdir}/usr/lib/grub/i386-pc/"
+
}
-package() {
- cd $srcdir/$pkgname-$pkgver
+package_grub-bios() {
+
+ pkgdesc="GNU GRand Unified Bootloader - i386 PC BIOS Modules"
+ depends=("grub-common=${pkgver}")
+ options=('!strip' '!emptydirs')
+ replaces=('grub2-bios')
+ provides=('grub2-bios')
+
+ cd "${srcdir}/grub_bios-${pkgver}"
+ make DESTDIR="${pkgdir}/" install
+ echo
+
+ ## remove non platform-specific files
+ rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
+
+ ## remove gdb debugging related files
+ rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
+ rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
+ rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
+
+}
+
+package_grub-efi-i386() {
+
+ pkgdesc="GNU GRand Unified Bootloader - i386 UEFI Modules"
+ depends=("grub-common=${pkgver}" 'dosfstools' 'efibootmgr')
+ options=('!strip' '!emptydirs')
+ replaces=('grub2-efi-i386')
+ provides=('grub2-efi-i386')
+
+ cd "${srcdir}/grub_efi-${pkgver}"
+ make DESTDIR="${pkgdir}/" install
+ echo
+
+ ## remove non platform-specific files
+ rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
- CFLAGS= make
- make DESTDIR=$pkgdir install
- install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst
- install -D -m755 ../install-grub $pkgdir/sbin/install-grub
+ ## remove gdb debugging related files
+ rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true
+ rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true
+ rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
- if [ "$DESTARCH" = "x86_64" ]; then
- # fool makepkg into building a x86_64 package
- export CARCH="x86_64"
- fi
}
diff --git a/libre/grub/fix_stack_pointer_handling_16_relocator.patch b/libre/grub/fix_stack_pointer_handling_16_relocator.patch
new file mode 100644
index 000000000..edc0ef502
--- /dev/null
+++ b/libre/grub/fix_stack_pointer_handling_16_relocator.patch
@@ -0,0 +1,13 @@
+diff --git a/grub-core/lib/i386/relocator16.S b/grub-core/lib/i386/relocator16.S
+index c3768f4..982415d 100644
+--- a/grub-core/lib/i386/relocator16.S
++++ b/grub-core/lib/i386/relocator16.S
+@@ -130,7 +130,7 @@ VARIABLE(grub_relocator16_ss)
+ .byte 0xb8
+ VARIABLE(grub_relocator16_sp)
+ .word 0
+- movw %ax, %ss
++ movzwl %ax, %esp
+
+ /* movw imm32, %edx. */
+ .byte 0x66, 0xba
diff --git a/libre/grub/grub-install.fix b/libre/grub/grub-install.fix
new file mode 100644
index 000000000..29e74bd44
--- /dev/null
+++ b/libre/grub/grub-install.fix
@@ -0,0 +1,11 @@
+=== modified file 'grub-core/kern/emu/hostdisk.c'
+--- grub-core/kern/emu/hostdisk.c 2012-04-18 21:48:52 +0000
++++ grub-core/kern/emu/hostdisk.c 2012-04-19 18:35:06 +0000
+@@ -1081,7 +1081,7 @@
+ {
+ int fd;
+ grub_disk_addr_t max = ~0ULL;
+- fd = open_device (disk, sector, O_RDONLY, &max);
++ fd = open_device (disk, sector, O_WRONLY, &max);
+ if (fd < 0)
+ return grub_errno;
diff --git a/libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch b/libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
new file mode 100644
index 000000000..e1de26859
--- /dev/null
+++ b/libre/grub/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
@@ -0,0 +1,15 @@
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index 859c2e8..c4391dc 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -40,7 +40,9 @@ self=`basename $0`
+ grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"
+ grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
+
+-GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
++if test -z "${GRUB_PREFIX}"; then
++ GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
++fi
+
+ . "${datadir}/@PACKAGE@/grub-mkconfig_lib"
+
diff --git a/libre/grub/grub.cfg b/libre/grub/grub.cfg
new file mode 100644
index 000000000..7f583e102
--- /dev/null
+++ b/libre/grub/grub.cfg
@@ -0,0 +1,139 @@
+#
+# DO NOT EDIT THIS FILE
+#
+# It is automatically generated by grub-mkconfig using templates
+# from /etc/grub.d and settings from /etc/default/grub
+#
+
+### BEGIN /etc/grub.d/00_header ###
+insmod part_gpt
+insmod part_msdos
+if [ -s $prefix/grubenv ]; then
+ load_env
+fi
+set default="0"
+
+if [ x"${feature_menuentry_id}" = xy ]; then
+ menuentry_id_option="--id"
+else
+ menuentry_id_option=""
+fi
+
+export menuentry_id_option
+
+if [ "${prev_saved_entry}" ]; then
+ set saved_entry="${prev_saved_entry}"
+ save_env saved_entry
+ set prev_saved_entry=
+ save_env prev_saved_entry
+ set boot_once=true
+fi
+
+function savedefault {
+ if [ -z "${boot_once}" ]; then
+ saved_entry="${chosen}"
+ save_env saved_entry
+ fi
+}
+
+function load_video {
+ if [ x$feature_all_video_module = xy ]; then
+ insmod all_video
+ else
+ insmod efi_gop
+ insmod efi_uga
+ insmod ieee1275_fb
+ insmod vbe
+ insmod vga
+ insmod video_bochs
+ insmod video_cirrus
+ fi
+}
+
+if [ x$feature_default_font_path = xy ] ; then
+ font=unicode
+else
+insmod part_msdos
+insmod ext2
+set root='hd0,msdos5'
+if [ x$feature_platform_search_hint = xy ]; then
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467
+else
+ search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
+fi
+ font="/usr/share/grub/unicode.pf2"
+fi
+
+if loadfont $font ; then
+ set gfxmode=auto
+ load_video
+ insmod gfxterm
+ set locale_dir=$prefix/locale
+ set lang=en_US
+ insmod gettext
+fi
+terminal_input console
+terminal_output gfxterm
+set timeout=5
+### END /etc/grub.d/00_header ###
+
+### BEGIN /etc/grub.d/10_linux ###
+menuentry 'Parabola GNU/Linux-libre, with Linux-libre core repo kernel' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' {
+ load_video
+ set gfxpayload=keep
+ insmod gzio
+ insmod part_msdos
+ insmod ext2
+ set root='hd0,msdos5'
+ if [ x$feature_platform_search_hint = xy ]; then
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467
+ else
+ search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
+ fi
+ echo 'Loading Linux libre core repo kernel ...'
+ linux /boot/vmlinuz-linux-libre root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet
+ echo 'Loading initial ramdisk ...'
+ initrd /boot/initramfs-linux-libre.img
+}
+menuentry 'Parabola GNU/Linux-libre, with Linux libre repo kernel (Fallback initramfs)' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' {
+ load_video
+ set gfxpayload=keep
+ insmod gzio
+ insmod part_msdos
+ insmod ext2
+ set root='hd0,msdos5'
+ if [ x$feature_platform_search_hint = xy ]; then
+ search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467
+ else
+ search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
+ fi
+ echo 'Loading Linux libre core repo kernel ...'
+ linux /boot/vmlinuz-linux-libre root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet
+ echo 'Loading initial ramdisk ...'
+ initrd /boot/initramfs-linux-libre-fallback.img
+}
+
+### END /etc/grub.d/10_linux ###
+
+### BEGIN /etc/grub.d/20_linux_xen ###
+### END /etc/grub.d/20_linux_xen ###
+
+### BEGIN /etc/grub.d/20_memtest86+ ###
+### END /etc/grub.d/20_memtest86+ ###
+
+### BEGIN /etc/grub.d/30_os-prober ###
+### END /etc/grub.d/30_os-prober ###
+
+### BEGIN /etc/grub.d/40_custom ###
+# This file provides an easy way to add custom menu entries. Simply type the
+# menu entries you want to add after this comment. Be careful not to change
+# the 'exec tail' line above.
+### END /etc/grub.d/40_custom ###
+
+### BEGIN /etc/grub.d/41_custom ###
+if [ -f ${config_directory}/custom.cfg ]; then
+ source ${config_directory}/custom.cfg
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then
+ source $prefix/custom.cfg;
+fi
+### END /etc/grub.d/41_custom ###
diff --git a/libre/grub/grub.default b/libre/grub/grub.default
new file mode 100644
index 000000000..2ceb40543
--- /dev/null
+++ b/libre/grub/grub.default
@@ -0,0 +1,47 @@
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="Parabola GNU/Linux-libre"
+GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+GRUB_CMDLINE_LINUX=""
+
+# Preload both GPT and MBR modules so that they are not missed
+GRUB_PRELOAD_MODULES="part_gpt part_msdos"
+
+# Uncomment to enable Hidden Menu, and optionally hide the timeout count
+#GRUB_HIDDEN_TIMEOUT=5
+#GRUB_HIDDEN_TIMEOUT_QUIET=true
+
+# Uncomment to use basic console
+GRUB_TERMINAL_INPUT=console
+
+# Uncomment to disable graphical terminal
+#GRUB_TERMINAL_OUTPUT=console
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+GRUB_GFXMODE=auto
+
+# Uncomment to allow the kernel use the same resolution used by grub
+GRUB_GFXPAYLOAD_LINUX=keep
+
+# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
+# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+GRUB_DISABLE_RECOVERY=true
+
+# Uncomment and set to the desired menu colors. Used by normal and wallpaper
+# modes only. Entries specified as foreground/background.
+GRUB_COLOR_NORMAL="magenta/black"
+GRUB_COLOR_HIGHLIGHT="white/magenta"
+
+# Uncomment one of them for the gfx desired, a image background or a gfxtheme
+#GRUB_BACKGROUND="/path/to/wallpaper"
+#GRUB_THEME="/path/to/gfxtheme"
+
+# Uncomment to get a beep at GRUB start
+#GRUB_INIT_TUNE="480 440 1"
+
+#GRUB_SAVEDEFAULT="true"
diff --git a/libre/grub/grub.install b/libre/grub/grub.install
index c1f077d59..9188b357a 100644..100755
--- a/libre/grub/grub.install
+++ b/libre/grub/grub.install
@@ -1,20 +1,33 @@
-infodir=/usr/share/info
-filelist=(grub.info multiboot.info)
+infodir="usr/share/info"
+filelist=('grub.info' 'grub-dev.info')
post_install() {
- [ -x usr/bin/install-info ] || return 0
+ if [ -f /boot/grub/grub.cfg.pacsave ]; then
+ echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
+ install -D -m0644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
+ fi
+
+ cat << 'EOM'
+Generating grub.cfg.example config file...
+This may fail on some machines running a custom kernel.
+EOM
+
+ grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
+ echo "done."
+
for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null
done
}
post_upgrade() {
- post_install $1
+ for file in ${filelist[@]}; do
+ install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null
+ done
}
pre_remove() {
- [ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ install-info --delete ${infodir}/${file} ${infodir}/dir 2> /dev/null
done
}
diff --git a/libre/grub/grub2.install b/libre/grub/grub2.install
new file mode 100644
index 000000000..000533553
--- /dev/null
+++ b/libre/grub/grub2.install
@@ -0,0 +1,33 @@
+infodir=usr/share/info
+filelist=(grub.info grub-dev.info)
+
+post_install() {
+ if [ -f /boot/grub/grub.cfg.pacsave ]; then
+ echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
+ install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
+ fi
+
+ cat << 'EOM'
+Generating grub.cfg.example config file...
+This may fail on some machines running a custom kernel.
+EOM
+
+ grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
+ echo "done."
+
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+pre_remove() {
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
diff --git a/libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch b/libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
new file mode 100644
index 000000000..0e396b210
--- /dev/null
+++ b/libre/grub/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
@@ -0,0 +1,134 @@
+diff --git a/ChangeLog_Keshav b/ChangeLog_Keshav
+new file mode 100644
+index 0000000..0eafd65
+--- /dev/null
++++ b/ChangeLog_Keshav
+@@ -0,0 +1,12 @@
++2012-01-04 Keshav P R <the.ridikulus.rat@gmail.com>
++
++ Fixes for automake 1.11.2
++
++ * conf/Makefile.common: Change pkglib_SCRIPTS to pkgdata_SCRIPTS.
++ * conf/Makefile.common: Change pkglib_DATA to pkgdata_DATA.
++ * Makefile.am: Likewise.
++ * gentpl.py: Likewise.
++ * util/grub-mkstandalone.in: Likewise.
++ * util/grub-mknetdir.in: Likewise.
++ * util/grub-mkrescue.in: Likewise.
++ * util/grub-mkstandalone.in: Likewise.
+diff --git a/Makefile.am b/Makefile.am
+index c5f486e..395b0dd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h
+ # Install config.h into platformdir
+ platform_HEADERS = config.h
+
+-pkglib_DATA += grub-mkconfig_lib
+-pkglib_DATA += update-grub_lib
++pkgdata_DATA += grub-mkconfig_lib
++pkgdata_DATA += update-grub_lib
+
+
+ if COND_i386_coreboot
+diff --git a/conf/Makefile.common b/conf/Makefile.common
+index 751188b..bbd59cc 100644
+--- a/conf/Makefile.common
++++ b/conf/Makefile.common
+@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES =
+
+ man_MANS =
+ noinst_DATA =
+-pkglib_DATA =
++pkgdata_DATA =
+ bin_SCRIPTS =
+ sbin_SCRIPTS =
+ bin_PROGRAMS =
+@@ -147,7 +147,7 @@ check_SCRIPTS =
+ grubconf_DATA =
+ check_PROGRAMS =
+ noinst_SCRIPTS =
+-pkglib_SCRIPTS =
++pkgdata_SCRIPTS =
+ noinst_PROGRAMS =
+ grubconf_SCRIPTS =
+ noinst_LIBRARIES =
+diff --git a/gentpl.py b/gentpl.py
+index 3008b80..a935f4d 100644
+--- a/gentpl.py
++++ b/gentpl.py
+@@ -512,7 +512,7 @@ def script(platform):
+ r += "[+ ENDIF +]"
+
+ r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
+-$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
++$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+ """)
+
+diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
+index e5a2172..7f6a36d 100644
+--- a/util/grub-mknetdir.in
++++ b/util/grub-mknetdir.in
+@@ -30,7 +30,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
+ host_os=@host_os@
+ localedir=@datadir@/locale
+ datarootdir=@datarootdir@
+-pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
++pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
+
+ self=`basename $0`
+
+@@ -183,7 +183,7 @@ process_input_dir ()
+ cp -f "$file" "$grubdir/"
+ fi
+ done
+- for file in ${pkglib_DATA}; do
++ for file in ${pkgdata_DATA}; do
+ if test -f "${input_dir}/${file}"; then
+ cp -f "${input_dir}/${file}" "$grubdir/"
+ fi
+diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
+index eff7708..f6b96d4 100644
+--- a/util/grub-mkrescue.in
++++ b/util/grub-mkrescue.in
+@@ -27,7 +27,7 @@ libdir=@libdir@
+ PACKAGE_NAME=@PACKAGE_NAME@
+ PACKAGE_TARNAME=@PACKAGE_TARNAME@
+ PACKAGE_VERSION=@PACKAGE_VERSION@
+-pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
++pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
+
+ self=`basename $0`
+
+@@ -163,7 +163,7 @@ process_input_dir ()
+ cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/
+ fi
+ done
+- for file in ${pkglib_DATA}; do
++ for file in ${pkgdata_DATA}; do
+ if test -f "${input_dir}/${file}"; then
+ cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/
+ fi
+diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
+index b0dbf9b..92b7306 100644
+--- a/util/grub-mkstandalone.in
++++ b/util/grub-mkstandalone.in
+@@ -27,7 +27,7 @@ libdir=@libdir@
+ PACKAGE_NAME=@PACKAGE_NAME@
+ PACKAGE_TARNAME=@PACKAGE_TARNAME@
+ PACKAGE_VERSION=@PACKAGE_VERSION@
+-pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
++pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
+
+ self=`basename $0`
+
+@@ -163,7 +163,7 @@ for file in "${source_directory}/"*.mod "${source_directory}/"efiemu32.o "${sour
+ fi
+ done
+
+-for file in ${pkglib_DATA}; do
++for file in ${pkgdata_DATA}; do
+ if test -f "${source_directory}/${file}"; then
+ cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/
+ fi
diff --git a/libre/grub/grub2_bzr_export.sh b/libre/grub/grub2_bzr_export.sh
new file mode 100644
index 000000000..f40588f82
--- /dev/null
+++ b/libre/grub/grub2_bzr_export.sh
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+## For actual repos
+
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution
+
+## For launchpad mirror
+
+# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-lua lua
+# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-gpxe gpxe
+# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-ntldr-img ntldr-img
+# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-915resolution 915resolution
+
+## grub-extras zfs is integrated into grub2 bzr main repo and is no longer needed separately.
+
+_WD="${PWD}/"
+_OUTPUT_DIR="${_WD}/"
+
+_ACTUAL_PKGVER="1.99"
+
+_GRUB2_BZR_REPO_DIR="${_WD}/grub2_BZR/"
+_GRUB2_BZR_EXP_REPO_DIR="${_WD}/grub2_experimental_BZR/"
+_GRUB2_EXTRAS_REPOS_DIR="${_WD}/grub2_extras_BZR/"
+
+_MAIN_SNAPSHOT() {
+
+ cd "${_GRUB2_BZR_REPO_DIR}/"
+ echo
+
+ _REVNUM="$(bzr revno ${_GRUB2_BZR_REPO_DIR})"
+ bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub2_r${_REVNUM}.tar"
+ echo
+
+ cd "${_OUTPUT_DIR}/"
+
+ xz -9 "${_OUTPUT_DIR}/grub2_r${_REVNUM}.tar"
+ echo
+
+}
+
+_EXP_SNAPSHOT() {
+
+ cd "${_GRUB2_BZR_EXP_REPO_DIR}/"
+ echo
+
+ _REVNUM="$(bzr revno ${_GRUB2_BZR_EXP_REPO_DIR})"
+ bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub2_exp_r${_REVNUM}.tar"
+ echo
+
+ cd "${_OUTPUT_DIR}/"
+
+ xz -9 "${_OUTPUT_DIR}/grub2_exp_r${_REVNUM}.tar"
+ echo
+
+}
+
+_EXTRAS_SNAPSHOT() {
+
+ cd "${_GRUB2_EXTRAS_REPOS_DIR}/${_GRUB2_EXTRAS_NAME}/"
+ echo
+
+ _REVNUM="$(bzr revno ${_GRUB2_EXTRAS_REPOS_DIR}/${_GRUB2_EXTRAS_NAME})"
+ bzr export --root="${_GRUB2_EXTRAS_NAME}" --format=tar "${_OUTPUT_DIR}/grub2_extras_${_GRUB2_EXTRAS_NAME}_r${_REVNUM}.tar"
+ echo
+
+ cd "${_OUTPUT_DIR}/"
+ echo
+
+ xz -9 "${_OUTPUT_DIR}/grub2_extras_${_GRUB2_EXTRAS_NAME}_r${_REVNUM}.tar"
+ echo
+
+}
+
+echo
+
+set -x -e
+
+echo
+
+_MAIN_SNAPSHOT
+
+echo
+
+# _EXP_SNAPSHOT
+
+echo
+
+_GRUB2_EXTRAS_NAME="lua"
+_EXTRAS_SNAPSHOT
+
+_GRUB2_EXTRAS_NAME="gpxe"
+_EXTRAS_SNAPSHOT
+
+_GRUB2_EXTRAS_NAME="ntldr-img"
+_EXTRAS_SNAPSHOT
+
+_GRUB2_EXTRAS_NAME="915resolution"
+_EXTRAS_SNAPSHOT
+
+echo
+
+set +x +e
+
+echo
+
+unset _WD
+unset _OUTPUT_DIR
+unset _GRUB2_BZR_REPO_DIR
+unset _GRUB2_EXTRAS_REPOS_DIR
+unset _GRUB2_EXTRAS_NAME
diff --git a/libre/grub/grub_bzr_export.sh b/libre/grub/grub_bzr_export.sh
new file mode 100644
index 000000000..ff8f99ecc
--- /dev/null
+++ b/libre/grub/grub_bzr_export.sh
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+
+## For actual repos
+
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution
+
+## For launchpad mirror
+
+# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-lua lua
+# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-gpxe gpxe
+# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-ntldr-img ntldr-img
+# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-915resolution 915resolution
+
+## grub-extras zfs is integrated into grub bzr main repo and is no longer needed separately.
+
+_WD="${PWD}/"
+_OUTPUT_DIR="${_WD}/"
+
+_ACTUAL_PKGVER="2.00"
+
+_GRUB_BZR_REPO_DIR="${_WD}/grub_mainline_BZR/"
+_GRUB_BZR_EXP_REPO_DIR="${_WD}/grub_experimental_BZR/"
+_GRUB_EXTRAS_REPOS_DIR="${_WD}/grub_extras_BZR/"
+
+_MAIN_SNAPSHOT() {
+
+ cd "${_GRUB_BZR_REPO_DIR}/"
+ echo
+
+ _REVNUM="$(bzr revno ${_GRUB_BZR_REPO_DIR})"
+ bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar"
+ echo
+
+ cd "${_OUTPUT_DIR}/"
+
+ xz -9 "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar"
+ echo
+
+}
+
+_EXP_SNAPSHOT() {
+
+ cd "${_GRUB_BZR_EXP_REPO_DIR}/"
+ echo
+
+ _REVNUM="$(bzr revno ${_GRUB_BZR_EXP_REPO_DIR})"
+ bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar"
+ echo
+
+ cd "${_OUTPUT_DIR}/"
+
+ xz -9 "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar"
+ echo
+
+}
+
+_EXTRAS_SNAPSHOT() {
+
+ cd "${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME}/"
+ echo
+
+ _REVNUM="$(bzr revno ${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME})"
+ bzr export --root="${_GRUB_EXTRAS_NAME}" --format="tar" "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar"
+ echo
+
+ cd "${_OUTPUT_DIR}/"
+ echo
+
+ xz -9 "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar"
+ echo
+
+}
+
+echo
+
+set -x -e
+
+echo
+
+_MAIN_SNAPSHOT
+
+echo
+
+# _EXP_SNAPSHOT
+
+echo
+
+_GRUB_EXTRAS_NAME="lua"
+_EXTRAS_SNAPSHOT
+
+# _GRUB_EXTRAS_NAME="gpxe"
+# _EXTRAS_SNAPSHOT
+
+_GRUB_EXTRAS_NAME="ntldr-img"
+_EXTRAS_SNAPSHOT
+
+_GRUB_EXTRAS_NAME="915resolution"
+_EXTRAS_SNAPSHOT
+
+echo
+
+set +x +e
+
+echo
+
+unset _WD
+unset _OUTPUT_DIR
+unset _GRUB_BZR_REPO_DIR
+unset _GRUB_EXTRAS_REPOS_DIR
+unset _GRUB_EXTRAS_NAME
diff --git a/libre/grub/grub_extras_lua_args_fix.patch b/libre/grub/grub_extras_lua_args_fix.patch
new file mode 100644
index 000000000..5cb317ce3
--- /dev/null
+++ b/libre/grub/grub_extras_lua_args_fix.patch
@@ -0,0 +1,13 @@
+diff --git a/grub-extras/lua/grub_lib.c b/grub-extras/lua/grub_lib.c
+index 9014320..055d620 100644
+--- a/grub-extras/lua/grub_lib.c
++++ b/grub-extras/lua/grub_lib.c
+@@ -466,7 +466,7 @@ grub_lua_add_menu (lua_State *state)
+ if (! p)
+ return push_result (state);
+
+- grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, p, 0);
++ grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, NULL, p, 0);
+ }
+ else
+ {
diff --git a/libre/grub/parabola-mkconfig.patch b/libre/grub/parabola-mkconfig.patch
new file mode 100644
index 000000000..7c18a4cc2
--- /dev/null
+++ b/libre/grub/parabola-mkconfig.patch
@@ -0,0 +1,32 @@
+diff -ru grub-1.99.orig/util/grub.d/10_linux.in grub-1.99/util/grub.d/10_linux.in
+--- grub-1.99.orig/util/grub.d/10_linux.in 2011-08-11 15:54:52.051246328 +0200
++++ grub-1.99/util/grub.d/10_linux.in 2011-08-11 15:55:41.297910793 +0200
+@@ -134,7 +134,7 @@
+
+ case x`uname -m` in
+ xi?86 | xx86_64)
+- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do
++ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* /boot/vmlinuz26 ; do
+ if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+ done` ;;
+ *)
+@@ -163,7 +163,8 @@
+ "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+ "initramfs-genkernel-${version}" \
+ "initramfs-genkernel-${alt_version}" \
+- "${basename/vmlinuz/kernel}.img"; do
++ "${basename/vmlinuz/kernel}.img" \
++ "${basename/vmlinuz/initramfs}.img"; do
+ if test -e "${dirname}/${i}" ; then
+ initrd="$i"
+ break
+@@ -194,7 +195,8 @@
+ linux_entry "${OS}" "${version}" false \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
+ for i in "initramfs-${version}-fallback.img" \
+- "${basename/vmlinuz/kernel}-fallback.img"; do
++ "${basename/vmlinuz/kernel}-fallback.img" \
++ "${basename/vmlinuz/initramfs}-fallback.img"; do
+ if test -e "${dirname}/${i}"; then
+ initrd="$i"
+ linux_entry "${OS}" "${version}" true \
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
new file mode 100644
index 000000000..19022aec6
--- /dev/null
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -0,0 +1,152 @@
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index 516be86..5f37db2 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -213,6 +213,8 @@ export GRUB_DEFAULT \
+ GRUB_THEME \
+ GRUB_GFXPAYLOAD_LINUX \
+ GRUB_DISABLE_OS_PROBER \
++ GRUB_COLOR_NORMAL \
++ GRUB_COLOR_HIGHLIGHT \
+ GRUB_INIT_TUNE \
+ GRUB_SAVEDEFAULT \
+ GRUB_ENABLE_CRYPTODISK \
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index 765bfdc..b148558 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -115,6 +115,14 @@ cat <<EOF
+
+ EOF
+
++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
++ cat << EOF
++set menu_color_normal=$GRUB_COLOR_NORMAL
++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
++
++EOF
++fi
++
+ serial=0;
+ gfxterm=0;
+ for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 14402e8..64c9bb5 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -31,7 +31,7 @@
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+ OS=GNU/Linux
+ else
+- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++ OS="${GRUB_DISTRIBUTOR}"
+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+ fi
+
+@@ -87,6 +87,8 @@ linux_entry ()
+ case $type in
+ recovery)
+ title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
++ fallback)
++ title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;;
+ *)
+ title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
+ esac
+@@ -100,7 +102,7 @@ linux_entry ()
+ else
+ echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
+ fi
+- if [ x$type != xrecovery ] ; then
++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then
+ save_default_entry | sed -e "s/^/\t/"
+ fi
+
+@@ -132,7 +134,8 @@ linux_entry ()
+ fi
+ printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
+ fi
+- message="$(gettext_printf "Loading Linux %s ..." ${version})"
++
++ message="$(gettext_printf "Loading Linux %s ..." "${version}")"
+ sed "s/^/$submenu_indentation/" << EOF
+ echo '$message'
+ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do
+ alt_version=`echo $version | sed -e "s,\.old$,,g"`
+ linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+
++ if test -e "/etc/arch-release" ; then
++ if echo "${basename}" | grep -q 'vmlinuz-linux' ; then
++ version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`"
++
++ if [ "x${version}" = "x" ] ; then
++ version="core repo kernel"
++ else
++ version="`echo "${version}" | sed -e 's,-,,g'`"
++ version="${version} kernel"
++ fi
++ fi
++ fi
++
+ initrd=
++ initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`"
++
+ for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
+ "initrd-${version}" "initramfs-${version}.img" \
+ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do
+ "initramfs-genkernel-${version}" \
+ "initramfs-genkernel-${alt_version}" \
+ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+- "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
++ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
++ "${initrd_arch}.img" ; do
+ if test -e "${dirname}/${i}" ; then
+ initrd="$i"
+ break
+@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do
+ linux_root_device_thisversion=${GRUB_DEVICE}
+ fi
+
++ if test -e "/etc/arch-release" ; then
++ is_first_entry="false"
++
++ linux_entry "${OS}" "${version}" true \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++
++ for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do
++ if test -e "${dirname}/${i}" ; then
++ initrd="${i}"
++ linux_entry "${OS}" "${version}" fallback \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++ break
++ fi
++ done
++ fi
++
+ if [ "x$is_first_entry" = xtrue ]; then
+ linux_entry "${OS}" "${version}" simple \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
+@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do
+ echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
+ fi
+
++ if ! test -e "/etc/arch-release" ; then
+ linux_entry "${OS}" "${version}" advanced \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++ fi
++
+ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
+ linux_entry "${OS}" "${version}" recovery \
+ "single ${GRUB_CMDLINE_LINUX}"
+@@ -252,8 +290,10 @@ done
+
+ # If at least one kernel was found, then we need to
+ # add a closing '}' for the submenu command.
++if ! test -e "/etc/arch-release" ; then
+ if [ x"$is_first_entry" != xtrue ]; then
+ echo '}'
+ fi
++fi
+
+ echo "$title_correction_code"
diff --git a/libre/grub2/05_archtheme b/libre/grub2/05_archtheme
index 4d1b6fb20..4d1b6fb20 100644..100755
--- a/libre/grub2/05_archtheme
+++ b/libre/grub2/05_archtheme
diff --git a/libre/grub2/20_memtest86+ b/libre/grub2/20_memtest86+
index 1d3096f6b..1d3096f6b 100644..100755
--- a/libre/grub2/20_memtest86+
+++ b/libre/grub2/20_memtest86+
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index a5051900f..5b1769f95 100644..100755
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -1,19 +1,17 @@
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-_grub_bzr_rev="4232"
-_pkgver="2.00~beta4"
+_pkgver="2.00~rc1"
_grub_lua_ver=24
-_grub_gpxe_ver=12
_grub_ntldr_ver=21
_grub_915_ver=9
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase=grub2
-pkgver=2.00beta4
-pkgrel=1
+pkgver=2.00rc1
+pkgrel=1.1
url="http://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
@@ -24,30 +22,26 @@ makedepends=('rsync' 'xz' 'bdf-unifont' 'python' 'autogen' 'texinfo'
# source=("ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz"
source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
- "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
"ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz"
'parabola_grub_mkconfig_fixes.patch'
'grub.default'
'grub.cfg'
- '20_memtest86+'
- 'grub-install.fix')
+ '20_memtest86+')
noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
- "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
"grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
"grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
-sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11'
+sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13'
'89290031b974780c6df76893836d2477d4add895'
- 'b04994c005910b4bf123f034b30109d5c8d6fd86'
'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
'31aa740fc225b3f3ed4917843038f9e8658a71be'
- '348b148d5183825f31a3d24a7ebf2d6a709f4e6a'
+ '9a81f8bebcbee3d300315a29266ce7a5c9e5881c'
'9735043d518e16f147f64ef283eceb2549fed860'
- 'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
- '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7')
+ 'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
+
_build_grub2-common_and_bios() {
## copy the source for building the common/bios package
@@ -58,10 +52,6 @@ _build_grub2-common_and_bios() {
patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
echo
- ## upstream grub-install fix
- ## http://lists.gnu.org/archive/html/help-grub/2012-04/msg00096.html
- patch -Np0 -i "${srcdir}/grub-install.fix"
-
## add the grub-extra sources
export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/"
install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras"
@@ -69,9 +59,6 @@ _build_grub2-common_and_bios() {
bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
- bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \
- -C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
-
bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \
-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
@@ -130,9 +117,6 @@ _build_grub2-efi-i386() {
bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-C "${srcdir}/grub_efi-${_pkgver}/grub-extras"
- bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \
- -C "${srcdir}/grub_efi-${_pkgver}/grub-extras"
-
## Requires python2
# sed 's|python |python2 |g' -i "${srcdir}/grub_efi-${_pkgver}/autogen.sh"
@@ -204,7 +188,7 @@ package_grub2-common() {
options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
cd "${srcdir}/grub_bios-${_pkgver}"
- make DESTDIR="${pkgdir}/" install
+ make bashcompletiondir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}/" install
## install extra /etc/grub.d/ files
install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+"
diff --git a/libre/grub2/fix_stack_pointer_handling_16_relocator.patch b/libre/grub2/fix_stack_pointer_handling_16_relocator.patch
index edc0ef502..edc0ef502 100644..100755
--- a/libre/grub2/fix_stack_pointer_handling_16_relocator.patch
+++ b/libre/grub2/fix_stack_pointer_handling_16_relocator.patch
diff --git a/libre/grub2/grub-install.fix b/libre/grub2/grub-install.fix
index 29e74bd44..29e74bd44 100644..100755
--- a/libre/grub2/grub-install.fix
+++ b/libre/grub2/grub-install.fix
diff --git a/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch b/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
index e1de26859..e1de26859 100644..100755
--- a/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
+++ b/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
diff --git a/libre/grub2/grub.cfg b/libre/grub2/grub.cfg
index 6e60c70c4..6e60c70c4 100644..100755
--- a/libre/grub2/grub.cfg
+++ b/libre/grub2/grub.cfg
diff --git a/libre/grub2/grub.default b/libre/grub2/grub.default
index 4ab37bbfc..d0c959059 100644..100755
--- a/libre/grub2/grub.default
+++ b/libre/grub2/grub.default
@@ -34,8 +34,8 @@ GRUB_DISABLE_RECOVERY=true
# Uncomment and set to the desired menu colors. Used by normal and wallpaper
# modes only. Entries specified as foreground/background.
-#GRUB_COLOR_NORMAL="light-blue/black"
-#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
+GRUB_COLOR_NORMAL="magenta/black"
+GRUB_COLOR_HIGHLIGHT="white/magenta"
# Uncomment one of them for the gfx desired, a image background or a gfxtheme
#GRUB_BACKGROUND="/path/to/wallpaper"
diff --git a/libre/grub2/grub2.install b/libre/grub2/grub2.install
index 000533553..000533553 100644..100755
--- a/libre/grub2/grub2.install
+++ b/libre/grub2/grub2.install
diff --git a/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch b/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
index 0e396b210..0e396b210 100644..100755
--- a/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
+++ b/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
diff --git a/libre/grub2/grub2_bzr_export.sh b/libre/grub2/grub2_bzr_export.sh
index f40588f82..f40588f82 100644..100755
--- a/libre/grub2/grub2_bzr_export.sh
+++ b/libre/grub2/grub2_bzr_export.sh
diff --git a/libre/grub2/grub_extras_lua_args_fix.patch b/libre/grub2/grub_extras_lua_args_fix.patch
index 5cb317ce3..5cb317ce3 100644..100755
--- a/libre/grub2/grub_extras_lua_args_fix.patch
+++ b/libre/grub2/grub_extras_lua_args_fix.patch
diff --git a/libre/grub2/parabola-mkconfig.patch b/libre/grub2/parabola-mkconfig.patch
index 7c18a4cc2..7c18a4cc2 100644..100755
--- a/libre/grub2/parabola-mkconfig.patch
+++ b/libre/grub2/parabola-mkconfig.patch
diff --git a/libre/grub2/parabola_grub_mkconfig_fixes.patch b/libre/grub2/parabola_grub_mkconfig_fixes.patch
index 19022aec6..19022aec6 100644..100755
--- a/libre/grub2/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub2/parabola_grub_mkconfig_fixes.patch
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
new file mode 100644
index 000000000..2e0658cfb
--- /dev/null
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
+# 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.2
+pkgrel=1
+pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
+arch=(
+ i686
+ x86_64
+ mips64el
+)
+license=(
+ LGPL
+)
+url="http://gstreamer.freedesktop.org/"
+depends=(
+ celt
+ chromaprint
+ curl
+ faad2
+ gst-plugins-base-libs
+ libdca
+ libdvdnav
+ libgme
+ libmms
+ libmodplug
+ mjpegtools
+ mpg123
+ opus
+ soundtouch
+ spandsp
+)
+makedepends=(
+ libdvdread
+ libexif
+ libmpeg2
+ libvdpau
+ schroedinger
+)
+provides=(
+ $pkgbase=$pkgver
+)
+conflicts=(
+ $pkgbase
+)
+replaces=(
+ $pkgbase
+)
+options=(
+ '!libtool'
+ '!emptydirs'
+)
+source=(
+ "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz"
+)
+sha256sums=(
+ 9e503305799a2b6eb9d0b77c59b8aa8bbe9e6eb815a0635bd013560c73996579
+)
+
+build() {
+ cd $pkgbase-$pkgver
+ sed -i '/AC_PATH_XTRA/d' configure.ac
+ autoreconf
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-static --enable-experimental \
+ --with-package-name='GStreamer Bad Plugins Libre (Parabola)' \
+ --with-package-origin='http://www.parabolagnulinux.org/' \
+ --with-gtk=3.0
+ make
+}
+
+check() {
+ cd $pkgbase-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgbase-$pkgver
+ make DESTDIR=$pkgdir install
+}
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index c27cf61f9..b74958e3c 100644..100755
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 153262 2012-03-12 17:29:57Z jgc $
+# $Id: PKGBUILD 160766 2012-06-05 08:51:20Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
pkgbase=gstreamer0.10-bad-libre
pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
pkgver=0.10.23
-pkgrel=1.2
+pkgrel=2
arch=('i686' 'x86_64')
license=('LGPL' 'GPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi')
url="http://gstreamer.freedesktop.org/"
options=(!libtool !emptydirs)
source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz)
@@ -26,10 +26,15 @@ build() {
sed -e 's/gst sys ext/gst/' -i Makefile
}
+# Disable for now: 2 tests fail, one of them is because of not having a camera during build.
+#check() {
+# cd "${srcdir}/gst-plugins-bad-${pkgver}"
+# make check
+#}
+
package_gstreamer0.10-bad-libre() {
pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)"
depends=('gstreamer0.10-base>=0.10.34')
- groups=('gstreamer0.10-plugins')
provides=("gstreamer0.10-bad=$pkgver")
conflicts=('gstreamer0.10-bad')
replaces=('gstreamer0.10-bad')
@@ -40,7 +45,7 @@ package_gstreamer0.10-bad-libre() {
package_gstreamer0.10-bad-libre-plugins() {
pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)"
- depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg')
+ depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi')
groups=('gstreamer0.10-plugins')
install=gstreamer0.10-bad-plugins.install
provides=("gstreamer0.10-bad-plugins=$pkgver")
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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 e77a2437e..821517397 100644..100755
--- a/libre/h-client/PKGBUILD
+++ b/libre/h-client/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
pkgname=h-client
-_pkgver=0.0a0.dev-r107
+_pkgver=0.0a0.dev-r118
pkgver=${_pkgver/-/.}
pkgrel=1
-pkgdesc="A client for an h-source server (such as http://www.h-node.com)"
+pkgdesc="A client for an h-source server (such as http://www.h-node.org/)"
arch=('any')
url="https://savannah.nongnu.org/projects/h-client/"
license=('GPL3')
@@ -12,8 +12,9 @@ depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk')
options=(!emptydirs)
# Official source is in SVN, this is made by "python2 setup.py sdist"
# on a machine having Subversion 1.6.x (e.g. on Trisquel 4.0).
-source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz")
-sha512sums=('d820871fcf3f92e6e31aa02273ae413bf066524eaf245f1d4cf7dc8b0ba5799eb07bf86dd28861c8878c73147bbcae563668cb3a6fa9c3382c751e6717d85f0c')
+source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz"{,.sig})
+sha512sums=('af962c67b363435cfa74f7c420760b0254ba3e7c1e6611d5ff276e6595e30dadf1b5d588cd2469647efdbb0099f70a027b9f65d8aeefc70ea712c9ef5d7cbace'
+ '7d4746297c4a0bd328b1e57f596e827b4a12d2f703d074f7e87ea0c9e3f747c2cfd48da971e81fdaf27939d463b359fac4638820f08486ef28502e769168692d')
build() {
cd "$srcdir/hclient-${_pkgver}"
diff --git a/libre/hardinfo/.directory b/libre/hardinfo/.directory
deleted file mode 100644
index 725259ee6..000000000
--- a/libre/hardinfo/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,4,11,16,57,42
diff --git a/libre/hardinfo/ChangeLog b/libre/hardinfo/ChangeLog
deleted file mode 100644
index faf242a7b..000000000
--- a/libre/hardinfo/ChangeLog
+++ /dev/null
@@ -1,20 +0,0 @@
-2009-04-06 Eric Belanger <eric@archlinux.org>
-
- * hardinfo 0.5.1-1
- * Upstream update
-
-2009-03-29 Eric Belanger <eric@archlinux.org>
-
- * hardinfo 0.5c-1
- * Upstream update
-
-2008-08-13 Eric Belanger <eric@archlinux.org>
-
- * hardinfo 0.4.2.3-3
- * Rebuilt against gnutls 2.4.1
-
-2008-04-06 Eric Belanger <eric@archlinux.org>
-
- * hardinfo 0.4.2.3-2
- * Rebuilt against libsoup 2.4
- * Added ChangeLog
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
index 47f4c1330..1987e191e 100644..100755
--- a/libre/hardinfo/PKGBUILD
+++ b/libre/hardinfo/PKGBUILD
@@ -1,9 +1,10 @@
# $Id$
# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
pkgname=hardinfo
pkgver=0.5.1
-pkgrel=4
+pkgrel=5
pkgdesc="A system information and benchmark tool."
arch=('i686' 'x86_64')
url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
@@ -12,9 +13,6 @@ depends=('gtk2' 'libsoup')
options=('!emptydirs')
source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \
fixsensors.patch hardinfo.distro)
-md5sums=('6fb38992e140f2fab16518ae1f38e188'
- '05c212db07b9f152cdea052ff7bb28fa'
- '2c609f4b3c7f202d043bdef082c2bef0')
sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
'd2151dce76dca238102937d0e15541f172bca530'
'9425e09191cd3a365a3afce57ca1973a6439fa57')
@@ -25,8 +23,6 @@ build() {
sed -i 's|/usr/lib64|/usr/lib|' configure
./configure --prefix=/usr
sed -i 's|lib64|lib|' binreloc.c
- sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h
- sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h
sed -i 's|{ DB_PREFIX "debian_version", "deb" },|{ DB_PREFIX "hardinfo.distro", "parabola" },{ DB_PREFIX "debian_version", "deb" },|' computer.h
make
}
diff --git a/libre/hardinfo/fixsensors.patch b/libre/hardinfo/fixsensors.patch
index 812c29458..812c29458 100644..100755
--- 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 100644..100755
--- a/libre/hardinfo/hardinfo.distro
+++ b/libre/hardinfo/hardinfo.distro
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 81b24e100..aa7dea706 100644..100755
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,51 +1,69 @@
# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $
+# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer : Rémy Oudompheng <remy@archlinux.org>
# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
-# Contributor (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
_pkgname=hplip
pkgname=hplip-libre
-pkgver=3.12.4
-pkgrel=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
+pkgver=3.12.6
+pkgrel=3
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
arch=('i686' 'x86_64')
url="http://hplipopensource.com"
license=('GPL')
depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
'net-snmp>=5.7.1')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
optdepends=('cups: for printing support'
- 'dbus-python: for dbus support'
+ 'python2-dbus: for dbus support'
'sane: for scanner support'
'python-imaging: for commandline scanning support'
'python-notify: for Desktop notification support'
'rpcbind: for network support'
'python2-pyqt: for running hp-toolbox'
- 'python2-gobject2: for running hp-toolbox')
-replaces=('hpijs' "${_pkgname}")
+ 'python2-gobject2: for running hp-toolbox'
+ 'libusbx: for advanced usb support')
+replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
options=('!libtool')
install=hplip.install
source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('5303938e8630775ea6fb383af85775e5'
+ 'b562457e4c713d8609b3d6dd2be10baf')
build() {
cd "$srcdir/$_pkgname-$pkgver"
export PYTHON=python2
+
find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
sed -i 's|python ./print.py|python2 ./print.py|' scan.py
sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+
+ # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+ local i
+ for i in ppd/hpijs/*.ppd.gz ; do
+ rm -f ${i}.temp
+ gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+ gzip > ${i}.temp || return 1
+ mv ${i}.temp ${i}
+ done
+
export AUTOMAKE='automake --foreign'
autoreconf --force --install
./configure --prefix=/usr \
--enable-qt4 \
- --enable-foomatic-rip-hplip-install \
+ --disable-foomatic-rip-hplip-install \
--enable-foomatic-ppd-install \
--enable-hpcups-install \
--enable-new-hpcups \
@@ -54,7 +72,7 @@ build() {
--enable-hpijs-install \
--enable-foomatic-drv-install \
--enable-pp-build \
- --enable-udev-acl-rules
+ --enable-udev-acl-rules #--help
make
}
@@ -70,5 +88,3 @@ package() {
mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
rm "$pkgdir"/lib -r
}
-md5sums=('a063f76aa47edab55a3f31ff2558df07'
- '2fe18f4091afb3dec200271dc7836128')
diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install
index cb0eaf8e8..74532cde3 100644..100755
--- a/libre/hplip-libre/hplip.install
+++ b/libre/hplip-libre/hplip.install
@@ -8,3 +8,11 @@ NOTE
EOF
}
+
+post_upgrade() {
+ if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
+ # important upgrade notice
+ echo "> Please remove your printer in cups, then add it"
+ echo "> back and reconfigure it to make it work again!"
+ fi
+}
diff --git a/libre/hplip-libre/rePKGBUILD b/libre/hplip-libre/rePKGBUILD
deleted file mode 100644
index 753b348e3..000000000
--- a/libre/hplip-libre/rePKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# This is an example rePKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-CARCH=x86_64
-unset build package md5sums source check
-_repo=extra
-options=(!strip)
-source=(PKGBUILD
- http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
- # files for pkg modifications
- )
-
-build() {
- cd "${srcdir}/"
- rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT || true
- # put actions for package modifications below this line
-}
-
-package() {
- find ${srcdir} -type l -maxdepth 1 -delete
- cp -a ${srcdir}/* ${pkgdir}
-}
diff --git a/libre/iceape-i18n/.gitignore b/libre/iceape-i18n/.gitignore
index 3e1eb57b5..3e1eb57b5 100644..100755
--- a/libre/iceape-i18n/.gitignore
+++ b/libre/iceape-i18n/.gitignore
diff --git a/libre/iceape-i18n/Makefile b/libre/iceape-i18n/Makefile
index 89aaccfdc..89aaccfdc 100644..100755
--- a/libre/iceape-i18n/Makefile
+++ b/libre/iceape-i18n/Makefile
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index 3c0b42b31..6aaa1aa04 100644..100755
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -1,5 +1,6 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Figue <ffigue@gmail.com>
# Based on icecat-i18n package, which is in turn based on firefox-i18n
@@ -10,18 +11,18 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceape
-_debver=2.7.4
-_debrel=2
+_debver=2.7.10
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-_langpacks=(be ca cs de en-GB es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
+_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
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=2.7.4
+_pkgver=2.7.10
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -57,25 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('6d773ee12e9e3475f20f7ae1a13ae60b'
- 'cce134a647f71808c15d3a693c6e0d91'
- '289b5df66a7bf79a900f7033f034b941'
- '90f7836b6dbe752fe0eb6e85be961dad'
- '46f6170f7ca9a0e7d1be7cf2da411089'
- '16fcf9e6c74a25ec164e4d0d9be7a9d4'
- 'ad7eb7ff8ec821d3bb8baedb4c83b9a1'
- '612ed06337160596629f92699bc9dc08'
- '8204487072c23d70c1332c32b75850f1'
- 'd653627ccc8f188d8f908ad60ee9c10d'
- '146e7bb6829b44c9b971d271a9682f47'
- 'eed45ddcec761bb76eec33ca26b8f869'
- '0fb90f7c8de00ddcf7dc500264979cba'
- '3454cfd4e79a7a2ef2a519133f57a5a7'
- '880b81a89f71851f146e3e8bb45c0215'
- 'e219a4a6a277edf7da1ecaf29203887f'
- '9dff81762577df8b105912457a8ebdcd'
- 'a7431be429fc93dc9876e3376441855b'
- '19cb8a522fc38aeabdf375c2118efe7a'
- '7d1e1f279bf3786917b11168251ced57'
- '918022ba06904a99caffa5654a47f8b3'
- '138d693f00d34ed8f943fca053e9e876')
+md5sums=('6499aa420d5fa855a3884c657066c443'
+ 'c4b98806b5a6cce75878bdf0668f5a4a'
+ 'ac1a19ed29bda42f66e533ca9ee79fac'
+ '6116bd1b7c51d9414c68e1807d264f35'
+ '621dc719068050b479ad0fb9060d39e6'
+ 'b184194c4e69dc00ee9f3b15dee71d92'
+ '84058513ab8884d0f279aa2990c10327'
+ '5be7810ca391eb31d26f5ab46c2f8fea'
+ '58737d11a2c0852d6701549d22f071b6'
+ 'ac5994cd318ca2692823f91908eee101'
+ '5a07c756674b24b0b33af1e26a8e59ee'
+ '9178d335fa9f998f157a2e7f27384b15'
+ '2e40229a1ef5386574d98b243260f266'
+ 'ff8c27d6afc9911af03737c23a0eae5d'
+ '611702c6dd5638154ff8a5c99e909da0'
+ '217fd6fd1e46eefb524457566f124074'
+ '09bb4d6d36403f97b923625055767884'
+ 'cebd80d880c87862d9a8baf97c3c5b7b'
+ '023750f204d9f0ac89c62987b41532f4'
+ '0d753213210d92a8f751b3221fe34dad'
+ '4b180802effa63316c54e5ec904405c7'
+ '8be48ada576dfd9a37e6b3c0bc55c298'
+ 'af08b7f96b175c560bba71ab59e1a3dc')
diff --git a/libre/iceape-i18n/PKGBUILD.in b/libre/iceape-i18n/PKGBUILD.in
index 6891b2672..6891b2672 100644..100755
--- a/libre/iceape-i18n/PKGBUILD.in
+++ b/libre/iceape-i18n/PKGBUILD.in
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 9099fb270..eedd8f584 100644..100755
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer : Márcio Silva <coadde@adinet.com.uy>
-# Maintainer : André Silva <andre.paulista@adinet.com.uy>
+# Maintainer : Márcio Silva <coadde@lavabit.com>
+# Maintainer : André Silva <emulatorman@lavabit.com>
# We're getting this from Debian Sid
_debname=iceape
-_debver=2.7.4
-_debrel=2
+_debver=2.7.10
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -29,13 +29,13 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
${_pkgname}-2.0-lang.patch
clrf.patch
libre.patch)
-md5sums=('aedc7546db1fdc50cc9c5f21a7ad6138'
- '4519446d9f23885dd748a59dfbbfa0a4'
+md5sums=('63596601fd01000c842d9543ea8dfd56'
+ 'f8de6b9e1906c8349e8799f819503897'
'60ba9e8f2fafd20e41268af534a55ea7'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
'c395d443a8c4c16880c7322bcf174743'
- '79f99d8cda03dbcc1e88ef96776f591a')
+ '433b5cd7f02f0ed8861237e877f51ebf')
build() {
export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/clrf.patch b/libre/iceape-libre/clrf.patch
index 375708ac4..375708ac4 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 fef11cbad..d25f8dbf5 100644..100755
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -1,15 +1,17 @@
--- comm-release.orig/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-02-16 12:08:39.000000000 -0200
-+++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-05-12 05:03:27.306166002 -0300
-@@ -1,45 +1,23 @@
++++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 23:23:02.484406177 -0300
+@@ -1,23 +1,23 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
++browser.search.defaultenginename=Duck Duck Go (Lite)
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-browser.search.order.2=Yahoo
-browser.search.order.3=Bing
-+browser.search.order.1=DuckDuckGo
++browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.2=Seeks Search
++browser.search.order.3=YaCy
# This is the default set of web based feed handlers shown in the reader
# selection UI
@@ -17,41 +19,50 @@
-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
-browser.contentHandlers.types.1.title=My Yahoo!
-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-+browser.contentHandlers.types.0.title=DuckDuckGo
-+browser.contentHandlers.types.0.uri=https://duckduckgo.com/search_box.html
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
# 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=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=http://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/lite/?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 webcal:
+@@ -27,19 +27,19 @@
+ gecko.handlerService.defaultHandlersVersion=3
+
+ # The default set of protocol handlers for webcal:
-gecko.handlerService.schemes.webcal.0.name=30 Boxes
-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
--
--# The default set of protocol handlers for mailto:
++gecko.handlerService.schemes.webcal.0.name=
++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
+
+ # The default set of protocol handlers for mailto:
-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
-gecko.handlerService.schemes.mailto.1.name=Gmail
-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
--
--# The default set of protocol handlers for irc:
++gecko.handlerService.schemes.mailto.0.name=
++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
++gecko.handlerService.schemes.mailto.1.name=
++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
+
+ # The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Mibbit
-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
--
--# The default set of protocol handlers for ircs:
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
+
+ # The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Mibbit
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.defaultHandlersVersion=0
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
--- comm-release.orig/mozilla/modules/libpref/src/init/all.js 2012-03-16 04:46:09.000000000 -0300
+++ comm-release/mozilla/modules/libpref/src/init/all.js 2012-05-12 04:03:52.163831535 -0300
@@ -47,7 +47,7 @@
@@ -59,7 +70,7 @@
// The first character after a period must be alphabetic.
-pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
@@ -107,18 +118,23 @@
</wizardpage>
</wizard>
---- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-05-12 04:10:18.982249044 -0300
-@@ -4,7 +4,7 @@
+--- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-06-16 00:28:27.000000000 -0300
++++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-06-16 00:52:31.135268099 -0300
+@@ -4,10 +4,10 @@
#
browser.startup.homepage=about:
browser.throbber.url=about:
-browser.search.defaulturl=http://www.google.com/search?q=
-+browser.search.defaulturl=http://duckduckgo.com/?q=
++browser.search.defaulturl=https://duckduckgo.com/lite/?q=
+
+-browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
+-browser.translation.serviceDomain=translate.google.com
++browser.translation.service=about:blank
++browser.translation.serviceDomain=
- browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
- browser.translation.serviceDomain=translate.google.com
-@@ -15,7 +15,5 @@
+ #config.js
+ #
+@@ -15,7 +15,7 @@
# This is the default set of web based feed handlers shown in the reader
# selection UI
@@ -126,24 +142,27 @@
-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
-browser.contentHandlers.types.1.title=My Yahoo!
-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-+browser.contentHandlers.types.0.title=DuckDuckGo
-+browser.contentHandlers.types.0.uri=https://duckduckgo.com/search_box.html
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
--- comm-release.orig/suite/locales/en-US/chrome/common/region.properties 2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-05-12 05:49:20.084819625 -0300
-@@ -1,10 +1,9 @@
++++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-06-15 23:46:27.744272972 -0300
+@@ -1,10 +1,10 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
++browser.search.defaultenginename=Duck Duck Go (Lite)
# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Google
-browser.search.order.2=Yahoo
-+browser.search.order.1=DuckDuckGo
++browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.2=Seeks Search
# More information about this update link available in the update wizard.
# Only change this if you are providing localized release notes.
-app.update.url.details=http://www.seamonkey-project.org/releases/
-+app.update.url.details=http://packages.debian.org/source/sid/iceape
++app.update.url.details=about:
--- comm-release.orig/suite/locales/en-US/chrome/mailnews/region.properties 2012-02-16 11:59:54.000000000 -0200
+++ comm-release/suite/locales/en-US/chrome/mailnews/region.properties 2012-05-12 04:28:05.202481512 -0300
@@ -2,9 +2,9 @@
@@ -153,9 +172,9 @@
-messenger.throbber.url=http://www.seamonkey-project.org/
-compose.throbber.url=http://www.seamonkey-project.org/
-addressbook.throbber.url=http://www.seamonkey-project.org/
-+messenger.throbber.url=about:blank
-+compose.throbber.url=about:blank
-+addressbook.throbber.url=about:blank
++messenger.throbber.url=about:
++compose.throbber.url=about:
++addressbook.throbber.url=about:
# To make mapit buttons to disappear in the addressbook, specify empty string. For example:
# mail.addr_book.mapit_url.format=
# The format for "mail.addr_book.mapit_url.format" is:
@@ -168,21 +187,12 @@
- <DT><A HREF="http://www.google.com/">Google</A>
- <DT><A HREF="http://groups.google.com/">Google Groups</A>
- <DT><A HREF="http://news.google.com/">Google News</A>
-+ <DT><A HREF="http://duckduckgo.com/">DuckDuckGo</A>
++ <DT><A HREF="https://duckduckgo.com/lite/">Duck Duck Go (Lite)</A>
</DL><p>
#unfilter emptyLines
---- comm-release.orig/suite/browser/browser-prefs.js 2012-02-16 11:59:53.000000000 -0200
-+++ comm-release/suite/browser/browser-prefs.js 2012-05-12 04:19:25.031793983 -0300
-@@ -67,7 +67,7 @@
-
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
- pref("browser.startup.page", 1);
--pref("browser.startup.homepage", "chrome://navigator-region/locale/region.properties");
-+pref("browser.startup.homepage", "about:blank");
- pref("browser.startup.homepage.count", 1);
-
- pref("browser.warnOnQuit", true);
+--- comm-release.orig/suite/browser/browser-prefs.js 2012-10-17 11:29:38.687716662 -0200
++++ comm-release/suite/browser/browser-prefs.js 2012-10-17 11:39:01.778002338 -0200
@@ -110,7 +110,7 @@
pref("browser.doorhanger.enabled", true);
@@ -207,7 +217,7 @@
// getMoreThemes is used by our UI under our switch theme menu
pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
-@@ -716,7 +715,7 @@
+@@ -715,7 +715,7 @@
#endif
// plugin finder service url
@@ -238,8 +248,8 @@
spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries
-app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
-app.vendorURL=http://www.seamonkey-project.org/
-+app.releaseNotesURL=http://packages.debian.org/source/sid/iceape
-+app.vendorURL=http://packages.debian.org/source/sid/iceape
++app.releaseNotesURL=about:
++app.vendorURL=about:
--- comm-release.orig/suite/locales/generic/profile/bookmarks.html.in 2012-02-16 11:59:54.000000000 -0200
+++ comm-release/suite/locales/generic/profile/bookmarks.html.in 2012-05-12 04:40:19.221095752 -0300
@@ -11,37 +11,14 @@
@@ -251,9 +261,9 @@
- <DT><A HREF="http://www.mozilla.org/">@mozilla_org@</A>
- <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
- <DT><A HREF="http://www.mozdev.org/">@mozdev@</A>
-+ <DT><A HREF="https://parabolagnulinux.org/">Parabola GNU/Linux-libre</a>
-+ <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A>
-+ <DT><A HREF="http://libreplanet.org/">LibrePlanet</A>
++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</a>
++ <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
++ <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A>
</DL><p>
- <DT><H3>@seamonkey_and_mozilla@</H3>
+ <DT><H3>GNUzilla</H3>
@@ -281,8 +291,8 @@
- <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
- <DT><A HREF="http://forums.mozillazine.org/viewforum.php?f=40">@seamonkey_support@</A>
- </DL><p>
-+ <DT><A HREF="http://www.gnu.org/software/gnuzilla/">GNUzilla and IceCat</a>
-+ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</a>
++ <DT><A HREF="http://www.gnu.org/software/gnuzilla/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">GNUzilla and IceCat</a>
++ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</a>
</DL><p>
#include bookmarks.extra
<HR>
diff --git a/libre/iceape-libre/mozconfig b/libre/iceape-libre/mozconfig
index 5227d77a5..5227d77a5 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/libre/icecat-i18n/Makefile
+++ b/libre/icecat-i18n/Makefile
diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD
index f995939da..aebc6cef0 100644..100755
--- a/libre/icecat-i18n/PKGBUILD
+++ b/libre/icecat-i18n/PKGBUILD
@@ -1,7 +1,9 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Figue <ffigue@gmail.com>
-# Contributor: emulatorman <andre.paulista@adinet.com.uy>
+# Maintainer : Márcio Silva <coadde@lavabit.com>
+# Maintainer : André Silva <emulatorman@lavabit.com>
+
# Based on firefox-i18n package
# When updating to a newer upstream release:
@@ -9,122 +11,230 @@
# - (optionally) edit PKGBUILD.in
# - Run 'make'. It will take care of everything else for you.
-_langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg 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-LK ta te th tr uk vi zh-CN zh-TW zu)
+_langpacks=(
+ af
+ ak
+ ar
+ as
+ ast
+ be
+ bg
+ bn-BD
+ bn-IN
+ br
+ bs
+ ca
+ cs
+ csb
+ cy
+ da
+ de
+ el
+ en-GB
+ en-US
+ 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-LK
+ ta
+ te
+ th
+ tr
+ uk
+ vi
+ zh-CN
+ zh-TW
+ zu
+)
-pkgbase='icecat-i18n'
-pkgname=($(for lang in ${_langpacks[@]}
- do echo icecat-i18n-$lang | tr A-Z a-z
- done))
-_pkgver=10.0
-pkgver=10.0
+pkgbase=icecat-i18n
+pkgname=(
+ $(for lang in ${_langpacks[@]}
+ do echo icecat-i18n-$lang | tr A-Z a-z
+ done)
+)
+_pkgver=14.0
+pkgver=14.0
pkgrel=1
-pkgdesc="Language packs for GNUzilla IceCat."
-arch=('any')
-license=('MPL')
-url="http://www.gnu.org/software/gnuzilla/"
-depends=("icecat=${pkgver}")
-source=($(for lang in ${_langpacks[@]}
- do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi
- done))
-noextract=($(for lang in ${_langpacks[@]}
- do echo $lang.xpi
- done))
+pkgdesc='Language packs for GNUzilla IceCat.'
+arch=(
+ any
+)
+license=(
+ MPL
+)
+url=http://www.gnu.org/software/gnuzilla/
+depends=(
+ ${pkgbase%-i18n}=$pkgver
+)
+source=(
+ $(for lang in ${_langpacks[@]}
+ do echo http://ftp.gnu.org/gnu/gnuzilla/lang/$pkgver/$lang.xpi
+ done)
+)
+noextract=(
+ $(for lang in ${_langpacks[@]}
+ do echo $lang.xpi
+ done)
+)
build() {
- cd "${srcdir}"
+ cd $srcdir
}
-_path="/usr/lib/icecat-$_pkgver/extensions/"
+_path=/usr/lib/${pkgbase%-i18n}/extensions/
for lang in ${_langpacks[@]}
do
eval "
package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
- install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
+ install -Dm644 $srcdir/$lang.xpi \"\${pkgdir}\"'${_path}langpack-${lang}@firefox.mozilla.org.xpi'
}
"
done
-md5sums=('6d4c69921bbdfe92c0fd31873983d426'
- '4e994c70c93e4d266d273d2358f7acf3'
- 'd783c592edfa96d6abecd1efa1aa1b5e'
- '70b8badcddb6d5cf6b226c0f0141b463'
- 'bcfe52114b1c0f5346594452117bec5d'
- '7d8900839fcf5972a91c4ce1a1bdd7c6'
- 'd9720bf726a8f6fde0dc94e6e73863a9'
- 'ce61734ab226dc041b55e95c9b6f9d92'
- '965c2ec576ac41e7351e159f516ec65f'
- '4feb78e0dd79606f416b8ab46432ad41'
- '61989146fe89320c847e4de6261a06ff'
- '260f3abb8612248493060e2dec6f0a22'
- '6b49d830c47717001250236c9cc933a5'
- '338137d425c8e6ae98796f3cc9a0550f'
- '4ddf33cc1af9d3ad483d8fc47609aee3'
- 'e04918865a21260b8eaf27b3dc84ade5'
- '59961e347c4fe3816f809f456bc9a2b8'
- '262ad46f6c6e8a89eb29b590cc092eb9'
- 'e9452d83d914605f06c055c00325bf6b'
- 'ae652d7db9b3cd3cba85306d16a7a599'
- '04fec5cd927a57ac6c9780a9f42444e1'
- '70ba3ec972f01e75b144e106afacd8ac'
- 'f1ee7deccf3c73083b51c5741722b120'
- 'ca5566a24ee4fd38a3a907bfb5d72975'
- 'd4717e5c3e44fbaebe4eaf99f0195120'
- '907c42bdaa3af02c39bef5d83198f8a9'
- '7afa1ac8645657722cdf3415244e4686'
- 'd3d780b6c8d179c68065d9bec19dce48'
- '09fae6ea53f5435ccfdbf41f660378ee'
- '043306182ec497280b3ea78dcbd7b7d3'
- '8a481d0d41f22d5bc65ed7844a0d7c27'
- '2a8648998f2aafd307511e043cd8564d'
- 'e7fbc4b7364d151edac9840b90949f56'
- 'e2ea49277375825f612bcfb225dcb0a0'
- '9fb2a20a2222a0d814a3f48d7208d820'
- '88976bac6b9e647f4d17ab1638f12601'
- 'a6a39406914459deaefb3403e94dfa39'
- 'd3acecff63909d946fb549520785ef99'
- 'a8327a1a525330ca9ef8e3f9d50ca5f8'
- 'ba3ad9e8843b0de408a72896183985d6'
- '3dfb48ecea5eda9f0e3e05295eb3c82b'
- '95a1e7e2ec604409b54f1ded4ee7accf'
- '69ebeb59c7ff4e0452c9f0998db65ef0'
- '7bdf97288cef0d14ff1521db063cd20c'
- '8f50cfa1e8c788b7b839273848dc2834'
- '3aa0631dc6a53581cf53d559b27a0ee3'
- '45e7238e0d0e427df04d3ba91ca045cd'
- 'b992cfa2b0440486cd70fd6ab9e32deb'
- '3a9fac821e039556f7d009080daec643'
- '6872abed4f4d4b81cf5f0b7b656846c7'
- 'eb44e902c6a6186c85dca8aff1d5b95f'
- '21f5aeacbb233167218ab7f1b34efdce'
- 'b97e29d866ae1ed422d0a1c4327cfd49'
- '5cce41015e73c36944224f827ac5a8d1'
- 'a13ac7293acc75015f0034d77ddb0f30'
- '38c84e214af65ed6f059ad524c923dc9'
- '66c8d82875f55f67167048e3d6888d8f'
- '4ec423b8e34a4de058b115fd5918e0b2'
- '0026e20db1bad1eaf692bd0b2043c038'
- '31f029a6665ccae9b4c8cac9eda06c6f'
- 'e72ffe020543ca0ad4f8be2aad9e90a9'
- '7b75e8fb1cd8ae34023b312d2214029a'
- '88b1a96268e08f65579b2fe6d7677b73'
- '4418d687e4dcb313fd59247844eab93c'
- 'b200a045163b7c09cde85b82013fec98'
- '263f6ff19491b68865bcab4309dff0a8'
- '80d0fb352eb1f252c355d3b8388d3513'
- 'dd79b0c4d959f46852e1e23b0cc984af'
- 'db51a6767331bb3a8c0a1e0f5f35d968'
- '3155d4cafe5f90ec83336ddd07183629'
- 'b9246693498e1ec3c5b4dffa8145d04e'
- '770bf78f2a0c6522e641e61e44617b40'
- 'aadf3a6f9517c76e2b37867cb1a654c6'
- '3530c75b3c2311d8127f20df7bd724da'
- 'ef3bfc5db8197edb095da10390d8e058'
- '46b701b2db7415b30b82023bb707e1dc'
- '24da3bee4042e31da5781b02dc089499'
- 'b3faadcabfd6d738a41ee4c12696adcd'
- '9938f231ce13202d040c24783c95c35b'
- '04894f460b81525d29367f1ed1504f5e'
- 'c6049613b48eaaa71c45df2e44db1087'
- '7e7e81ca9c6d44913d37159b4627967c'
- '1a80a20da9cc26e2edd942d77a35c824')
+sha512sums=(
+ 765390ba04d88b4b56cebab007f9f593e33c54fe3cd8dbbafdb48171db68e23cd4e1c3d8360f2ef641a537e27f1d6db1aa8a0bdade854d3151359ecab6676af9
+ 2b21f849299e7185163ce99e91aa612f64094cdf792bb855eb8836be940c0ef1cdfd33da080a793def714874810b269373f0c80830f42919f967417356efb86f
+ 86a79b1a785c967d56bb492a1c5867c42ac00832813a72027cc0a51dd940c1020dc7c911109efd9eb4ef1a9d996eea6382cd0a03a6a53e3347f909a28a3a943d
+ 727e3f44812c9c56620b7871fcffb28ebabef460fc52f483402fae787d90f3f197703e0bbde689a744e1135602b5ee765023402e0d365812e8521f8cf9dd2791
+ 06989be3fd8d73f7887dae3bac7b0bdc80c7a11b7e6c8630da0ee4652f0ffbd60e01c049242ab3b61555f84485ce9b2f098c80cf6dba41538442cdc5cbdded9b
+ bc9e19e9e216df4acb8d9bccae2e0e426ab402998934ad9393cf86a2a81c6d20c7ba622d1f312dd70a62c8659b611421904ba0aa5aa7e3eb7ece5ed578cbdd81
+ f12d343a5b5f9f35d3d112f041baa29919bfda8bf4c22353ac899ee65eda438c6a9ed243e7a03fb659aff0f9c448bfa5146807b8d3eafa9dd7b8384d7a0d8124
+ 11cedfcd91a550fa1f65d1eca4ebac97ecd7c823e7a41e74f908ae1dc0b36b7cbb0c91c2640de5a0ba61c6820c0101c195bb31482376880025b494b280c7274d
+ 51f0b5e575f99b718b5ca96416148cced3a2c3fcd512e7135d3062fbc6e3c0ede86cb5bbda4a0bed43f6bd73d5c493a97c5bfbf373a92edb48b4a299b27a4f4d
+ de166d28ba81758d002712c408eada0ca5955e9b6275bc5f491177496f79f8de9dd5d5cd10cda5bc7671c56d7b5d15e136910d671da58ab1363b4dae769b58c9
+ 79c0d107c1c61cd6281e0c545f10389a9968b7f49f27a4ff531c729c608cfff9107430f6d7b323a9f00cd2259ef5787db817b7aaa226272e7347413e0a50be83
+ a1f5399254c5ce261468dbf539072371a51796de02331e173f8c44704f95d7784280115f7ba1deb46874caeccdeb925d9fe540dc8b5ada5970df6274a06f3429
+ 11a278717f5da5a6d284242863bda3142ba4263946104fdbd86545f741127a368138bd4f7d0bd7bf377795d5d36fc61544b585dc044d5a6ddf93ce077f1e747f
+ 34a995016f4d7bff5c972bb4ef252a0ddac4f0b36943c7e4f8fbb899827aec307a081a7a30f1cb1fdf8c84af82f8f32675c57c45c39f7e47f21aacb75438be48
+ fc5d410a903912f05886c4573a3b199efae22f8c9810a7bfc6acf8b5851b1791d97bd562a9c77204b7cf9091e0731ffe332c640d8693165f69cb934e8d523e04
+ ab03d3e5391f806b6733078501d8a767cf2267d126cba284d473de21a7c976e55bd7ba63e3489336232ee9f5a7672b8c436e19adcfc68fe2a69db4e08b6f4b19
+ fa55b4a26a346c21f0b98c137c4fabbd7aaaa61de45da89ca26c78044d23be8333f2d0c849ec5a34ff7517a556a979ee98b1ce87f02174fcb695632bbbb5edeb
+ 1ac410bd9b30d917b77ebac3ba08e25adaa4a20a6a77d13229a0efedca7a3b650777a6ca71675fde69f06137b09150dd2dee89760b93801dcf14b2801e6e5ad8
+ 0b37ef6936f78c0384c36be7ad174cb90b5ca55b77128de6cdb6663de191144392728fccabc2baca25cb2d0f1ba69b80598bbf531e18b473a9515b553c1f594c
+ e2d4d6f1fc470d17dfc35b193c20f23b07dfbe54cad1b4f47d2f534493ea297dbdaf15e6c9b1556049c2db314dde66701a0624ef8af8f85f9cebbbf30f50ab3f
+ c3874b81b84de34fd9cfbb8b009dd033e57ffc726f7b607d895a917e4eb7ef9770ec0e24e0c41cdcd82f29c8140438101c1d1263ee64fbe0117c6b1510c0ed54
+ e06f5da5fd157045be13459635b881cd09c92cc5f56af7d745afbdb52889ff18e23a75475331cc13471d9e7aefe157f43ae83074856d81e4f4ad0a9b275d58a5
+ f04c77b037b04bf69929cdd712126b6c08a786d7a66181b3e536ca97c750506963b699dd8c4374fc01a86e694100f3fd9ed15d88ada0ef52364f492c5f61bb16
+ f538442bf340e7856522288498de54a28dd0b25f36ad7897d1e444e46e98d17c0e5432c6f40e02c49cacacbe5b6b87a4db0dfec3f79e52df91ef278e15afdd73
+ 9154c78adb5ec3d4c5dcb69bd61fb2b9a98a908f3fb6344ca5ba2ac96145ab8e770ad786b2c704f522c9f6cf61fdaf256e309e85bf105bbd83df892840804fca
+ 5c80bddaf0e51984034aac3d211327f89209673cceee5fc30dc4d9958cf44f564ce7aae995795987885c560a427a0098958fdcbf4534f5c84ec9778a3cd555c5
+ 1d8a8a3fe5b2ade77dbd7b6f7fee74cd82452ec4eeee42bcb590b6f919fbccd9d345dc1ac2c171d265882e3583b6826778df73713e23df4c4ca66cfed594971b
+ 6d060b98e0a1d27b87d2e3b4c038756897af223759a53e3ce31beca9244d27f71610e5bc87ffbc5c53aced569165067ebf07720e33ee2ac27105a981dbc201d4
+ 646eaaedec5aca57f26c0e1a8cc415e1607efc72a1f37205c40a22ee38e334ec138851375b0091c5d5ea5d8c5d7a2e2e90422e6aec0ddf6079a46f09696911b0
+ a7619e2cd951f2b6c87f54386159fbffe5ef3895b05ac5422c76403b8cfd31b05ce98e3dd1532b79e81629adab828149c7154ba861d0bd4760a24ba74a8f4293
+ 06dc48e0368927111fc7b4d3ea86c1a8a3a4b077fe0bddd434cf388c9048d2ea0cbd6184becfb2d02005c2e3ed6351e019a086a705c558a8e1e2df0a2816516f
+ 5b2120ffe02f469c1b52f0c4d9255619781aeac36e40c8df700707c955118ec298b78474ac2a17cf9d2823f049e9e15596fc58c4cffb5ac07315f9a73f7e2ad3
+ c3141419942b85f93b2d6f5643544987f57e2805f1586c40ba91b814876cdf635f2500d350ad2a335cf440405716ed8e212221a7a9140cd8a4c3edee67fd3658
+ 5fab16a0210bb6d6bcd18701ec0ff669bf5a971dd9f6953186864e09758ca37283af88c7dfec120cef87b9372bad61ac76d8248dad2bea68ca86b3a6410bc446
+ d793679d2b51ecf41c0265e9bd9549d8bdae7d1db2afee631088bbf0aee314f16037840fcef8a1241519b952cdebec7f3eecedf3583ccdb92514d855d8577eb8
+ bf658f472d23871cb3b54f9100bf3e935985625b4607330dff318315b9b56eae913c020ec69b0465f6a5cb3ac508e39bc0597e65cc940c20db7a63e3728dd632
+ be75a19e56a39b597a88133071ca8f8d8ad2931d9accf47db3370d72c5d0dc9fd1c206f70ba64643a1657198ee930eb8884f36e2f9a2e7dbafb9bcd624c1c993
+ b2ba8025736c7c8b40661826908c046e9ba8d61c1f273594d043c56f62dec39ed8e27c428a9444b946c2f638bdf60af5b9c5bd90b578d37dcdd884a9b0766d83
+ cb140b72c26eb8e0d150cfac0da9a74932f2764911764d2ba326a6c059547e8e6ad1a5b5f6630b55f8dff1290182672c0c6016cf863b22a0e17524a79c1b835e
+ 5b6426c3c68ead2e9dd4975d18d671bdead44e455ee2802935fa34d153a9a651af765f25731ff0cd462823c85e60b3ad13b9e4a340c80e5b6435d9cb74545a89
+ 03501a4808ba5cb0c9a94b61843a33604fde88d00bac2cc0e141975cef5ccc2ad4de219bcc077b92191fa45ba228dff3920c206add564a4331ccfbe02a8f69db
+ 5277580baa12169d15396ee08d019f5a1fa4cca86ba52e0e2dd05b0f497599cd5c560638ed502b842328c3e767a0f2bffcb6cfdbeada4d7613ff9f9040bd416f
+ 6656d0508d65c6e860fe66f5d1180c6040f03ac0579a85dded1f3e2b3d26341be4da8c423029927443ac99dfd52a954aa21f1a06a729ecaa4dca1522ccdd9333
+ 4dcc6b8f1305d3b9ee3b6f90a92d169d8c9a3d6aec52b92c320a9cad88fc7c26567a343e201d943c56e721c587d2bbd74bbcfdb29fc0a2691f85e9262fad5dbd
+ 046b6d47386940892f07a10f564b9bbd0fdf7094a0e1f468f42d4b33514d8122b54a78fd6de09ad442a497eba266ad459733a86eda417c87db91d988c9d1ce2d
+ 0334bb286b560fa28ce9763868110970043155a24f6fec9b01611639add7b2f98781692d4ef84244d67c91afe477a9b1984aaedcba570ad0169c77d904cf865f
+ 6dda8b0cd0b5862520812ad2e2d4a5ee7d4be030565dcec55cefb0ff3eb960fb1f18aa52ee437d96890ccc35483d93b4fa684ea042cbb530d038d99770e45760
+ 5ba5df20669dd3b337dae8de5f909def9747f4c22c041108ca30398ff59004c4a37dbfe88c243d55af23ef85fbe4509d4a4ddda772626f5170573f89a6f7990b
+ 9dd8b244130b291d16390fabf3470235892ae2506f7020fb5e1a3dcf142a5f771e3ebc91a6b14036721dd216751764a2d5cd74a6f60db92cdbe62e97f69d6af5
+ a64ef951b6f0e23d8407414b9c1a5f5c8eabf89d7680fcbedb5acb70a9ca7e4c3253437e2af23c4287ecb5638587bceed4a87edc990056b26199e8cd9b955275
+ 57459b8e13110e89acaa042a3c7bcfdde40c8f5e7fe00277f38960e23a9e750b1a85fba35fff29c8eca0d0d6c2e38a357cc2692a80af70feef8816225a88805b
+ 33cd4be72524c0d0877760a882c79e47fff8036e455103a2587d2eb694715f081a5c95355a8a536df08da4a62c8872001db2a9a1431fe9803d2267a3e02334e9
+ 5e653ab0eb49e89408b51f34a549f0f1ac20868d121f9688f04a53788748b69f7f4628355fb23de6c1f69aefbb244d646debf345bed8f98a9f16f1fbd785f116
+ 04bcfcf4683ff0f0596e703ea280d843d42f5e883a7c252518c1cc1953b7a7391b38adcab720a020164fa6adfbdfc8f40255109641880c83815b4b5bdb218378
+ 6d550a3a1b4e1c375e6754e0e81e049bb10c04ec87614266123076dbc71b518bac4dc03233c7f8fb022302e1d5f7ed0064efdf6a21a98d17b8b0600b04b540fb
+ a8a14d0095ed6cb5b6e06f9737cbd7923c4fbce394671e510e275198312144706fa3e3063f4f57a3cd4ec9b08714f8e6b9d01943613b0147502be77647cc9440
+ 3fa8938e38ea904b31a086b7cf8221b5ec4aa3c125fab79a9c88e68cc799595117d2199b6fc80e8b7cc1a809e1a10c230a929f420e4ef25bbd04775a0dfd52e1
+ 1cb6fca6e8214603b1d60f5c0a187514b002704d33811ce229129a223fd63d55b4aafb1ccd1ed21d003f32b983bff8f785c74b488673edb8a5027f336dfde5d4
+ 6566215d680dabf8184ba6edd33ddeeec09d2e2544250e7cf5026c4ea420de6273568056ac403739649d1f2636764459525b847f9d6e21ff860d211bdd3a0eed
+ 2c085539c1ab882b0370b2112d517b8f1be1f5869560fa5c0242ccc159c01b9f1c770593e72cafa6eecc3e3e623fe33a9901b2e0d576d98c85219122cdb34317
+ 1f7e9eb6351e8de6b709c0a31b1cfcbfa108288da5b5b99ea88235e568b84ee0a3eabd8814c5f4b9935caca467f4a8e4531317ba8abf2d6d3121def8682fa961
+ fde912f0a7cfac59fad72a56ddfe6c7ff10fc51a53ac5b89229f08f18c4ff689eb15d2980d32433b640f62941e7b38c4bf147b7728c22849fb04da46a13ec707
+ e8b4de904e52503028ba50ec96fc4cf151ccae03bf42240c680204fa1794233374db6a4cc3a2e13965c28af2984be9f55288b0a9f522ec0d1ae738829da04b52
+ 5bf071de14dce19ef5faa4b0b35a0618eb65093283c22d4da16b45839b6b3cfd4314fb8173f419dd3596b9684fd7c6ca1258098e0b9c4167b1546987c0e93b1e
+ ba0af0ad267b49e2890e77568882eae7d34846208472bfa3299934ae6d40a9864e39340a8228dd6215988a3238dd59dc84856e0d7cb4375601b0018683e867e7
+ 3aac042bc0107e8f5d25009266f61272edbb70cad3dd0e984344738995a2119df247a4664bbd1c2bf9f7f889d0f8cb7039b6e852208f2f0c6040ef8953072cc4
+ 8c1621ad105104b6dff50fa769c2504d66ef0d1c716f954ab1eb83742efad48be22ec718d4520a262bc733b42c72ef1a0085d1a1868124c5c18a1b4141b89041
+ 1da09d13349b54f21ccaa46c0d96c320ee940af10591755a55e8953187a6159b1e1ebe087e3061888dbdc43ee767ed59259312d10e04f1374c45a715d09935ff
+ f0430e711a97bc9b0603620ac4a9adf7f63916c5ccdea3db588679df6a36fc4ccf7a17c9f581f7fab679002c50e4f0b8708ae5a2ee9bce4cb1d39bcc2dc05aef
+ bef2db0771b5f7053366d0a2f4fc9cce96649af1aec497bb5f38b9fd3affa0fc662a194d2f69f8cc49121037350690b6506da6f6659c41bef734089c8c7da784
+ b7585ac1320f12915f01359a573eeff3524fbe24a583476f12a18ce16389c00802f4e48ebc2d4ecdb002dbcca97a44ad5721b0445bcfe0dee220f7d90abef4a5
+ 59e278a846484b7c57c978b66658031d23dfc297f63bd756f82701b700906f74322de60988cd481a84c48a7d5e828e411e2ca7e4e58f7f695016b6ffbd680af1
+ 21dc4bcdece71d8d310e179c010dc6c4b089ab55315ba7c67aee7da5a93b3ffc22f27e0c10087137c594adf1114abdbeda2424d5ee8c4944e6ad2a780d93acfb
+ bf16ae0501316c61656147bdff8140e9f75bfbc9ee625e791b11531d019a6431d9c9ee4110f2d566ae4f11c8d6d4d035c3ebed1a0f6ee0d98f2ede52bcc91e16
+ 32161e5a951c353456564b6b0a203e148986322eccf7169630bda6fe8e3913485d431940595a27ff3e9ed71d3a9f2b2a2fd2835363e5db69a2982273e321186c
+ 01f6d21908175d58123faa91ec0545a173226052632ef636a3b6ded2b77bd6554532eb94e2a87ae2a64ef62cceacf3fc800360232b11a51cc91dfde4397190d8
+ 8f8275d5a4582b524a6dd31ee81afffe1ca8371a87f50cfb663ab397a5906f6ad485b7ed7c49781af9bce82ef5e34f2d3de883ed45a5972ccb187cdbdae9c7c7
+ 7183274b7d97652ae635a971dd539d46d16a397eac1f3e51c93c53fb8abfd6eb01cdfd41f7c951847291b033a17e6566ea2b9a629dc5796f012bf1993ca14b40
+ b35822f1b09062a9c5b6fa41e036657f68def07a15ee9d5f078d372fdc17bb36fa42f08c1a3ed73bb7eb63d290041f441a580c19ee1f2fe789575aa6361b0293
+ c9d05ac24a63799805ebe257c11675c1400a014e0d8c408a02e9b3842ec7bf40922a76120297b6796bba3adff0d2449abe1068085176f0deec0463756e3b5c3d
+ 28ff49291b5cfc51acd878fee3e2de6693bc060ac8f4b1233d44cd5797bf2815c0a563f07decd38647d384f183fb9f945e1040d77bfde4503320a5af2b91482f
+ 8a137bc5d30e662a28fb809615ebf480503e278a5882aa81b71260d8c548b73e0401e458a6dc4cf0e9e9a61bbadb72a5d8c4e636d7ce616672bf7f10bd4dc810
+ cfa399cf459b2487f260a7287b1ddfcbc8ecde9bda160f6f8036bbff7389a383be5acadbfad092b72cbf7d77d8b053fbe98b3df0ae6f01029b92e78bbbf681ba
+ 5553b2e0193fe0aa65cc88171b5358949906ee01292bc2b2aaf1bc7c330b703d998901999aa5dd923861886b589411b221ae00fc3323cc3bb23068dd21220601
+ 502426fc851b9ce8782a7c73b6024492b8e7a46764eaaf2a3b4fef7546312dde9ae9d6a83619f93c3fa96e85767d0cae668f3f9d4cf16427d9b8e7f55163df41
+ 5b48c402f4ac36366d157a30db3c36e0bbbf6f8601a498ef0d7cfac4899ed5a168826caae7427f949cef7c54fada0c4886b5f7b7c9efb933fc246781845d5db4
+ e8b0a1580757da961551580dcb83fe5dca1a99e446fc9b0bf302e7eded06f4ad795650743b387c0ce05840f238940e0013019b4b36d9eaff1272057fe2949c0a
+ b2d8be6934966c477c07f6c7fbe341148b7cdb75aeb51ac0fbe15b72c933a2886454057237ae968a3ce7d3d8b7132b8d9f488dac8e68f6ed451c608c17738f27
+)
diff --git a/libre/icecat-i18n/PKGBUILD.in b/libre/icecat-i18n/PKGBUILD.in
index 90c901e31..90c901e31 100644..100755
--- a/libre/icecat-i18n/PKGBUILD.in
+++ b/libre/icecat-i18n/PKGBUILD.in
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 79274ce21..fd050fb27 100644..100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -3,7 +3,8 @@
# Contributor: Figue <ffigue at gmail>
# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): emulatorman <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
# Thank you very much to the older contributors:
# Contributor: evr <evanroman at gmail>
@@ -13,138 +14,152 @@
# the value for 'browser.dictionaries.download.url' in 'libre.patch'
_pgo=false
-
-_pkgname=icecat
-pkgver=10.0
-pkgrel=1
-
-if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
-if $_pgo; then
- pkgname+='-pgo'
-fi
-
-pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
+pkgname=icecat
+pkgver=14.0
+pkgrel=2
+pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
+arch=(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'
+ 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.3'
+ sqlite3
+ startup-notification
)
makedepends=(
- 'autoconf2.13'
- 'diffutils'
- 'libidl2'
- 'mesa'
- 'pkg-config'
- 'python2'
- 'unzip'
- 'wireless_tools'
- 'yasm'
- 'zip'
+ autoconf2.13
+ diffutils
+ imagemagick
+ libidl2
+ librsvg
+ libxslt
+ mesa
+ pkg-config
+ python2
+ unzip
+ wireless_tools
+ zip
+)
+optdepends=(
+ 'wireless_tools: Location detection via available WiFi networks'
)
if $_pgo; then
- makedepends+=('xorg-server-xvfb')
+ makedepends+=(xorg-server-xvfb)
options=(!ccache)
fi
-
-url="http://www.gnu.org/software/gnuzilla/"
-install=icecat.install
-source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
- mozconfig
- mozconfig.pgo
- icecat.desktop
- icecat-safe.desktop
- libre.patch
- firefox-install-dir.patch
- vendor.js
- libvpx.patch)
-
-if [ "$_pkgname" != "$pkgname" ]; then
- provides+=("$_pkgname")
- conflicts+=("$_pkgname")
-fi
+options=(!emptydirs)
+url=http://www.gnu.org/software/gnuzilla/
+install=$pkgname.install
+source=(
+ ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
+ mozconfig
+ mozconfig.pgo
+ xulrunner-copy-stub.patch
+ libre.patch
+ $pkgname.desktop
+ $pkgname-safe.desktop
+ $pkgname-install-dir.patch
+ vendor.js
+ cairo.patch
+)
+md5sums=(
+ 6bb02202cd568e8a4f43239b8f52a4a7
+ 3117865902d1a20ab61d75707be9888e
+ ac29b01c189f20abae2f3eef1618ffc0
+ 3009b176cc5f9b1e416b1bf7c45b064b
+ 72e6bb9ebebe555b4ab961add3df3b27
+ e81ad01dbc16ba28bf92ba4b7c309ca7
+ d93fe402b87cd000a869e1fd6badc6c9
+ b320085e7effa2890a79f4f45760614b
+ 0d053487907de4376d67d8f499c5502b
+ c8552d030494443218d88792f4dbbd0f
+)
build() {
- mv "$_pkgname-$pkgver" "$srcdir/mozilla-build"
- cd "$srcdir/mozilla-build"
-
- cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
- patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
- patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff
- patch -Np1 -i "$srcdir/libvpx.patch" # patch from Arch
+ mv $pkgname-$pkgver $srcdir/gnuzilla-build
+ cd $srcdir/gnuzilla-build
+ cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch
if $_pgo; then
- cat "$srcdir/mozconfig.pgo" >> .mozconfig
+ cat $srcdir/mozconfig.pgo >> .mozconfig
fi
+ patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname
+ patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix
+ patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff
+ patch -Np1 -i $srcdir/cairo.patch # fix cairo
+
+ # Fix for use nspr, sqlite and nss external
+ sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
+ browser/installer/Makefile.in
# Fix PRE_RELEASE_SUFFIX
sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
browser/base/Makefile.in
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
- export PYTHON="/usr/bin/python2"
+ # 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))/' \
+ js/src/assembler/wtf/Platform.h
+ # Disable JIT.
+ sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
+ js/src/assembler/wtf/Platform.h
+ sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
+ echo 'ac_add_options --disable-methodjit' >> .mozconfig
+ echo 'ac_add_options --disable-tracejit' >> .mozconfig
+ echo 'ac_add_options --disable-jemalloc' >> .mozconfig
+ fi
+
+ chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
+ export PYTHON=/usr/bin/python2
if $_pgo; then
LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
- LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS
kill $! || true
else
- LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS
fi
}
package() {
- cd "$srcdir/mozilla-build"
- make -j1 -f client.mk DESTDIR="$pkgdir" install
+ cd $srcdir/gnuzilla-build
+ make -j1 -f client.mk DESTDIR=$pkgdir install
- install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
+ install -Dm644 $srcdir/vendor.js $pkgdir/usr/lib/$pkgname/defaults/pref
- brandingdir="browser/branding/unofficial"
- icondir="$pkgdir/usr/share/icons/hicolor"
+ brandingdir=browser/branding/unofficial
+ icondir=$pkgdir/usr/share/icons/hicolor
for i in 16x16 32x32 48x48; do
- install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
+ install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgname.png
done
- install -d "$pkgdir/usr/share/applications"
- install -m644 "$srcdir/icecat.desktop" "$pkgdir/usr/share/applications"
- install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications"
+ for d in $pkgname $pkgname-safe; do
+ install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
+ done
- rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
- ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
- ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
- ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins"
- ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
+ rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins}
+ ln -sf /usr/share/hunspell $pkgdir/usr/lib/$pkgname/dictionaries
+ ln -sf /usr/share/hyphen $pkgdir/usr/lib/$pkgname/hyphenation
+ ln -sf /usr/lib/mozilla/plugins $pkgdir/usr/lib/$pkgname/plugins
+ ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins
# We don't want the development stuff
- rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
-
- # Fix a bug with https-everywhere (duplicate rules)
- rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD"
+ rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl}
# Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
- ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
+ ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin
}
-
-md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7'
- '6f3a8fd65c416216a1b56b0c2d2d81aa'
- 'ac29b01c189f20abae2f3eef1618ffc0'
- 'e81ad01dbc16ba28bf92ba4b7c309ca7'
- 'd93fe402b87cd000a869e1fd6badc6c9'
- '145f453ef82f643711c10d97ec57a805'
- '1e4bcac59e93d21fffa6a1d1ad235247'
- 'c382e35315047e4ca368d09383b39b8d'
- '5d418ecdbdb9f40597df6b978b0b5ee5')
diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch
new file mode 100755
index 000000000..a1fabee90
--- /dev/null
+++ b/libre/icecat/cairo.patch
@@ -0,0 +1,33 @@
+--- a/gfx/thebes/gfxPlatform.cpp
++++ b/gfx/thebes/gfxPlatform.cpp
+@@ -459,11 +459,9 @@ void SourceBufferDestroy(void *srcBuffer)
+ static_cast<SourceSurface*>(srcBuffer)->Release();
+ }
+
+-void SourceSnapshotDetached(cairo_surface_t *nullSurf)
++void SourceSnapshotDetached(void *nullSurf)
+ {
+- gfxImageSurface* origSurf =
+- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
+-
++ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
+ origSurf->SetData(&kSourceSurface, NULL, NULL);
+ }
+
+@@ -535,14 +533,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
+ imgSurface->Stride(),
+ format);
+
+- cairo_surface_t *nullSurf =
+- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
+- cairo_surface_set_user_data(nullSurf,
+- &kSourceSurface,
+- imgSurface,
+- NULL);
+- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
+- cairo_surface_destroy(nullSurf);
++ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
++ (const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
+ }
+
+ srcBuffer->AddRef();
diff --git a/libre/iceweasel-libre/gcc47.patch b/libre/icecat/gcc47.patch
index 829d59510..829d59510 100644..100755
--- a/libre/iceweasel-libre/gcc47.patch
+++ b/libre/icecat/gcc47.patch
diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/icecat-install-dir.patch
index b6f9700b3..eb698f307 100644..100755
--- a/libre/icecat/firefox-install-dir.patch
+++ b/libre/icecat/icecat-install-dir.patch
@@ -1,28 +1,27 @@
-diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
---- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000
-+++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000
-@@ -68,8 +68,8 @@
+--- a/config/autoconf.mk.in
++++ b/config/autoconf.mk.in
+@@ -74,8 +74,8 @@
mandir = @mandir@
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
+
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
+
DIST = $(DEPTH)/dist
LIBXUL_SDK = @LIBXUL_SDK@
-diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
---- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000
-+++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000
-@@ -61,8 +61,8 @@
+diff -Nur a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
+--- a/js/src/config/autoconf.mk.in
++++ b/js/src/config/autoconf.mk.in
+@@ -60,8 +60,8 @@
datadir = @datadir@
mandir = @mandir@
-
+
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
+
TOP_DIST = @TOP_DIST@
ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/libre/icecat/icecat-safe.desktop b/libre/icecat/icecat-safe.desktop
index 87acc970c..87acc970c 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/libre/icecat/icecat.install
+++ b/libre/icecat/icecat.install
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 3dca93ee7..18dfcc177 100644..100755
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,66 +1,404 @@
---- icecat-9.0.1.orig/browser/app/profile/firefox.js 2011-12-26 23:11:39.000000000 -0500
-+++ icecat-9.0.1/browser/app/profile/firefox.js 2011-12-26 23:12:15.000000000 -0500
-@@ -74,7 +76,7 @@
+diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
+--- a/browser/app/profile/firefox.js
++++ b/browser/app/profile/firefox.js
+@@ -70,6 +70,7 @@
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+ pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
+ pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
+ pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html");
+ pref("extensions.webservice.discoverURL","http://www.gnu.org/software/gnuzilla/addons.html");
+@@ -87,7 +88,7 @@
pref("extensions.update.autoUpdateDefault", true);
// Dictionary download preference
-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/10.0/");
++pref("browser.dictionaries.download.url","http://www.gnu.org/software/gnuzilla/addons.html");
// The minimum delay in seconds for the timer to fire.
// default=2 minutes
-@@ -876,7 +878,7 @@
- pref("browser.bookmarks.editDialog.firstEditField", "namePicker");
-
- // base url for the wifi geolocation network provider
--pref("geo.wifi.uri", "https://www.google.com/loc/json");
-+pref("geo.wifi.uri", "http://geomena.org");
- pref("geo.wifi.protocol", 0);
-
- // Whether to use a panel that looks like an OS X sheet for customization
---- icecat-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 07:34:23.000000000 -0500
-+++ icecat-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 19:59:04.000000000 -0500
-@@ -1,27 +1,19 @@
+diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
+--- a/browser/base/content/abouthome/aboutHome.js
++++ b/browser/base/content/abouthome/aboutHome.js
+@@ -38,104 +38,6 @@
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+-// If a definition requires additional params, check that the final search url
+-// is handled correctly by the engine.
+-const SEARCH_ENGINES = {
+- "Google": {
+- image: "data:image/png;base64," +
+- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
+- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
+- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
+- "Vivt6Ztzz5y5b+7yf//3f/9/38PoW7gYY+i7uDDG39heJfT/q91LGTiTIcWJkCxzxDmCCBGCkBEO" +
+- "FDCm5CPs+CGWYvcliRxEzDwgu9I/IzZClonQgT/jC9Eu3GFTz6sdKc57kIzHWKaFjIA2wz++Zhkn" +
+- "yblMIDkAFIcDDFcQ+vtjGJuaOlKPkB2G4V4U9kcu8zfWlPtPVX/g9zZ7QwE03jDTqzWVndBUc57a" +
+- "Up91gToce0cf3R05El5u6gYyNQ0BKK/x/nNmjKwwxBmx8/eSNHiWsVLXlBJ/7UdTazcN3gn3bYEw" +
+- "FmG3pvOobRuScoc+ibEyF6GsUugrgEYuMGD4nqltmJjqFBkt+gcJ/ed0SZIA5crZ+gumrpQ0H319" +
+- "ogBFh6aJFoGmQguf2n7tu62HnvgJ1cPBcN3m6dAnX4CM4QAQigmxdQthm9EEJ58bY3bOl/CQ2YE5" +
+- "pu24LdBwZE7De+M+4gBAs/IntETphOHD4FOzNoNPbjuzBkn+48/9qKXywWPcM99Edvh2siPfHeyc" +
+- "nH8mU/pM2pJLsfshI0KCNRv7viiYYXW7sRnmxTFQhCp3G9/CTqzLsht3jtkrmGJdgGF0xmYpQx5G" +
+- "KBEInWdWSs4pnm6bLD3i95WJsDG7jmtiXFYwlmF2WXATmCPROE05IGa3G33sxPrsL014tGRMVo5D" +
+- "uVdirD/8zJBluQgC9qSF2JKcV9cuPwudsbq1YLqCydjYGOkSngYtKq36vJUs6jqhuqXtgCvursty" +
+- "uHOnSZIMWROnc/dR2J5pYAZO3tF0rOwvAXI/jvKZ/vN6zVNuHQGWjYNx/SWGiohtH9R1Y17HDRvf" +
+- "4XtUCEoaQwyGbEOr5QZ3HeeLbRwrosnRNB5lHNwpuBn+HK2KWFsLcd34scWpGJd5g6Ener61faoQ" +
+- "bOXk6OsWpycnP98yYdzMrLINxYks+3h1fvZlHfE6M6LXu0oa4mPko8s7TL70kuSnOmVIMxvW5n2v" +
+- "00111fF1htzXWiwpnrJAw8FbD60qXtHn9o9LUrJ6r2CUBoOnDpQeKxu0ncPhntgRwKLRcErUVd9t" +
+- "k1falinlvLLmLr7WHfndsh/t0WOdg9Dt1cOHTyrctWutRGzH5ZbNjcQ0FpEce+lMQwCnpMRqnSQ3" +
+- "Qu50hFIzMXJnSsjt+aI+fG/kiOwUStcFQuG9AMor0GUI0da6btoyKxIKnWKaXlR/zajFCYWlXNBB" +
+- "WslMKz+tpOEezkIxJtJzuvfl5ia1DCiQnuki6+MiXzRlR47s9Lwdaa1bCKAc4uscXnX5mwFvzdO6" +
+- "JnlQSv8lgiOUERZ1QYLG4PqJE+ZItl2y4MDB3wjma8/XnGiuavSuUMNhKNOshdyZkmViD7EAGBrX" +
+- "K9gzA1CYqPZEfEoAEK91eN3jTELIlRT7jnuhm9M5mxrmJZVNvjUio0VEC3Exr2ryLTbVCJI0/ZfL" +
+- "e/TI5ZusfbXbKAcjP2706msTQRHiH3pxa2ghgIlkU+9b91zqRA6OK6MIQh+nG8HP6wT4PPzD3n3z" +
+- "lxoRiohl5eVd/1G/qC2Ug8LBOcMYh5PYd6mqemTRJ8d88axb3r//NTkYT2tQ1e27W3yzo+aamh0k" +
+- "NoWIcfeJ1Ss8A2EU0xgqflEkYQBGBuYAe3hByAHiNVBcqyRdLzEjYLhpEGFk/CaHXFtZX79RD4WR" +
+- "Bl4plOWR3MhkbI0DMOHfFhNjaEK6Neas1D9Rg3qVHQFwLHIV9DkN01miaxD6LNUjQpKPMQLHl522" +
+- "jWAVtQxELTM7agBN+AdcGwYNvJREtDwjrOL5hQWpVf36TTtcVFRhGMaAlxsbpw+prCwt/fRTHoZE" +
+- "MVS1Sna5r5CUpKExisc0RVFix4BoKEFHlDES78dIcYjdf0FRhapqH5tQxAyTtiOwZHVTk3dWdnaV" +
+- "zFgv27a5RzfKlt6PAiOZFQWmrUTy2Y3WFntPdgruhXVWxIFRA2ZIBq9QqeP18PvlBPAtRq0gHGNQ" +
+- "uHbN4ej+qJDDmMZIaaZZYASC/MzTe1RScmmdqlZce/z4CLFfW7RoppWsSP1Wy7R5NeTpfMNnU+s2" +
+- "pGIZ2KC4oEGoOOCb/7aNpkKbWKsswhhoUrQZBmPdp/hXcWDUQCjIGZFByLB2Su9ogaUaRhAa8hsG" +
+- "DxXFCmlB8CBKleyhZynXiWkwv6VRpEVYkBtnBGq28bMPZcmjC0rKCxPLFqy4GDWbVwSOPemLGhvP" +
+- "SMJNlc2+es0fQGYo5HnH59sCoMQLWVU0LV4ISqHjf/obtbQQxCbMnPngRcM25MbCB5giDo+Hl6Xg" +
+- "qtVd6yqWeu7e91RyR++Rd28OthAUaLZRa+0Rrg+SNxQqD0dDyRx9lmqY6brOVDi7HFHV9/mWvV5z" +
+- "r63aSCF0yDOlcla7NZrFmA3AeH2E1052/ebi1ZZ6ej3oh8eZ2fe1vtPqOTi495SaHygOOc1/dOFj" +
+- "QnsYhdMw44lFaMysU6dOBCBvRcCB35fl+0X4am3COCaakdoVjVaoZgW1dESJnSd5hiz/7NU02Qbd" +
+- "4dpDYdLL7wizOLW5OGoRTAM+G0VCBrg0yDOMXRGJPB8GNpim2efF7Ozi9hgA4Hfxm0b53NbW/Zyy" +
+- "i7bQlyJBFjIjDF1ViKe29xhEJizP0Flw6S76klhfrX+j8C7dt/8BPRxpsGnGyqKfGRQ7O20OVr80" +
+- "NVT9bIMIBwhrygMsLr7RcKvT9bUq1zXLumVtdvaAs56V+GK+3UMXEK15HzU1jvANHa47/YIGJ2cT" +
+- "DmAWSIZtUdT9tiDpNjEQpZ1pJpumqiKih0AfSHTB2X7/2w2GsT4CNM8k5NlnPJ7Eyg+vT0+faVqW" +
+- "Z2tEu1cYaC3fQxsPnaS/swAYN2K/qnhQHpgAKC6/Xx6Qgtmkilo2Z9WHrFHQnO/Bf/rtoctPlOVM" +
+- "az35/pKIyhCAh6SUQre4H/M+L7lAqJl+RvKsVeHw0pBlntJME2VQunVzRsaERCfuyMzMfyszMzN+" +
+- "ak52XTQ2333prxdJzuyRXGSw7KjFEnlUwYF1zrROLbxO4umwcVOWkjV0z51YyXqaEQsR9djYQMX4" +
+- "TTwVQst8NiVlPqS+Upj0EAyZB9+tcB4ZByJ71V5C7ntcj550Q4KBTl7pvjFVmtbnYvSQ7ACcEZoD" +
+- "fTUwbgDE490fN6B5o5fRjdAXiDNBGKLwNVMLZnTJLPrDh1hypAFHAkTzXnNqc+GHfG75oYxVYN0k" +
+- "YEwQXPEAcuF9ZIH/01ku1/ChivJHkNCeMk8sCNXChCdhQr7+6uvC4RU4d8RJ1PRuV64JKdDSU3su" +
+- "HuHMuKJUcuWMhMU4QHwflWBHgFEb4tXuSs3gEaLV7bdDlXvU6rm7hKH8SobmmawohUNkeSDUghdD" +
+- "0vfXMrbnYdOoSij6Eg108TFje6EOMwbjwZ0zUHeXA5GGANoz6jm2VwCotikBcN7YpvHEtvrDnoqh" +
+- "t58kuzpDJcoPhQDO6YGn3+pTK/007QYUoClgOUHpWAUuldPV4VYYn8rXfMDpHN4NS4McOBpsJ7fZ" +
+- "9utrbNvLWYdzrq5H3PO+Hfmy8GCKaI7U7o/3wq6ObklOIkhykcD+sbuFMeKAcKYos8RvSczhEgLM" +
+- "EioJknDoTEznWLDNJb5RO2POPBfqf2frdFN3LAz6Im+agU9e+Xzn8HLod+dcueXnDk/vX2DZlQaK" +
+- "/ebpLV0miPmcCXs1xZySWC9JMA/Fz3/CeXZbgcTCIEVMqiSAkFguxQ0mX06IX9KueIuPpV/xPCS+" +
+- "ttQGnDMs6Tej8SaseF4LN9c9cnxNj6VxI8Q+3em9Hx+c3PmW1UDztMZtXVLEfdymbGAJ60kJGZQm" +
+- "tH99bE8YGN/wd/mgxdG7NFDb8/ZohryYA5HguHhI5uYO27vyoqtrmAiXr31JX/V48CuY8R8FJhxE" +
+- "eeEAQWk9HnYlFmMJoRKG03QLtUJ7/93FvpXXJ7wM/6Za4l71UEu5pWkoucv0Be0tm95vmUdy5t5k" +
+- "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
+- "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
+- "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
+- , 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=="
+- }
+-};
+-
+ // The process of adding a new default snippet involves:
+ // * add a new entity to aboutHome.dtd
+ // * add a <span/> for it in aboutHome.xhtml
+@@ -143,7 +45,7 @@
+ // The <a/> part of the snippet will be linked to the corresponding url.
+ const DEFAULT_SNIPPETS_URLS = [
+- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
+-, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
++ "https://www.gnu.org/software/gnuzilla/?WT.mc_ID=default1"
++, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
+ ];
+
+ const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
+diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
+--- a/browser/locales/en-US/chrome/browser-region/region.properties
++++ b/browser/locales/en-US/chrome/browser-region/region.properties
+@@ -1,28 +1,28 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (SSL)
++browser.search.defaultenginename=Duck Duck Go (Lite)
# Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
-+browser.search.order.1=Duck Duck Go (SSL)
-+browser.search.order.2=Duck Duck Go (Lite)
+-browser.search.order.1=Duck Duck Go
+-browser.search.order.2=Google
+-browser.search.order.3=Yahoo
++browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.2=Seeks Search
++browser.search.order.3=YaCy
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
-browser.contentHandlers.types.0.title=Bloglines
-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
-browser.contentHandlers.types.1.title=My Yahoo
-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-browser.contentHandlers.types.2.title=Google
-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
++browser.contentHandlers.types.2.title=
++browser.contentHandlers.types.2.uri=about:blank
# Keyword URL (for location bar searches)
-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/?q=
++keyword.URL=https://duckduckgo.com/lite/?q=
# 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=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms}
+-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/lite/?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
---- icecat-9.0.1.orig/browser/app/Makefile.in 2011-12-27 00:22:26.000000000 -0500
-+++ icecat-9.0.1/browser/app/Makefile.in 2011-12-27 00:23:10.000000000 -0500
-@@ -269,7 +269,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/icecat$(BIN_SUFFIX)
- endif
- endif
+@@ -30,3 +30,21 @@
+ # 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 webcal:
++gecko.handlerService.schemes.webcal.0.name=
++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
++
++# The default set of protocol handlers for mailto:
++gecko.handlerService.schemes.mailto.0.name=
++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
++gecko.handlerService.schemes.mailto.1.name=
++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
++
++# 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/
++
++# 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 -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
+--- a/browser/locales/generic/profile/bookmarks.html.in
++++ b/browser/locales/generic/profile/bookmarks.html.in
+@@ -11,13 +11,20 @@
+ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
+ <DD>@bookmarks_toolbarfolder_description@
+ <DL><p>
+- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D" ID="rdf:#$GvPhC3">Parabola GNU/Linux-libre</A>
+ </DL><p>
+- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
++ <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3>
+ <DL><p>
+- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
+- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
+- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
+- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</A>
++ <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Packages</A>
++ <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Wiki</A>
++ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Labs</A>
++ </DL><p>
++ <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
++ <DL><p>
++ <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
++ <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A>
++ <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A>
++ <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 -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.html
+--- a/build/pgo/blueprint/elements.html
++++ b/build/pgo/blueprint/elements.html
+@@ -143,7 +143,7 @@
+ </p>
+ <p>
+ <a>&lt;a&gt; anchor</a><br>
+- <a href="http://www.google.com">&lt;a&gt; a + href</a>
++ <a href="https://duckduckgo.com/lite">&lt;a&gt; a + href</a>
+ </p>
+ <p>
+ <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
+diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
+--- a/dom/ipc/test.xul
++++ b/dom/ipc/test.xul
+@@ -294,6 +294,6 @@
+ oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+ </toolbar>
+
+- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
++ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/>
+ <label id="messageLog" value="" crop="center"/>
+ </window>
+diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
+--- a/layout/ipc/test-ipcbrowser.xul
++++ b/layout/ipc/test-ipcbrowser.xul
+@@ -69,6 +69,6 @@
+ label="setViewportScale"/>
+ </toolbar>
+
+- <browser type="content" src="http://www.google.com/" flex="1" id="content"
++ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content"
+ remote="true"/>
+ </window>
+diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
+--- a/mobile/android/app/mobile.js
++++ b/mobile/android/app/mobile.js
+@@ -230,13 +230,13 @@
+ /* preferences for the Get Add-ons pane */
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/android/recommended/");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
+-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
+
+ /* preference for the locale picker */
+ pref("extensions.getLocales.get.url", "");
+diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties
+--- a/mobile/locales/en-US/chrome/region.properties
++++ b/mobile/locales/en-US/chrome/region.properties
+@@ -1,18 +1,18 @@
+ # Default search engine
+-browser.search.defaultenginename=Google
++browser.search.defaultenginename=Duck Duck Go (Lite)
+
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=Google
++browser.search.order.1=Duck Duck Go (Lite)
+
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
+-browser.contentHandlers.types.0.title=My Yahoo
+-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
+-browser.contentHandlers.types.1.title=Google
+-browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
+
+ # Keyword URL (for location bar searches)
+-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
++keyword.URL=https://duckduckgo.com/lite/?q=
+
+ # increment this number when anything gets changed in the list below. This will
+ # cause Firefox to re-read these prefs and inject any new handlers into the
+@@ -22,11 +20,11 @@
+ gecko.handlerService.defaultHandlersVersion=2
+
+ # The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
++gecko.handlerService.schemes.webcal.0.name=
++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
+
+ # The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
++gecko.handlerService.schemes.mailto.0.name=
++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
++gecko.handlerService.schemes.mailto.1.name=
++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
+diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
+--- a/mobile/xul/app/mobile.js
++++ b/mobile/xul/app/mobile.js
+@@ -221,13 +221,13 @@
+ /* preferences for the Get Add-ons pane */
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
+-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
+
+ /* preference for the locale picker */
+ pref("extensions.getLocales.get.url", "");
+@@ -247,7 +247,7 @@
+ pref("dom.disable_window_open_dialog_feature", true);
+
+ pref("keyword.enabled", true);
+-pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
++pref("keyword.URL","https://duckduckgo.com/lite/?q=");
+
+ pref("accessibility.typeaheadfind", false);
+ pref("accessibility.typeaheadfind.timeout", 5000);
+diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
+--- a/modules/libpref/src/init/all.js
++++ b/modules/libpref/src/init/all.js
+@@ -52,7 +52,7 @@
+ * - Computed values (e.g. 50 * 1024) don't work.
+ */
+
+-pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
++pref("keyword.URL","https://duckduckgo.com/lite/?q=");
+ pref("keyword.enabled", false);
+ pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+ pref("general.useragent.compatMode.firefox", false);
+diff -Naur a/toolkit/locales/en-US/chrome/global-region/region.properties b/toolkit/locales/en-US/chrome/global-region/region.properties
+--- a/toolkit/locales/en-US/chrome/global-region/region.properties
++++ b/toolkit/locales/en-US/chrome/global-region/region.properties
+@@ -4,10 +4,10 @@
+ pluginStartupMessage=Starting Plugin for type
+
+ # plug-ins URLs
+-more_plugins_label=mozilla.org
+-more_plugins_url=https://pfs.mozilla.org/plugins/
+-pluginupdates_label=mozilla.com/plugincheck
+-pluginupdates_url=http://www.mozilla.com/plugincheck/
+-plugindoc_label=plugindoc.mozdev.org
+-plugindoc_url=http://plugindoc.mozdev.org/
++more_plugins_label=
++more_plugins_url=about:blank
++pluginupdates_label=
++pluginupdates_url=about:blank
++plugindoc_label=
++plugindoc_url=about:blank
diff --git a/libre/icecat/libvpx.patch b/libre/icecat/libvpx.patch
deleted file mode 100644
index f883b8e08..000000000
--- a/libre/icecat/libvpx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in
---- mozilla-release.orig/configure.in 2012-02-05 16:01:35.722024142 +0000
-+++ mozilla-release/configure.in 2012-02-05 16:03:34.871064547 +0000
-@@ -5629,7 +5629,7 @@
- dnl v0.9.6 one to check for.
- AC_TRY_COMPILE([
- #include <vpx/vpx_decoder.h>
-- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
-+ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
- #error "test failed."
- #endif
- ],
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index b769079d8..c09eacaca 100644..100755
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -37,7 +37,7 @@ export MOZILLA_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-# IceCat
+# Icecat
export MOZ_PHOENIX=1
mk_add_options MOZ_PHOENIX=1
@@ -46,6 +46,12 @@ ac_add_options --with-branding=browser/branding/unofficial
ac_add_options --with-distribution-id=org.gnu.gnuzilla
ac_add_options --with-user-appdir=.gnuzilla
+# ConnochaetOS
+#ac_add_options --build=i586-pc-linux-gnu
+#ac_add_options --host=i586-pc-linux-gnu
+#export USE_SHORT_LIBNAME=1
+#mk_add_options USE_SHORT_LIBNAME=1
+
# Parabola
ac_add_options --disable-safe-browsing
export BUILD_OFFICIAL=1
diff --git a/libre/icecat/mozconfig.default b/libre/icecat/mozconfig.default
deleted file mode 100644
index 01e047fc3..000000000
--- a/libre/icecat/mozconfig.default
+++ /dev/null
@@ -1,63 +0,0 @@
-# This is a better commented version of the default .mozconfig from 9.0.1
-ac_add_options --enable-application=browser
-
-ac_add_options --prefix=/usr/local
-#ac_add_options --with-default-mozilla-five-home=/usr/local/lib
-
-# System libraries
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-#ac_add_options --with-system-png
-ac_add_options --disable-system-cairo
-#ac_add_options --with-pthreads
-
-ac_add_options --disable-toolkit-qt
-ac_add_options --enable-toolkit-cairo-gtk2
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-svg-renderer=cairo
-
-# Features
-ac_add_options --enable-extensions="default spellcheck"
-ac_add_options --enable-freetype2
-ac_add_options --enable-pango
-ac_add_options --enable-crypto
-#ac_add_options --enable-postscript
-ac_add_options --enable-svg
-ac_add_options --enable-xft
-
-ac_add_options --disable-chatzilla
-ac_add_options --disable-accessibility
-ac_add_options --disable-calendar
-ac_add_options --disable-composer
-
-#ac_add_options --disable-jsd
-#ac_add_options --disable-libxul
-ac_add_options --disable-ipc
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
-ac_add_options --disable-negotiateauth
-ac_add_options --disable-profilesharing
-ac_add_options --disable-xinerama
-ac_add_options --disable-xprint
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-ac_add_options --disable-debug
-
-# Optimization
-ac_add_options --disable-elf-dynstr-gc
-ac_add_options --enable-optimize="-pipe -O3"
-ac_add_options --enable-strip
-
-# IceCat
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
diff --git a/libre/icecat/mozconfig.firefox b/libre/icecat/mozconfig.firefox
deleted file mode 100644
index 428503642..000000000
--- a/libre/icecat/mozconfig.firefox
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is the .mozconfig used by Arch for Firefox
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/libre/icecat/mozconfig.old b/libre/icecat/mozconfig.old
deleted file mode 100644
index a790aee48..000000000
--- a/libre/icecat/mozconfig.old
+++ /dev/null
@@ -1,78 +0,0 @@
-# This is a better commented version of the .mozconfig used by the Parabola
-# package < v9
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-cairo
-ac_add_options --with-pthreads
-
-ac_add_options --enable-default-toolkit=cairo-gtk2
-
-# Features
-ac_add_options --enable-extensions=default
-
-ac_add_options --enable-url-classifier
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --enable-canvas
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-smil
-ac_add_options --enable-svg
-
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-libnotify
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
-ac_add_options --enable-xterm-updates
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-update
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-ac_add_options --disable-debug
-
-# Optimization
-ac_add_options --disable-pedantic
-ac_add_options --disable-static
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# IceCat
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
index b0c249ebf..b0c249ebf 100644..100755
--- a/libre/icecat/mozconfig.pgo
+++ b/libre/icecat/mozconfig.pgo
diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js
index 808d1b118..d8d606bc1 100644..100755
--- a/libre/icecat/vendor.js
+++ b/libre/icecat/vendor.js
@@ -3,3 +3,7 @@ pref("intl.locale.matchOS", true);
// Disable default browser checking.
pref("browser.shell.checkDefaultBrowser", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch
new file mode 100755
index 000000000..8ccf127df
--- /dev/null
+++ b/libre/icecat/xulrunner-copy-stub.patch
@@ -0,0 +1,11 @@
+--- a/browser/app/Makefile.in
++++ b/browser/app/Makefile.in
+@@ -233,7 +233,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/icecat$(BIN_SUFFIX)
+ endif
+ endif
+
diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD
index 8213076af..7d0aa1d8b 100644..100755
--- a/libre/icedove-i18n/PKGBUILD
+++ b/libre/icedove-i18n/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id$
-# Maintainer: Márcio Silva <coadde@adinet.com.uy>
-# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
pkgbase=icedove-i18n
-pkgver=11.0.1
+pkgver=16.0.2.1
pkgname=('icedove-i18n-ar'
- #'icedove-i18n-af'
+ 'icedove-i18n-ast'
'icedove-i18n-be'
- 'icedove-i18n-bn-bd'
'icedove-i18n-bg'
+ 'icedove-i18n-bn-bd'
'icedove-i18n-br'
'icedove-i18n-ca'
'icedove-i18n-cs'
@@ -16,28 +15,31 @@ pkgname=('icedove-i18n-ar'
'icedove-i18n-de'
'icedove-i18n-el'
'icedove-i18n-en-gb'
+ 'icedove-i18n-en-us'
'icedove-i18n-es-ar'
- 'icedove-i18n-es'
+ 'icedove-i18n-es-es'
'icedove-i18n-et'
'icedove-i18n-eu'
'icedove-i18n-fi'
'icedove-i18n-fr'
'icedove-i18n-fy-nl'
- 'icedove-i18n-ga'
+ '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'
+ 'icedove-i18n-nb-no'
'icedove-i18n-nl'
- 'icedove-i18n-nn'
- 'icedove-i18n-pa'
+ 'icedove-i18n-nn-no'
+ 'icedove-i18n-pa-in'
'icedove-i18n-pl'
'icedove-i18n-pt-br'
'icedove-i18n-pt'
@@ -48,7 +50,8 @@ pkgname=('icedove-i18n-ar'
'icedove-i18n-sk'
'icedove-i18n-sl'
'icedove-i18n-sq'
- 'icedove-i18n-sv'
+ 'icedove-i18n-sr'
+ 'icedove-i18n-sv-se'
'icedove-i18n-ta-lk'
'icedove-i18n-tr'
'icedove-i18n-uk'
@@ -64,10 +67,10 @@ 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-af.xpi::$_url/af.xpi
+ icedove-i18n-$pkgver-ast.xpi::$_url/ast.xpi
icedove-i18n-$pkgver-be.xpi::$_url/be.xpi
- icedove-i18n-$pkgver-bn-BD.xpi::$_url/bn-BD.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
@@ -75,6 +78,7 @@ source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.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
@@ -86,7 +90,9 @@ source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.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
@@ -107,6 +113,7 @@ source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.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
@@ -121,404 +128,403 @@ noextract=(${source[@]##*/})
_path="/usr/lib/icedove/extensions/"
package_icedove-i18n-ar() {
- pkgdesc="Arabic language pack for Debian Icedove"
+ 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="Afrikaans (South Africa) language pack for Debian Icedove"
- replaces=icedove-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="Belarusian language pack for Debian Icedove"
- replaces=icedove-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-bn-bd() {
- pkgdesc="Bangladesh language pack for Debian Icedove"
+package_icedove-i18n-bg() {
+ pkgdesc="Language packs for Debian Icedove."
cd ${srcdir}
- install -Dm644 icedove-i18n-$pkgver-bn-BD.xpi "${pkgdir}/$_path/langpack-bn-BE@icedove.mozilla.org.xpi"
+ install -Dm644 icedove-i18n-$pkgver-bg.xpi "${pkgdir}/$_path/langpack-bg@icedove.mozilla.org.xpi"
}
-package_icedove-i18n-bg() {
- pkgdesc="Bulgarian language pack for Debian Icedove"
- replaces=icedove-bg
+package_icedove-i18n-bn-bd() {
+ pkgdesc="Language packs for Debian Icedove."
cd ${srcdir}
- install -Dm644 icedove-i18n-$pkgver-bg.xpi "${pkgdir}/$_path/langpack-bg@icedove.mozilla.org.xpi"
+ install -Dm644 icedove-i18n-$pkgver-bn-BD.xpi "${pkgdir}/$_path/langpack-bn-BD@icedove.mozilla.org.xpi"
}
package_icedove-i18n-br() {
- pkgdesc="Breton language pack for Debian Icedove"
+ 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="Catalan language pack for Debian Icedove"
- replaces=icedove-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="Czech language pack for Debian Icedove"
- replaces=icedove-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="Danish language pack for Debian Icedove"
- replaces=icedove-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="German language pack for Debian Icedove"
- replaces=icedove-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="Greek language pack for Debian Icedove"
- replaces=icedove-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="English (GB) language pack for Debian Icedove"
- replaces=icedove-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="Spanish (AR) language pack for Debian Icedove"
- replaces=icedove-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() {
- pkgdesc="Spanish language pack for Debian Icedove"
- replaces=icedove-es
+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="Estonian language pack for Debian Icedove"
- replaces=icedove-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="Basque language pack for Debian Icedove"
- replaces=icedove-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="Finnish language pack for Debian Icedove"
- replaces=icedove-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="French language pack for Debian Icedove"
- replaces=icedove-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="Frysk (fy) language pack for Debian Icedove"
+ 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() {
- pkgdesc="Irish language pack for Debian Icedove"
- replaces=icedove-ga
+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="Scottish Gaelic language pack for Debian Icedove"
+ 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="Galician language pack for Debian Icedove"
+ 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="Hebrew language pack for Debian Icedove"
- replaces=icedove-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="Hungarian language pack for Debian Icedove"
- replaces=icedove-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="Indonesian language pack for Debian Icedove"
+ 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="Icelandic Gaelic language pack for Debian Icedove"
+ 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="Italian language pack for Debian Icedove"
- replaces=icedove-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="Japanese language pack for Debian Icedove"
- replaces=icedove-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="Korean language pack for Debian Icedove"
- replaces=icedove-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="Lithuanian language pack for Debian Icedove"
- replaces=icedove-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() {
- pkgdesc="Norwegian (Bokmal) language pack for Debian Icedove"
- replaces=icedove-nb
+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="Macedonian language pack for Debian Icedove"
- replaces=icedove-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="Dutch language pack for Debian Icedove"
- replaces=icedove-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() {
- pkgdesc="Norwegian (Nynorsk) language pack for Debian Icedove"
- replaces=icedove-nn
+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() {
- pkgdesc="Punjabi language pack for Debian Icedove"
- replaces=icedove-pa
+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="Polish language pack for Debian Icedove"
- replaces=icedove-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="Brazilian Portuguese language pack for Debian Icedove"
- replaces=icedove-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="Portuguese language pack for Debian Icedove"
- replaces=icedove-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="Romanian language pack for Debian Icedove"
- replaces=icedove-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="Romansh language pack for Debian Icedove"
+ 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="Russian language pack for Debian Icedove"
- replaces=icedove-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="Sinhalese language pack for Debian Icedove"
+ 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="Slovak language pack for Debian Icedove"
- replaces=icedove-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="Slovenian language pack for Debian Icedove"
- replaces=icedove-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="Albanian language pack for Debian Icedove"
- replaces=icedove-sl
+ 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-sv() {
- pkgdesc="Swedish language pack for Debian Icedove"
- replaces=icedove-sv
+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=" Tamil (Sri Lanka) language pack for Debian Icedove"
- replaces=icedove-sv
+ 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="Turkish language pack for Debian Icedove"
- replaces=icedove-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="Ukrainian language pack for Debian Icedove"
- replaces=icedove-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="Vietnamese language pack for Debian Icedove"
+ 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="Chinese (simplified) language pack for Debian Icedove"
- replaces=icedove-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="Chinese (traditional) language pack for Debian Icedove"
- replaces=icedove-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=('43ea2aeec780c591af577215a8f928ae'
- '0dc7a6ca6d308f4135ce135b87b19823'
- '343f4b73820d9906205606833c48ddd1'
- '56f7a9e47037c82fda2d97efcac6e2fa'
- '7da75017f43c073b7f7e413d41794a37'
- '07c7efe6d9400b17ef572c5769f25ccd'
- '8dba7a9ff2c2b55908bb32b947fab75e'
- 'e262a088217fceb213a8890124e85db6'
- '9c2355ff0ca0b640e50f7a24ec5d9f6e'
- '628c84299fc7b76a5f084905518b8f73'
- 'a26276362394dedbbea98356d573f2f1'
- '06c0ed88ff10c296f2066a7a84cc33d6'
- '2a03c69e72bbe08e8938177908a3ab17'
- 'e80febfd74cc81bc9e5cb9752c0b3b95'
- '4ad12b69da9910e1c0122aa76c3513d5'
- '5e9c7ab66141389b9300f8db28852a5a'
- 'c3390ce9a18b979fe148652fc76ae311'
- '85c17fe5018696d6999e7fed8c447edc'
- 'a049d7cf3b9c9ef5ece4afced3b56f9d'
- 'c483f4da184315444d1d094fd75b150a'
- 'e57eba03836a14e8915a816a7655fb46'
- 'c4d4caf6baf85ca22ed1ea19a3630d67'
- 'e16465d4d1234fe7362b5ba2f73682f9'
- '36fb64f2541e5a7ba0640931e8ee2be1'
- 'd03b2ddcfc3cf28e1725df4972e2abfe'
- 'f5fcf08545542a752b7355d1dd692c2d'
- '842c4ce562c0beba6713424551d5d748'
- '004c5c6a1a5bb575827fe626e0b804cc'
- '0d810b4347b21d43d8b38fd077a63f9d'
- 'e03ac78e858e0d345512bcc24f180838'
- 'e17ab7b097085b9462d38a7d8aa4d027'
- 'f58b78d51281acf36c9755abb6bbde14'
- '086270a5669cb5db0a21bf5ca1c7620c'
- 'c972a8eaf135cfeb9509603ae1d392d3'
- 'c4eb654adce293e9ef6fe2cb2b1078bc'
- 'd120891141f898644a93bb2317def809'
- '78c32f4f1c814130f9cddce60b17a089'
- '055d77477e07632dcb06a08d51609514'
- '9b28657c99b9193cef3dbf959ed1849c'
- '5c6ca9cd178df6a6fca1f638a0845b0a'
- '277cf819683b9a9016b322a77a3236fa'
- '7104f5238b221ea4dc502c14eae12ea1'
- 'a29ed3f28bab6a970c15378505b352cc'
- '5774b9adccafa40221e6eb3011de5db0'
- '5419f4456c65703ebeb9d4befc0c2d2c'
- '2423b38ceb1022a6064070a3f7f5600f'
- '5de7fd60a6a74bf23066a6cfe9dee2d6'
- '47a23af3184ee6999433a9f59da3a67a'
- 'd3242d7e7c35df585e55918ed6556f16'
- 'd0f7e27dfdc4aa14398e8422e3135a4a')
+md5sums=('9c4a59c7da66e2354164c3a5bc7af21d'
+ '1cc30ebb50c2ff783b07060fe14b4260'
+ 'bd2a994f1b0aa8d71b7f432f582e08b5'
+ '1b7d5f199b714e5d235cdadc89882c82'
+ 'a5945807be0c8e205cf0f4be41d1f301'
+ 'ec323d1ea8372afa236ed82d1f38bf62'
+ '04985b1bb7a7255970de1c9a0d6b6c37'
+ '143d16162ded3cf1ed99731e0ccd4cbc'
+ 'ec04abda3d2eafd5cccad44b843d2191'
+ 'a1273c8ba22f38f0304d44f52095541d'
+ '06ff7794da97ef3cad3ccfde2a229db3'
+ 'bb873b67b1e65eccf186622c1315e14b'
+ '87ea24ef462fed8a3f6e74e25b210607'
+ 'c7363deffa336c8470884ca7500ff583'
+ '64d7b4490bbe3cdb25cc8633d46761d4'
+ '1bc28fd43fbe54185e0f34161e2bb856'
+ 'f90cedcac1daa1a7be9abc9a960bbde0'
+ '326a063d3b5d0aff735a145dcbb51e01'
+ '86ff061d2346b75b85e59374328d20f8'
+ '83969caa207fa30dd016fee6bd2aa543'
+ '68d50a5c356d62514bfa99b04776ed7c'
+ 'f5ffaa9dc1da2412faf78a4920d19278'
+ 'a76518ba680a2fc263de99099e0e1c53'
+ 'e88f3c95cf4e51035429307f4f6a4eb5'
+ 'c2573d6f463cdd69f6b37612f9ae997a'
+ '8b17220cd897ea744978752b2ef11ab0'
+ '4ee8b3d2e4fd7bf3353a910d76cbbaf8'
+ 'f87d295343ecf5b1e21abe430b157c42'
+ '74ce04669c8acf87a8b8878fb2653dc4'
+ '5ffc16a8c701c8c2c133775a815d1e67'
+ '6d6c1a7e31bf6301ee690509881a4395'
+ '41c970fd7ef2224a63de7d562ce71b39'
+ 'a4243831934d31aad648221190fe2b42'
+ '6c1c023d67a35e4ed3a792bb365f360e'
+ '0045f4bceaaddd57fa6c0b895a34feff'
+ '18b359d881127defff20e549bb0c5b80'
+ 'a295fbd180dfe3e009218aa2775ce332'
+ '6beaeaf5bf67321fdef0ee6de968edaa'
+ '92b29bc95a476d9cb75c5df075f353b9'
+ 'fa757024edb1f1f794f77ecee8c07706'
+ '8f21adb897625a2a27a040a8e88bed3f'
+ '26b5ab6bb93b454702179c48c9da2e5b'
+ 'f319345cdc962919830792644c66165d'
+ '7f32885e485beab6822eb9ec0025bae7'
+ 'edf019e6332d099d67b68f1f90da680c'
+ 'e21836a77f143457ac7912ee0e6386dc'
+ '24adc86b3fb496f3d27944a5027d5fa9'
+ '7192e7c7d80cc8eb85e1f57defa0496c'
+ 'f449ced45bb084ce0adda6df89b1ee31'
+ '25e3ce79fc2c1e2164ce04821e683a29'
+ '615138d3ed86797a168a0d5784f0c6fe'
+ '7c83196da5ee2d01444450cca620c29d'
+ '265f8447eee6e6b41ab8fdcf1a1dc154'
+ '9889d38b50a7e2d095582ebf75cab9e2'
+ '12b882986056bca65fdfc90806daf87b')
diff --git a/libre/icedove-libre/.directory b/libre/icedove-libre/.directory
deleted file mode 100644
index ef6a156b3..000000000
--- a/libre/icedove-libre/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,5,10,17,26,4
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 6bd50cd47..6ec577f58 100644..100755
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer : Márcio Silva <coadde@adinet.com.uy>
-# Maintainer : André Silva <andre.paulista@adinet.com.uy>
+# Maintainer : Márcio Silva <coadde@lavabit.com>
+# Maintainer : André Silva <emulatorman@lavabit.com>
# We're getting this from Debian Experimental
_debname=icedove
-_debver=11.0
+_debver=16.0.2
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=3
pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird."
arch=('i586' 'i686' 'x86_64' 'mips64el')
license=('GPL2' 'MPL' 'LGPL')
@@ -22,24 +22,23 @@ optdepends=('libcanberra: for sound support')
replaces=('thunderbird')
conflicts=('thunderbird')
provides=('thunderbird')
-install=$_pkgname.install
+install=${_pkgname}.install
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
mozconfig
channel-prefs.js
vendor.js
- gcc47.patch
- clrf.patch
makefile.patch
+ branding.patch
${_pkgname}.desktop)
-md5sums=('0d4aaf892cd1cbf9bda38928947025fe'
- 'd4401c080fe5190e8bb1326f10808231'
+options=(!emptydirs)
+md5sums=('a3724f40d28014acf593528bb8a048f0'
+ '53d62a4841d7989d1f6d1b04929394b4'
'd6d58d3104a44624e0a3d227cdf1c211'
'476ec205162340fb0679f522c9d31c3b'
'4eecc4fc5aafaf0da651a09eadc90bee'
- '94d5cd599ccc4438f192d8daabf98b6a'
- 'c395d443a8c4c16880c7322bcf174743'
'c4ed43e85945e180a89cce03e45ec62c'
+ '126b1446212396c33220936c01d9592d'
'e785e0c267f4435ae1a9aa0b03bcacfb')
build() {
@@ -61,9 +60,8 @@ build() {
done
quilt push -av
- patch -Np1 -i "$srcdir/gcc47.patch"
- patch -Np1 -i "$srcdir/clrf.patch"
- patch -Np1 -i "$srcdir/makefile.patch"
+ patch -Np1 -i "${srcdir}/makefile.patch" # small fix
+ patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
cp "${srcdir}/mozconfig" .mozconfig
make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
@@ -74,17 +72,18 @@ package() {
make -j1 -f client.mk DESTDIR="${pkgdir}" install
- install -m644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref"
+ install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js"
+
# Recommend free addons
- install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref"
+ install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref/channel-prefs.js"
for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
done
install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
- install -Dm644 "$srcdir/${_pkgname}.desktop" \
- "$pkgdir/usr/share/applications/${_pkgname}.desktop"
+ install -Dm644 "${srcdir}/${_pkgname}.desktop" \
+ "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins}
ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${_pkgname}/dictionaries"
diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch
new file mode 100644
index 000000000..d84b8075a
--- /dev/null
+++ b/libre/icedove-libre/branding.patch
@@ -0,0 +1,19 @@
+diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd
+--- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-30 16:41:16.000000000 -0200
++++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-31 22:35:04.203666114 -0200
+@@ -1,4 +1,4 @@
+ <!ENTITY brandShortName "Icedove">
+-<!ENTITY brandFullName "Icedove Mail/News">
+-<!ENTITY vendorShortName "Icedove">
++<!ENTITY brandFullName "Icedove">
++<!ENTITY vendorShortName "Mozilla">
+ <!ENTITY trademarkInfo.part1 " ">
+diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties
+--- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties 2012-10-30 10:13:50.000000000 -0200
++++ comm-release/mail/branding/icedove/locales/en-US/brand.properties 2012-10-31 22:35:14.786423732 -0200
+@@ -1,3 +1,3 @@
+ brandShortName=Icedove
+-brandFullName=Icedove Mail/News
+-vendorShortName=Icedove
++brandFullName=Icedove
++vendorShortName=Mozilla
diff --git a/libre/icedove-libre/clrf.patch b/libre/icedove-libre/clrf.patch
deleted file mode 100644
index 375708ac4..000000000
--- a/libre/icedove-libre/clrf.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-03-12 23:37:12.000000000 -0300
-+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp 2012-05-07 12:33:58.517612453 -0300
-@@ -688,7 +688,7 @@
- PL_strcat(encoding, "{");
- lengthStr.AppendInt((PRInt32) strlen(value));
- PL_strcat(encoding, lengthStr.get());
-- PL_strcat(encoding, "}"CRLF);
-+ PL_strcat(encoding, "}" CRLF);
- PL_strcat(encoding, value);
- return NS_OK;
- }
-diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-05-07 12:41:08.003264793 -0300
-@@ -753,7 +753,7 @@
- }
- }
- }
--#define EXTRA_KEYWORD_HDR " "MSG_LINEBREAK
-+#define EXTRA_KEYWORD_HDR " " MSG_LINEBREAK
-
- // if status offset isn't in the first block, this code won't work. There's no good reason
- // for the status offset not to be at the beginning of the message anyway.
-@@ -1203,7 +1203,7 @@
- // check if there's an envelope header; if not, write one.
- if (strncmp(m_dataBuffer, "From ", 5))
- {
-- m_fileStream->Write("From "CRLF, 7, &bytesWritten);
-+ m_fileStream->Write("From " CRLF, 7, &bytesWritten);
- m_offlineMsgSize += bytesWritten;
- }
- }
-diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-05-07 12:44:43.127347489 -0300
-@@ -1722,7 +1722,7 @@
- {
- m_sendDone = PR_TRUE;
- nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-- SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
-+ SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
- m_nextState = SMTP_RESPONSE;
- m_nextStateAfterResponse = SMTP_DONE;
- return(0);
-@@ -1969,7 +1969,7 @@
- {
- nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
- // send a quit command to close the connection with the server.
-- if (SendData(url, "QUIT"CRLF) == NS_OK)
-+ if (SendData(url, "QUIT" CRLF) == NS_OK)
- {
- m_nextState = SMTP_RESPONSE;
- m_nextStateAfterResponse = SMTP_ERROR_DONE;
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-05-07 12:48:29.417179064 -0300
-@@ -8298,7 +8298,7 @@
- bool needMoreData = false;
- char * newLine = nsnull;
- PRUint32 numBytesInLine = 0;
-- const char *envelope = "From "CRLF;
-+ const char *envelope = "From " CRLF;
- offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
- fileSize += bytesWritten;
- do
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-05-07 15:45:58.551202719 -0300
-@@ -1410,7 +1410,7 @@
- {
- // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
- nsCAutoString commandBuffer(GetServerCommandTag());
-- commandBuffer.Append(" IDLE"CRLF);
-+ commandBuffer.Append(" IDLE" CRLF);
-
- do
- {
-@@ -3290,7 +3290,7 @@
- commandString.Append(messageIds);
- commandString.Append(" (");
- commandString.Append(attribute);
-- commandString.Append(")"CRLF);
-+ commandString.Append(")" CRLF);
- nsresult rv = SendData(commandString.get());
-
- if (NS_SUCCEEDED(rv))
-@@ -5283,7 +5283,7 @@
-
- IncrementCommandTagNumber();
- nsCAutoString command(GetServerCommandTag());
-- command.Append(" expunge"CRLF);
-+ command.Append(" expunge" CRLF);
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -5359,7 +5359,7 @@
- command.Append(gAppName);
- command.Append("\" \"version\" \"");
- command.Append(gAppVersion);
-- command.Append("\")"CRLF);
-+ command.Append("\")" CRLF);
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -5816,7 +5816,7 @@
- nsCAutoString correctedPassword;
- EscapeUserNamePasswordString(password.get(), &correctedPassword);
- command.Append(correctedPassword);
-- command.Append("\""CRLF);
-+ command.Append("\"" CRLF);
- rv = SendData(command.get(), PR_TRUE /* suppress logging */);
- NS_ENSURE_SUCCESS(rv, rv);
- ParseIMAPandCheckForNewMail();
-@@ -7446,7 +7446,7 @@
- nsCString command(GetServerCommandTag());
- command += " create \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if(NS_SUCCEEDED(rv))
-@@ -7549,7 +7549,7 @@
- nsCString command (GetServerCommandTag());
- command += " lsub \"\" \"";
- command += escapedPattern;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- PR_Free(boxnameWithOnlineDirectory);
-
-@@ -7578,7 +7578,7 @@
- command += useXLIST ?
- " xlist \"\" \"" : " list \"\" \"";
- command += escapedPattern;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- PR_Free(boxnameWithOnlineDirectory);
-
-@@ -7599,7 +7599,7 @@
- nsCString command (GetServerCommandTag());
- command += " subscribe \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -7617,7 +7617,7 @@
- nsCString command (GetServerCommandTag());
- command += " unsubscribe \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -7631,7 +7631,7 @@
- if (m_urlInProgress)
- return;
- nsCAutoString command (GetServerCommandTag());
-- command += " IDLE"CRLF;
-+ command += " IDLE" CRLF;
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
- {
-@@ -7658,7 +7658,7 @@
- nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
- if (asyncInputStream)
- asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
-- nsresult rv = SendData("DONE"CRLF);
-+ nsresult rv = SendData("DONE" CRLF);
- // set a short timeout if we don't want to wait for a response
- if (m_transport && !waitForResponse)
- m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
-@@ -7727,8 +7727,8 @@
- PRUint32 msgsHandled = 0;
- const char *formatString;
- formatString = (idsAreUid)
-- ? "%s uid store %s %s"CRLF
-- : "%s store %s %s"CRLF;
-+ ? "%s uid store %s %s" CRLF
-+ : "%s store %s %s" CRLF;
-
- do
- {
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp 2012-05-07 12:57:22.050615120 -0300
-@@ -185,7 +185,7 @@
-
- NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' &&
- *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
-- bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
-+ bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
- if (sendingIdleDone)
- fWaitingForMoreClientInput = PR_FALSE;
-
-diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-05-07 12:59:45.857182813 -0300
-@@ -2483,7 +2483,7 @@
- return(MK_OUT_OF_MEMORY);
- m_pop3ConData->next_state_after_response = POP3_GET_LIST;
- m_listpos = 0;
-- return SendData(m_url, "LIST"CRLF);
-+ return SendData(m_url, "LIST" CRLF);
- }
-
-
-diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp
---- comm-release.orig/mailnews/mime/src/mimedrft.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-05-07 13:01:42.912022177 -0300
-@@ -1473,7 +1473,7 @@
- *newbody = 0;
- PL_strcatn(newbody, newbodylen, "<PRE>");
- PL_strcatn(newbody, newbodylen, body);
-- PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
-+ PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
- PR_Free(body);
- body = newbody;
- }
-diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp
---- comm-release.orig/mailnews/mime/src/mimemult.cpp 2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimemult.cpp 2012-05-07 13:04:41.511265477 -0300
-@@ -280,7 +280,7 @@
- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
- MimeWriteAString(obj, fileName);
-- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
- MimeWriteAString(obj, obj->options->state->detachedFilePath);
- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@
- status = MimeWriteAString(obj, header);
- if (status < 0)
- return status;
-- status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
-+ status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
- MimeWriteAString(obj, fileName);
-- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
- }
- nsCString result;
- char timeBuffer[128];
-@@ -306,8 +306,8 @@
- "%a %b %d %H:%M:%S %Y",
- &now);
- MimeWriteAString(obj, nsDependentCString(timeBuffer));
-- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
- MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
- }
- PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/icedove-libre/gcc47.patch b/libre/icedove-libre/gcc47.patch
deleted file mode 100644
index 115d65131..000000000
--- a/libre/icedove-libre/gcc47.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:38:11.474783536 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -8,7 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include <unistd.h>
- #endif
-
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:38:11.381450924 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <string>
- #include <vector>
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:38:11.438117153 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -6,6 +6,9 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:38:11.418117308 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -14,6 +14,8 @@
- #include <time.h>
- #endif
-
-+#include <unistd.h>
-+
- #include <limits>
-
- #include "base/basictypes.h"
-diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
---- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:38:56.101105510 +0000
-+++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:43:29.218995578 +0000
-@@ -69,6 +69,9 @@
- $(STDCXX_COMPAT) \
- $(NULL)
-
-+# Needed for moz_free
-+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
-+
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS += crashreporter_win.cpp
- LIBS += \
diff --git a/libre/icedove-libre/icedove.desktop b/libre/icedove-libre/icedove.desktop
index ef2cd76e9..ef2cd76e9 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/libre/icedove-libre/vendor.js
+++ b/libre/icedove-libre/vendor.js
diff --git a/libre/iceweasel-i18n/.gitignore b/libre/iceweasel-i18n/.gitignore
index 3e1eb57b5..3e1eb57b5 100644..100755
--- a/libre/iceweasel-i18n/.gitignore
+++ b/libre/iceweasel-i18n/.gitignore
diff --git a/libre/iceweasel-i18n/Makefile b/libre/iceweasel-i18n/Makefile
index d596111f3..d596111f3 100644..100755
--- a/libre/iceweasel-i18n/Makefile
+++ b/libre/iceweasel-i18n/Makefile
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index b03b8196b..6fd6aaf03 100644..100755
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,18 +9,18 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceweasel
-_debver=12.0
-_debrel=7
+_debver=16.0.2
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca csb cs cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg 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)
+_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-LK ta 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=10.0
+_pkgver=16.0.2
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -40,7 +40,7 @@ build() {
for f in *.deb
do
bsdtar xf $f
- bsdtar xf data.tar.gz
+ bsdtar xf data.tar.xz
done
}
@@ -56,87 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('5ff63ad5c05d6d1b6602ad5741a0ebbe'
- 'ba39d79b5d311942e638668e2e4ed2c9'
- '7f090255a9fe67dd690659ee174ee7a8'
- '4c6bd176a604e52c72d9d879aa16ef92'
- '2a5589be415e0fe395c16d59cdc7c91a'
- '9e7908cee8a30ca2514bfb30ad8a73a1'
- '19d7de55b66a939400384d5ff463b6e8'
- 'd9270f14e3119d6395345a1e211ae6be'
- '3becb7d177c66b261a21af21b7ec9cb5'
- '68758f2d56daa04c456b53852b811ae6'
- 'c128c138f022a1d81313fcbfa332dfe3'
- 'af0f6166f137fcd886e39e6f09c6bdf1'
- 'fea6cbd83d51a6c07b36ff33ffc0dd64'
- 'cf2c157ee82b06ca7d10fed9f0c3e71a'
- '85816cd36489cbee7e3ac8ebde0f6217'
- 'a34727f3cb2e32133a280978dc354b01'
- 'e31213480521b80600207fd67adda16a'
- '53b15a8b5ef4659bf67dc66ba946e2d2'
- '4fa7defd9b33e26231e3d236b0fd9d8c'
- '6788e9cdd0cc01b82d9a49800ce809ed'
- '26cbb5f5afe5fbaa26716a297b6b2a46'
- 'df5c334e257805af2ebdf685a643e706'
- '898a92607281f0263d670b4eb28ca224'
- '8aa4093d5f55587dcf951201301c5246'
- '1f4531c0c5f41a5095d811c107d276ac'
- '907f8599e1e4a342b3b19072661cc72e'
- '4db5b7af448becc5dd56e0a0cb9f908d'
- '0fb24139ee7ea7b7c340d31e9e58ae04'
- '7ff7ae7d1cd9a713dad7070c38dd4f42'
- 'f8f6385a9f6c1ecaa8d299ac72aa046e'
- '49c99a2a04144e6b33cafed7e33b47ea'
- 'bc9a4b47fd087ceefce8745a2cedd615'
- 'd7a4703936bfde284cc46d68dede421f'
- '615df26846bf62714466a7e1dd2a7e5e'
- '3c666f8153645a9d958753eb5e910ef2'
- '5217d26e9f4465db7433e77b7bbc5233'
- 'd3ffdf2ece6ca4d84fc0061371690b28'
- 'ccf85e0bc3be22824e1aa5ad99873248'
- 'e3bf49a5c040bf88583d5aa1b886eeea'
- 'a3c545319134c7febf801bb45722ab6f'
- '48c9d21d50e2b5ccb3c0d1a5f8b46bb5'
- 'df6a5bedd8f5684f8b8b3f6fc11e7ceb'
- 'f82373a67a80e8ab9c39678e3eb92353'
- '72084f9a0960ca6d3ac4a3b16b27e6e5'
- '66763631a58e597fbd0e69f73bf08c94'
- 'af8c4e38439d6ad799eb071a9e59742f'
- 'fba1d988df08fbd991b961a35ccfd56e'
- 'b1792658b67d09c6cb1b28c73253668a'
- 'd0398797d63b6ba71478cb6ea00bae35'
- '8cb0fa6026c0303b603969563b2ef911'
- 'f1d6d2f4a6a937f802040dc295e4e112'
- '0f57699e98cc355de7c3bdaccbbfb832'
- '7b86f62efab9124feda8793fda381a3a'
- '84f27e886c65c91a2aeb3cfc9bfddff4'
- 'b55de8bc0f7c5a24de8b53a2fea82478'
- '954f672c975029c170e7a77156e23557'
- 'f4758ff2db7be02c7498f635c17505a3'
- 'f24a6033051be1d638790dc5b1fa9198'
- '573df4582c8fd6941b044f40900d4c99'
- 'a413353b6d7b50659b681d76cdd8f776'
- '3a9147ba480b4aececbc70aa33fc9917'
- '37319736f6e25d70add33217eff30818'
- '2a4bc9f1c0b55f37e7fc92ef3ab8cf5d'
- '1fff9acffe3326545beb09c740d44b6b'
- '62d690efe261982864d3fa32e0239a96'
- '082d3648630d6598a39f677da29cff36'
- '228708e4516f88e68f829f1a9db61c57'
- '9cc41239414fdc754c3b793f1d7e3687'
- '760e3e973ba13d237eeec5242d2ac844'
- '631e269b9b67af6a5051c66fe83817c0'
- '0a87ae60bf970f9fa37b00d9682e2213'
- 'dc02816eb0a9abe9ebd92aa80b7d494a'
- '11d5de175fc96065d89d06474f6aaeeb'
- '5e0d0cfe252ad6209ca1fb5dba69e0f7'
- 'ddb128f54193c45b88640cf157420f3b'
- '53d1ecb05a575de362868efcfdd6043f'
- 'b7440790e099bc475f5e5fe18440dbe4'
- '6affd9862729c6c6697f96464c7475bc'
- 'd6ddadc8f0d32c2c3e601ae825881fac'
- '4dfb121fdaab263e650fe741f6d353c3'
- '45b4d8707e1bfd30e0b5393bb2e09533'
- '51d955380bd47c8c6709a6a47b54f600'
- '9f6818419d059157cb995a86892ad1f7'
- 'b7a7679359068b22efc4ba5902a7db39')
+md5sums=('7917e479db04573f738d25d9a57cb049'
+ 'ec1fadd5879ebbd7884b00c15e8148a8'
+ 'fc281450b90d5e7861ac4f555d5ea871'
+ '1fe8f0d56b76f2bd627627098813ace2'
+ 'fb3a5c73b806bbd7bd50a64a5894c831'
+ '84e222c9a5caa3cfd30b8c79cf49ae20'
+ '7a8b1160c2ac40dac7bb3ef788d7e2d0'
+ '3b974c5d14de638a36ee6b6e3a1fab94'
+ '6b40f968cd7c4a19ddc252fedf88dcbc'
+ 'd6f533690c8570150ea193e4784fa37e'
+ '75bcfbbacde730ec498345994d5da699'
+ '322971c545da5815bfaf9c9f5b380ea4'
+ '7da8514ff56ad89db85cf160bc02d8cc'
+ '8b748543ca637db910531f35fcc7eb1e'
+ '3a5188077b07d50a60c19a9be34fef2e'
+ 'c2f01b10da3a49049dadf13e7d62194b'
+ '97045cfea1caf0730557171a2dbc1384'
+ '969c813859367a254d7edbb16e323d62'
+ '479b9f915480af5c4cda1477bcc745f6'
+ '081f3d13f05b9d44d5bb2d7842998d68'
+ 'c527200432799e3a37180439074f7616'
+ '6b688e726d273c21bb08f9e09a3dae48'
+ 'b912eedaed384be13d99cbe769bb3683'
+ '9d828a0459fbb3997ade5a2c4bcfff35'
+ '67b79482d42d8057d0e66a8d00314efb'
+ 'da9661e6211765ca9d503d1ff0aaeec1'
+ 'e31f997e78fc2069b91a25cf71ee4a43'
+ '5207746c0154fc737d3bbeb5d468651b'
+ '191e284c168827fd4344f25c287f21d1'
+ 'ebcb9f2fb2571d045d3e19ee9d8cbb9f'
+ '81c5e660d89148f0ca7da1186f1cda3a'
+ 'ca8a2f10358da70d30c8a6af7bc44d54'
+ '8581d1f7e7e3a850d360e4da7506d166'
+ 'd4811aef8cdc90b6661a669ffad2ead8'
+ '41a9cd0e8ea9d71f4d82ac0f4e4911c0'
+ 'e00759dd17ea1647afe40c1b9f676187'
+ 'b145a19de88d7c62e319e5719cc079d5'
+ '817beaa2dab8f01cfcc5f034d537f97b'
+ '48257dba1a8ca1ccd9e75cf5d00819df'
+ '2036c221e16ea942795eae837a690615'
+ 'fc879e816fd4e831f47d14a3ed2442d7'
+ '1851131108d0f9665cddaf636c5de826'
+ '557c1a2d9176bde516c45112ae4632e8'
+ '9142dcd98b5ec1783d72ffcb1326aae7'
+ 'f4c0f20255fd7f715a923cd6f81301ca'
+ '1f65f925300b5e4317018d80d147fb46'
+ '955cba749d29a3608fb70e5914835f2b'
+ '7ad38d60e90f96404860ef281bddfe17'
+ 'd14126daf1067c19297ff1a94dc91e27'
+ 'a1e55184abcd990206c5c82d7445b53e'
+ '9e1eeb91fb680c4b09ed1439c8af4265'
+ 'b313eb3158561713f00eec0b3ff82739'
+ 'e42c798d9371109be8595653c87a96e6'
+ '499cb790565eb93e4387120815bc0d3f'
+ 'efed1f452372a569002282819f2828e8'
+ '6e6e1215ffcc77fbd5deac9b3856ecff'
+ '5905c1911035d9576e84791ac4416f23'
+ 'd7a49fa9daec5c4c403633e04ec03b49'
+ '58d91d27d4e9bb8106534bac2562c566'
+ '73fe09d52c99ede62bd8fd07c4780ee4'
+ '19eb3d4c88d80035645bbd6a992bf938'
+ '51a35fae949c997b5a300211a967d36d'
+ '579a02556b1200fc749600390dfb9d97'
+ '2d7f14c47a9b974a69bfb5f821c6f04b'
+ '8622ac1bb52fb56af89e26f2d2a98ffd'
+ 'f5073a3e7bbbc71184a29d567c3d0914'
+ '8979aaa64b9300ef245cb6368f1e3275'
+ '1444fd6ec5639b51fc4c15c3fc7d41ec'
+ '0eb171065c77b27c5aed4aa11fa2a6f4'
+ '4b2a490537405ceb2935225807d4bde9'
+ '69db8437023d658c5da0cf7388b1f579'
+ '8d6bf855d5070624268cc175f3e86a14'
+ '3edd9eea3d25fecb21787ce83499c994'
+ '3ab336a082a86f9c7df7a7873f40a6e9'
+ 'b798317e831b5b9a06161bdaf119ad4d'
+ 'e86a78e5bfcba6f45b9f0bbf42c5ad89'
+ '8f0a46cdd135c0d8858c409cbca4e9cd'
+ '0a78294d15ef47fb1916ca129c5348c0'
+ '625fb622c634c035f4b326928c776392'
+ '6b528ef1c3427e799d924b12a5e1fb39'
+ 'c790339622a85b5b307fb4a8fa496fe7'
+ '56021c871cce43c64bc6ddff5f794f31'
+ 'babbd7cde37d24463ea5d8a389abd512'
+ '6eb58fc54626a3b8d58c03f37dfc2ec1'
+ '782d556e773cb97298592fedabdc9a7f'
+ 'f2cf5e5a2b244d0afab2edd193209039'
+ '973c9e08c3329ba51625272db30d9d6c'
+ '28055c70eda06dcf371f0399dce94e8b')
diff --git a/libre/iceweasel-i18n/PKGBUILD.in b/libre/iceweasel-i18n/PKGBUILD.in
index 05477caef..05477caef 100644..100755
--- a/libre/iceweasel-i18n/PKGBUILD.in
+++ b/libre/iceweasel-i18n/PKGBUILD.in
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
new file mode 100755
index 000000000..a5fe02165
--- /dev/null
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -0,0 +1,281 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Tue, 5 Jun 2012 08:57:06 +0200
+Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
+
+diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
+index 0e8ccf5..fa46c08 100644
+--- a/browser/components/migration/content/migration.js
++++ b/browser/components/migration/content/migration.js
+@@ -249,7 +249,7 @@ var MigrationWizard = {
+ }
+
+ var brandBundle = document.getElementById("brandBundle");
+- // These strings don't exist when not using official branding. If that's
++ // These strings may not exist when not using official branding. If that's
+ // the case, just skip this page.
+ try {
+ var pageTitle = brandBundle.getString("homePageMigrationPageTitle");
+@@ -281,8 +281,8 @@ var MigrationWizard = {
+ case "chrome":
+ source = "sourceNameChrome";
+ break;
+- case "firefox":
+- source = "sourceNameFirefox";
++ case "self":
++ source = "brand";
+ break;
+ }
+
+@@ -292,7 +292,12 @@ var MigrationWizard = {
+ var oldHomePageURL = this._migrator.sourceHomePageURL;
+
+ if (oldHomePageURL && source) {
+- var appName = MigrationUtils.getLocalizedString(source);
++ var appName;
++ if (source == "brand") {
++ appName = brandBundle.GetStringFromName("brandFullName");
++ } else {
++ appName = MigrationUtils.getLocalizedString(source);
++ }
+ var oldHomePageLabel =
+ brandBundle.getFormattedString("homePageImport", [appName]);
+ var oldHomePage = document.getElementById("oldHomePage");
+diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
+index f030756..23e37ff 100644
+--- a/browser/components/migration/content/migration.xul
++++ b/browser/components/migration/content/migration.xul
+@@ -42,7 +42,7 @@
+ #elifdef XP_UNIX
+ <radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
+ #endif
+- <radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/>
++ <radio id="self" hidden="true"/>
+ <radio id="nothing" label="&importFromNothing.label;" accesskey="&importFromNothing.accesskey;" hidden="true"/>
+ </radiogroup>
+ <label id="noSources" hidden="true">&noMigrationSources.label;</label>
+diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
+index d7fec75..d531b83 100644
+--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
++++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
+@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
+ component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
+ component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
+-contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
++contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
+ #ifdef HAS_IE_MIGRATOR
+ component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
+diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
+index a6598fe..8f83da8 100644
+--- a/browser/components/migration/src/FirefoxProfileMigrator.js
++++ b/browser/components/migration/src/FirefoxProfileMigrator.js
+@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
+
+
+ FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
+-FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
++FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
+ FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
+
+ const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
+diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
+index 0669aa8..19552e3 100644
+--- a/browser/components/migration/src/MigrationUtils.jsm
++++ b/browser/components/migration/src/MigrationUtils.jsm
+@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({
+ * @see nsIStringBundle
+ */
+ getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
+- const OVERRIDES = {
+- "4_firefox": "4_firefox_history_and_bookmarks"
+- };
+- aKey = OVERRIDES[aKey] || aKey;
+-
+ if (aReplacements === undefined)
+ return getMigrationBundle().GetStringFromName(aKey);
+ return getMigrationBundle().formatStringFromName(
+@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({
+ },
+
+ /**
++ * Returns whether a given migration type is supported.
++ *
++ * @param aKey Migrator key
++ * @returns whether the migrator key is supported.
++ */
++ canMigrate:
++ function MU_canMigrate(aMigratorKey) {
++ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
++ },
++
++ /**
+ * Cleans up references to migrators and nsIProfileInstance instances.
+ */
+ finishMigration: function MU_finishMigration() {
+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
+index 744f117..59e5a4c 100644
+--- a/browser/components/migration/src/ProfileMigrator.js
++++ b/browser/components/migration/src/ProfileMigrator.js
+@@ -12,6 +12,7 @@ function ProfileMigrator() {
+
+ ProfileMigrator.prototype = {
+ migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
++ canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
+ QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
+ classDescription: "Profile Migrator",
+ contractID: "@mozilla.org/toolkit/profile-migrator;1",
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+index 21cf405..f3c1a6b 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
++++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+@@ -17,8 +17,6 @@
+ <!ENTITY importFromSafari.accesskey "S">
+ <!ENTITY importFromChrome.label "Chrome">
+ <!ENTITY importFromChrome.accesskey "C">
+-<!ENTITY importFromFirefox.label "Firefox">
+-<!ENTITY importFromFirefox.accesskey "X">
+
+ <!ENTITY noMigrationSources.label "No programs that contain bookmarks, history or password data could be found.">
+
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
+index 260bc29..52b32cc 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
++++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
+@@ -8,7 +8,6 @@ profileName_format=%S %S
+ sourceNameIE=Internet Explorer
+ sourceNameSafari=Safari
+ sourceNameChrome=Google Chrome
+-sourceNameFirefox=Mozilla Firefox
+
+ importedBookmarksFolder=From %S
+
+@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)
+ 2_ie=Cookies
+ 2_safari=Cookies
+ 2_chrome=Cookies
+-2_firefox=Cookies
++2_self=Cookies
+
+ 4_ie=Browsing History
+ 4_safari=Browsing History
+ 4_chrome=Browsing History
+-4_firefox_history_and_bookmarks=Browsing History and Bookmarks
++4_self=Browsing History and Bookmarks
+
+ 8_ie=Saved Form History
+ 8_safari=Saved Form History
+ 8_chrome=Saved Form History
+-8_firefox=Saved Form History
++8_self=Saved Form History
+
+ 16_ie=Saved Passwords
+ 16_safari=Saved Passwords
+ 16_chrome=Saved Passwords
+-16_firefox=Saved Passwords
++16_self=Saved Passwords
+
+ 32_ie=Favorites
+ 32_safari=Bookmarks
+@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)
+ 64_ie=Other Data
+ 64_safari=Other Data
+ 64_chrome=Other Data
+-64_firefox=Bookmarks Backups
++64_self=Bookmarks Backups
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index 339ffda..6999b26 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -38,7 +38,7 @@ toolkit.jar:
+ + content/global/mozilla.xhtml (mozilla.xhtml)
+ content/global/nsDragAndDrop.js (nsDragAndDrop.js)
+ content/global/resetProfile.css (resetProfile.css)
+-* content/global/resetProfile.js (resetProfile.js)
++ content/global/resetProfile.js (resetProfile.js)
+ content/global/resetProfile.xul (resetProfile.xul)
+ content/global/resetProfileProgress.xul (resetProfileProgress.xul)
+ content/global/treeUtils.js (treeUtils.js)
+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
+index dcb4065..09c1146 100644
+--- a/toolkit/content/resetProfile.js
++++ b/toolkit/content/resetProfile.js
+@@ -36,13 +36,13 @@ function resetSupported() {
+ getService(Ci.nsIToolkitProfileService);
+ let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-
+ // Reset is only supported for the default profile if the self-migrator used for reset exists.
+ try {
+- return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
+- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);
++ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
++ "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
++ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
++ return ("canMigrate" in pm) && pm.canMigrate("self");
++ }
+ } catch (e) {
+ // Catch exception when there is no selected profile.
+ Cu.reportError(e);
+@@ -53,9 +53,6 @@ function resetSupported() {
+ function getMigratedData() {
+ Components.utils.import("resource:///modules/MigrationUtils.jsm");
+
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-
+ // From migration.properties
+ const MIGRATED_TYPES = [
+ 4, // History and Bookmarks
+@@ -68,7 +65,7 @@ function getMigratedData() {
+ let dataTypes = [];
+ for (let itemID of MIGRATED_TYPES) {
+ try {
+- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
++ let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
+ dataTypes.push(typeName);
+ } catch (x) {
+ // Catch exceptions when the string for a data type doesn't exist.
+diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
+index f35c227..7062886 100644
+--- a/toolkit/profile/nsIProfileMigrator.idl
++++ b/toolkit/profile/nsIProfileMigrator.idl
+@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports
+ * @client Toolkit (Startup code)
+ * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
+ */
+-[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
++[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
+ interface nsIProfileMigrator : nsISupports
+ {
+ /**
+@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports
+ * @note The startup code ignores COM exceptions thrown from this method.
+ */
+ void migrate(in nsIProfileStartup aStartup, in ACString aKey);
++
++ /**
++ * Returns whether a given migration type is supported.
++ *
++ * @param aKey Migrator key
++ * @returns whether the migrator key is supported.
++ */
++ bool canMigrate(in ACString aKey);
+ };
+
+ %{C++
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index 60348b5..c240c4f 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3651,7 +3651,7 @@ XREMain::XRE_mainRun()
+ if (gDoProfileReset) {
+ // Automatically migrate from the current application if we just
+ // reset the profile.
+- aKey = MOZ_APP_NAME;
++ aKey = "self";
+ }
+ pm->Migrate(&mDirProvider, aKey);
+ }
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 63519ceb9..7532436d7 100644..100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -3,6 +3,8 @@
# Contributor: Figue <ffigue at gmail>
# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): vando <facundo@esdebian.org>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
# Thank you very much to the older contributors:
# Contributor: evr <evanroman at gmail>
@@ -10,10 +12,10 @@
_pgo=false
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=12.0
-_debrel=7
+_debver=16.0.2
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -42,67 +44,56 @@ url="http://www.geticeweasel.org/"
install=iceweasel.install
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
mozconfig
mozconfig.pgo
xulrunner-copy-stub.patch
libre.patch
iceweasel-install-dir.patch
- region.properties
- vendor.js)
-md5sums=('b45f57bfe21b0e6db4f0683e794917cb'
- '08aa0a949d9cbb26116490f7878a62fe'
- 'd7ad1c025d2442427a06cc702906ef0d'
+ vendor.js
+ shared-libs.patch
+ Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
+md5sums=('4a4f19048e34f7f0a2d28adc351df1ed'
+ 'ee38477dd7ede1c32e559ee74139b5c9'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '64be2fab525189c285ee04495d628035'
- 'e529742c0a425648087bc3ce537fe4c5'
- 'f1c76e7e244257856a386ca2de69bdf0'
- '0d053487907de4376d67d8f499c5502b')
+ '8768dfc39e9f1057c2956bf4405ae58e'
+ 'abf5ecb74caa857abb42bcfbb3442d9c'
+ '0d053487907de4376d67d8f499c5502b'
+ '52e52f840a49eb1d14be1c0065b03a93'
+ '0a31239f1008038df5057982fe745dec')
if [ "$_pkgname" != "$pkgname" ]; then
provides+=("$_pkgname=$pkgver")
conflicts+=("$_pkgname")
fi
-dpkg-source() {
- # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+build() {
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
- mv mozilla-release "${_debname}-${_debver}"
- mv debian "${_debname}-${_debver}"
- cd "${_debname}-${_debver}"
+ 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}"
-# Doesn't apply and seems unimportant
+ # Doesn't apply and seems unimportant
rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
- quilt push -a
- find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
- cd ..
-}
-
-build() {
-# Don't run this if we're using -e
-if [ $NOEXTRACT -eq 0 ]; then
- msg2 "Applying Debian patches..."
- cd "${srcdir}"
- dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+ # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
+ rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
- msg2 "Starting normal build..."
- mv "${_debname}-${_debver}" "$srcdir/mozilla-build"
- cd "$srcdir/mozilla-build"
+ quilt push -a
- cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+ 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"
-fi
-
- cd "$srcdir/mozilla-build"
- cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
+ patch -Np1 -i "$srcdir/shared-libs.patch"
+ cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+
if $_pgo; then
cat "$srcdir/mozconfig.pgo" >> .mozconfig
fi
@@ -136,9 +127,6 @@ fi
echo 'ac_add_options --disable-jemalloc' >> .mozconfig
fi
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
- export PYTHON="/usr/bin/python2"
-
if $_pgo; then
LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -149,10 +137,10 @@ fi
}
package() {
- cd "$srcdir/mozilla-build"
+ cd "${srcdir}/${DEBIAN_BUILD}"
make -j1 -f client.mk DESTDIR="$pkgdir" install
- install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
+ install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js"
# I don't even know why we're hitting the objdir, and ConnOS didn't.
_brandingdir=debian/branding
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch
index f80a3eca9..a44aef496 100644
--- a/libre/iceweasel-libre/iceweasel-install-dir.patch
+++ b/libre/iceweasel-libre/iceweasel-install-dir.patch
@@ -1,28 +1,31 @@
-diff -Nur iceweasel-9.0.1.orig/config/autoconf.mk.in iceweasel-9.0.1/config/autoconf.mk.in
---- iceweasel-9.0.1.orig/config/autoconf.mk.in 2011-12-31 17:07:52.000000000 -0500
-+++ iceweasel-9.0.1/config/autoconf.mk.in 2011-12-31 17:11:18.000000000 -0500
-@@ -68,8 +68,8 @@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk
+--- iceweasel-16.0.1.orig/config/baseconfig.mk 2012-10-10 19:42:45.000000000 -0200
++++ iceweasel-16.0.1/config/baseconfig.mk 2012-10-12 05:40:32.346949927 -0200
+@@ -1,10 +1,10 @@
+ INCLUDED_AUTOCONF_MK = 1
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION)))
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
-diff -Nur iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in iceweasel-9.0.1/js/src/config/autoconf.mk.in
---- iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in 2011-12-20 18:28:21.000000000 -0500
-+++ iceweasel-9.0.1/js/src/config/autoconf.mk.in 2011-12-31 17:11:43.000000000 -0500
-@@ -60,8 +60,8 @@
- datadir = @datadir@
- mandir = @mandir@
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk
+--- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk 2012-10-10 19:43:05.000000000 -0200
++++ iceweasel-16.0.1/js/src/config/baseconfig.mk 2012-10-12 05:08:23.064066227 -0200
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- TOP_DIST = @TOP_DIST@
ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel-libre/iceweasel.install
index c1fe8284a..c1fe8284a 100644..100755
--- 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 ecebbb3ce..7e7b7290f 100644..100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,33 +1,24 @@
-diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js
---- mozilla-build/browser/app/profile/firefox.js.orig 2012-03-20 01:04:55.890545738 -0300
-+++ mozilla-build/browser/app/profile/firefox.js 2012-03-20 01:05:03.330545430 -0300
-@@ -64,11 +64,11 @@
+diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js
+--- iceweasel-16.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300
++++ iceweasel-16.0/browser/app/profile/firefox.js 2012-10-11 17:19:44.984225170 -0200
+@@ -37,11 +37,11 @@
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
pref("extensions.getAddons.maxResults", 15);
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
-+pref("extensions.getAddons.get.url", "");
+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html");
// Blocklist preferences
pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
- pref("extensions.autoDisableScopes", 15);
-
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "");
-
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -200,7 +200,7 @@
+@@ -194,7 +194,7 @@
pref("extensions.update.interval", 86400); // Check for updates to Extensions and
// Themes every day
// Non-symmetric (not shared by extensions) extension-specific [update] preferences
@@ -36,25 +27,16 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
pref("extensions.dss.enabled", false); // Dynamic Skin Switching
pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
// restart.
-@@ -234,7 +234,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page", 1);
--pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage", "about:home");
-
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -324,7 +324,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
+@@ -327,7 +327,7 @@
+ pref("browser.download.panel.removeFinishedDownloads", false);
// search engines URL
-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
// pointer to the default engine name
pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -563,7 +563,7 @@
+@@ -584,7 +584,7 @@
pref("accessibility.typeaheadfind.flashBar", 1);
// plugin finder service url
@@ -63,85 +45,149 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
// 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);
-diff -urN iceweasel-9.0.1.orig/browser/base/content/syncSetup.js iceweasel-9.0.1/browser/base/content/syncSetup.js
---- iceweasel-9.0.1.orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0.1/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000
-@@ -59,7 +59,7 @@
- // Broader than we'd like, but after this changed from api-secure.recaptcha.net
- // we had no choice. At least we only do this for the duration of setup.
- // See discussion in Bugs 508112 and 653307.
--const RECAPTCHA_DOMAIN = "https://www.google.com";
-+const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com";
-
- Cu.import("resource://services-sync/main.js");
- Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000
-@@ -1,8 +1,8 @@
+diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-14.0.1/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 02:17:00.978636665 -0300
+@@ -1,23 +1,23 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
++browser.search.defaultenginename=Duck Duck Go (Lite)
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-+browser.search.order.1=DuckDuckGo
- browser.search.order.2=Yahoo
- browser.search.order.3=Bing
+-browser.search.order.2=Yahoo
+-browser.search.order.3=Bing
++browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.2=Seeks Search
++browser.search.order.3=YaCy
+
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
+-browser.contentHandlers.types.0.title=Google
+-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
+-browser.contentHandlers.types.1.title=My Yahoo!
+-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
-@@ -17,7 +17,7 @@
+ # 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=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=http://duckduck.go.com/?q={searchTerms}
+-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/lite/?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
-diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html
---- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000
+@@ -27,19 +27,19 @@
+ gecko.handlerService.defaultHandlersVersion=3
+
+ # The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
++gecko.handlerService.schemes.webcal.0.name=
++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
+
+ # The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
++gecko.handlerService.schemes.mailto.0.name=
++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
++gecko.handlerService.schemes.mailto.1.name=
++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
+
+ # The default set of protocol handlers for irc:
+-gecko.handlerService.schemes.irc.0.name=Mibbit
+-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
+
+ # The default set of protocol handlers for ircs:
+-gecko.handlerService.schemes.ircs.0.name=Mibbit
+-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
+diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
+--- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300
++++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300
@@ -143,7 +143,7 @@
</p>
<p>
<a>&lt;a&gt; anchor</a><br>
- <a href="http://www.google.com">&lt;a&gt; a + href</a>
-+ <a href="http://www.duckduckgo.com">&lt;a&gt; a + href</a>
++ <a href="https://duckduckgo.com/lite">&lt;a&gt; a + href</a>
</p>
<p>
<abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
-diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul
---- iceweasel-9.0.1.orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000
-+++ iceweasel-9.0.1/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000
-@@ -301,6 +301,6 @@
+diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
+--- mozilla-build.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300
++++ mozilla-build/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300
+@@ -294,6 +294,6 @@
oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
</toolbar>
- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+ <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="page" remote="true"/>
++ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/>
<label id="messageLog" value="" crop="center"/>
</window>
-diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul
---- iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul 2011-12-16 20:29:28.000000000 +0000
-+++ iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul 2011-12-21 10:03:06.408062626 +0000
+diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
+--- mozilla-build.orig/mobile/android/app/mobile.js 2012-07-12 14:27:37.000000000 -0300
++++ mozilla-build/mobile/android/app/mobile.js 2012-07-17 22:14:47.293560718 -0300
+@@ -226,13 +226,13 @@
+ /* preferences for the Get Add-ons pane */
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/android/recommended/");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
+-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+
+ /* preference for the locale picker */
+ pref("extensions.getLocales.get.url", "");
+@@ -259,7 +259,7 @@
+ pref("dom.disable_window_find", true);
+
+ pref("keyword.enabled", true);
+-pref("keyword.URL", "");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
+
+ pref("accessibility.typeaheadfind", false);
+ pref("accessibility.typeaheadfind.timeout", 5000);
+diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
+--- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300
++++ mozilla-build/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300
@@ -69,6 +69,6 @@
label="setViewportScale"/>
</toolbar>
- <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+ <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="content"
++ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content"
remote="true"/>
</window>
-diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/xul/app/mobile.js
---- mozilla-build/mobile/xul/app/mobile.js.orig 2012-03-20 01:02:30.300551777 -0300
-+++ mozilla-build/mobile/xul/app/mobile.js 2012-03-20 01:02:40.820551342 -0300
-@@ -220,13 +220,12 @@
+diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
+--- mozilla-build.orig/mobile/xul/app/mobile.js 2012-06-01 09:04:14.000000000 -0300
++++ mozilla-build/mobile/xul/app/mobile.js 2012-06-05 20:48:20.193241600 -0300
+@@ -221,13 +221,12 @@
/* preferences for the Get Add-ons pane */
pref("extensions.getAddons.cache.enabled", true);
pref("extensions.getAddons.maxResults", 15);
-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
@@ -155,53 +201,77 @@ diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/x
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
-@@ -239,7 +240,7 @@
- pref("privacy.popups.showBrowserMessage", true);
+@@ -247,7 +246,7 @@
+ pref("dom.disable_window_open_dialog_feature", true);
pref("keyword.enabled", true);
--pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
+-pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties
---- iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties 2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties 2011-12-21 09:54:17.560062443 +0000
-@@ -1,8 +1,8 @@
+diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
+--- mozilla-release.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300
++++ mozilla-release/mobile/locales/en-US/chrome/region.properties 2012-06-15 02:17:43.446130868 -0300
+@@ -1,18 +1,18 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
++browser.search.defaultenginename=Duck Duck Go (Lite)
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-+browser.search.order.1=DuckDuckGo
++browser.search.order.1=Duck Duck Go (Lite)
# This is the default set of web based feed handlers shown in the reader
# selection UI
-@@ -12,7 +12,7 @@
- browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
+-browser.contentHandlers.types.0.title=My Yahoo
+-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
+-browser.contentHandlers.types.1.title=Google
+-browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
# Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=http://duckduckgo.com/?q=
+-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
++keyword.URL=https://duckduckgo.com/lite/?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
-diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/modules/libpref/src/init/all.js
---- iceweasel-9.0.1.orig/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0.1/modules/libpref/src/init/all.js 2011-12-21 10:09:17.136062754 +0000
+@@ -22,11 +22,11 @@
+ gecko.handlerService.defaultHandlersVersion=2
+
+ # The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
++gecko.handlerService.schemes.webcal.0.name=
++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
+
+ # The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
++gecko.handlerService.schemes.mailto.0.name=
++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
++gecko.handlerService.schemes.mailto.1.name=
++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
+diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js
+--- mozilla-build.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300
++++ mozilla-build/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300
@@ -47,7 +47,7 @@
// SYNTAX HINTS: dashes are delimiters. Use underscores instead.
// The first character after a period must be alphabetic.
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
+-pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties
---- iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-16 20:29:43.000000000 +0000
-+++ iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-21 12:51:31.188066096 +0000
+diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
+--- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-01 09:04:20.000000000 -0300
++++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-05 20:58:59.068158482 -0300
@@ -4,10 +4,10 @@
pluginStartupMessage=Starting Plugin for type
@@ -212,31 +282,157 @@ diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region
-pluginupdates_url=http://www.mozilla.com/plugincheck/
-plugindoc_label=plugindoc.mozdev.org
-plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=gnuzilla.gnu.org
-+more_plugins_url=http://www.gnu.org/s/gnuzilla/addons.html
-+pluginupdates_label=gnuzilla.gnu.org
-+pluginupdates_url=http://www.gnu.org/s/gnuzilla/addons.html
-+plugindoc_label=gnuzilla.gnu.org
-+plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html
-
---- iceweasel-10.0.orig/browser/locales/generic/profile/bookmarks.html.in 2012-02-07 15:40:34.279657460 -0300
-+++ iceweasel-10.0/browser/locales/generic/profile/bookmarks.html.in 2012-02-07 15:40:19.226324812 -0300
-@@ -11,13 +11,13 @@
++more_plugins_label=
++more_plugins_url=about:blank
++pluginupdates_label=
++pluginupdates_url=about:blank
++plugindoc_label=
++plugindoc_url=about:blank
+
+diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300
+@@ -11,13 +11,20 @@
<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
<DD>@bookmarks_toolbarfolder_description@
<DL><p>
- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
-+ <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</A>
-+ <DT><A HREF="https://parabolagnulinux.org/">Parabola</A>
++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D" ID="rdf:#$GvPhC3">Parabola GNU/Linux-libre</A>
</DL><p>
- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
+- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
++ <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3>
<DL><p>
- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
-+ <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A>
-+ <DT><A HREF="http://libreplanet.org/">LibrePlanet</A>
-+ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</A>
++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</A>
++ <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Packages</A>
++ <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Wiki</A>
++ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Labs</A>
++ </DL><p>
++ <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
++ <DL><p>
++ <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
++ <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A>
++ <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A>
++ <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-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300
+@@ -38,104 +38,6 @@
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+-// If a definition requires additional params, check that the final search url
+-// is handled correctly by the engine.
+-const SEARCH_ENGINES = {
+- "Google": {
+- image: "data:image/png;base64," +
+- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
+- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
+- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
+- "Vivt6Ztzz5y5b+7yf//3f/9/38PoW7gYY+i7uDDG39heJfT/q91LGTiTIcWJkCxzxDmCCBGCkBEO" +
+- "FDCm5CPs+CGWYvcliRxEzDwgu9I/IzZClonQgT/jC9Eu3GFTz6sdKc57kIzHWKaFjIA2wz++Zhkn" +
+- "yblMIDkAFIcDDFcQ+vtjGJuaOlKPkB2G4V4U9kcu8zfWlPtPVX/g9zZ7QwE03jDTqzWVndBUc57a" +
+- "Up91gToce0cf3R05El5u6gYyNQ0BKK/x/nNmjKwwxBmx8/eSNHiWsVLXlBJ/7UdTazcN3gn3bYEw" +
+- "FmG3pvOobRuScoc+ibEyF6GsUugrgEYuMGD4nqltmJjqFBkt+gcJ/ed0SZIA5crZ+gumrpQ0H319" +
+- "ogBFh6aJFoGmQguf2n7tu62HnvgJ1cPBcN3m6dAnX4CM4QAQigmxdQthm9EEJ58bY3bOl/CQ2YE5" +
+- "pu24LdBwZE7De+M+4gBAs/IntETphOHD4FOzNoNPbjuzBkn+48/9qKXywWPcM99Edvh2siPfHeyc" +
+- "nH8mU/pM2pJLsfshI0KCNRv7viiYYXW7sRnmxTFQhCp3G9/CTqzLsht3jtkrmGJdgGF0xmYpQx5G" +
+- "KBEInWdWSs4pnm6bLD3i95WJsDG7jmtiXFYwlmF2WXATmCPROE05IGa3G33sxPrsL014tGRMVo5D" +
+- "uVdirD/8zJBluQgC9qSF2JKcV9cuPwudsbq1YLqCydjYGOkSngYtKq36vJUs6jqhuqXtgCvursty" +
+- "uHOnSZIMWROnc/dR2J5pYAZO3tF0rOwvAXI/jvKZ/vN6zVNuHQGWjYNx/SWGiohtH9R1Y17HDRvf" +
+- "4XtUCEoaQwyGbEOr5QZ3HeeLbRwrosnRNB5lHNwpuBn+HK2KWFsLcd34scWpGJd5g6Ener61faoQ" +
+- "bOXk6OsWpycnP98yYdzMrLINxYks+3h1fvZlHfE6M6LXu0oa4mPko8s7TL70kuSnOmVIMxvW5n2v" +
+- "00111fF1htzXWiwpnrJAw8FbD60qXtHn9o9LUrJ6r2CUBoOnDpQeKxu0ncPhntgRwKLRcErUVd9t" +
+- "k1falinlvLLmLr7WHfndsh/t0WOdg9Dt1cOHTyrctWutRGzH5ZbNjcQ0FpEce+lMQwCnpMRqnSQ3" +
+- "Qu50hFIzMXJnSsjt+aI+fG/kiOwUStcFQuG9AMor0GUI0da6btoyKxIKnWKaXlR/zajFCYWlXNBB" +
+- "WslMKz+tpOEezkIxJtJzuvfl5ia1DCiQnuki6+MiXzRlR47s9Lwdaa1bCKAc4uscXnX5mwFvzdO6" +
+- "JnlQSv8lgiOUERZ1QYLG4PqJE+ZItl2y4MDB3wjma8/XnGiuavSuUMNhKNOshdyZkmViD7EAGBrX" +
+- "K9gzA1CYqPZEfEoAEK91eN3jTELIlRT7jnuhm9M5mxrmJZVNvjUio0VEC3Exr2ryLTbVCJI0/ZfL" +
+- "e/TI5ZusfbXbKAcjP2706msTQRHiH3pxa2ghgIlkU+9b91zqRA6OK6MIQh+nG8HP6wT4PPzD3n3z" +
+- "lxoRiohl5eVd/1G/qC2Ug8LBOcMYh5PYd6mqemTRJ8d88axb3r//NTkYT2tQ1e27W3yzo+aamh0k" +
+- "NoWIcfeJ1Ss8A2EU0xgqflEkYQBGBuYAe3hByAHiNVBcqyRdLzEjYLhpEGFk/CaHXFtZX79RD4WR" +
+- "Bl4plOWR3MhkbI0DMOHfFhNjaEK6Neas1D9Rg3qVHQFwLHIV9DkN01miaxD6LNUjQpKPMQLHl522" +
+- "jWAVtQxELTM7agBN+AdcGwYNvJREtDwjrOL5hQWpVf36TTtcVFRhGMaAlxsbpw+prCwt/fRTHoZE" +
+- "MVS1Sna5r5CUpKExisc0RVFix4BoKEFHlDES78dIcYjdf0FRhapqH5tQxAyTtiOwZHVTk3dWdnaV" +
+- "zFgv27a5RzfKlt6PAiOZFQWmrUTy2Y3WFntPdgruhXVWxIFRA2ZIBq9QqeP18PvlBPAtRq0gHGNQ" +
+- "uHbN4ej+qJDDmMZIaaZZYASC/MzTe1RScmmdqlZce/z4CLFfW7RoppWsSP1Wy7R5NeTpfMNnU+s2" +
+- "pGIZ2KC4oEGoOOCb/7aNpkKbWKsswhhoUrQZBmPdp/hXcWDUQCjIGZFByLB2Su9ogaUaRhAa8hsG" +
+- "DxXFCmlB8CBKleyhZynXiWkwv6VRpEVYkBtnBGq28bMPZcmjC0rKCxPLFqy4GDWbVwSOPemLGhvP" +
+- "SMJNlc2+es0fQGYo5HnH59sCoMQLWVU0LV4ISqHjf/obtbQQxCbMnPngRcM25MbCB5giDo+Hl6Xg" +
+- "qtVd6yqWeu7e91RyR++Rd28OthAUaLZRa+0Rrg+SNxQqD0dDyRx9lmqY6brOVDi7HFHV9/mWvV5z" +
+- "r63aSCF0yDOlcla7NZrFmA3AeH2E1052/ebi1ZZ6ej3oh8eZ2fe1vtPqOTi495SaHygOOc1/dOFj" +
+- "QnsYhdMw44lFaMysU6dOBCBvRcCB35fl+0X4am3COCaakdoVjVaoZgW1dESJnSd5hiz/7NU02Qbd" +
+- "4dpDYdLL7wizOLW5OGoRTAM+G0VCBrg0yDOMXRGJPB8GNpim2efF7Ozi9hgA4Hfxm0b53NbW/Zyy" +
+- "i7bQlyJBFjIjDF1ViKe29xhEJizP0Flw6S76klhfrX+j8C7dt/8BPRxpsGnGyqKfGRQ7O20OVr80" +
+- "NVT9bIMIBwhrygMsLr7RcKvT9bUq1zXLumVtdvaAs56V+GK+3UMXEK15HzU1jvANHa47/YIGJ2cT" +
+- "DmAWSIZtUdT9tiDpNjEQpZ1pJpumqiKih0AfSHTB2X7/2w2GsT4CNM8k5NlnPJ7Eyg+vT0+faVqW" +
+- "Z2tEu1cYaC3fQxsPnaS/swAYN2K/qnhQHpgAKC6/Xx6Qgtmkilo2Z9WHrFHQnO/Bf/rtoctPlOVM" +
+- "az35/pKIyhCAh6SUQre4H/M+L7lAqJl+RvKsVeHw0pBlntJME2VQunVzRsaERCfuyMzMfyszMzN+" +
+- "ak52XTQ2333prxdJzuyRXGSw7KjFEnlUwYF1zrROLbxO4umwcVOWkjV0z51YyXqaEQsR9djYQMX4" +
+- "TTwVQst8NiVlPqS+Upj0EAyZB9+tcB4ZByJ71V5C7ntcj550Q4KBTl7pvjFVmtbnYvSQ7ACcEZoD" +
+- "fTUwbgDE490fN6B5o5fRjdAXiDNBGKLwNVMLZnTJLPrDh1hypAFHAkTzXnNqc+GHfG75oYxVYN0k" +
+- "YEwQXPEAcuF9ZIH/01ku1/ChivJHkNCeMk8sCNXChCdhQr7+6uvC4RU4d8RJ1PRuV64JKdDSU3su" +
+- "HuHMuKJUcuWMhMU4QHwflWBHgFEb4tXuSs3gEaLV7bdDlXvU6rm7hKH8SobmmawohUNkeSDUghdD" +
+- "0vfXMrbnYdOoSij6Eg108TFje6EOMwbjwZ0zUHeXA5GGANoz6jm2VwCotikBcN7YpvHEtvrDnoqh" +
+- "t58kuzpDJcoPhQDO6YGn3+pTK/007QYUoClgOUHpWAUuldPV4VYYn8rXfMDpHN4NS4McOBpsJ7fZ" +
+- "9utrbNvLWYdzrq5H3PO+Hfmy8GCKaI7U7o/3wq6ObklOIkhykcD+sbuFMeKAcKYos8RvSczhEgLM" +
+- "EioJknDoTEznWLDNJb5RO2POPBfqf2frdFN3LAz6Im+agU9e+Xzn8HLod+dcueXnDk/vX2DZlQaK" +
+- "/ebpLV0miPmcCXs1xZySWC9JMA/Fz3/CeXZbgcTCIEVMqiSAkFguxQ0mX06IX9KueIuPpV/xPCS+" +
+- "ttQGnDMs6Tej8SaseF4LN9c9cnxNj6VxI8Q+3em9Hx+c3PmW1UDztMZtXVLEfdymbGAJ60kJGZQm" +
+- "tH99bE8YGN/wd/mgxdG7NFDb8/ZohryYA5HguHhI5uYO27vyoqtrmAiXr31JX/V48CuY8R8FJhxE" +
+- "eeEAQWk9HnYlFmMJoRKG03QLtUJ7/93FvpXXJ7wM/6Za4l71UEu5pWkoucv0Be0tm95vmUdy5t5k" +
+- "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
+- "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
+- "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
+- , 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=="
+- }
+-};
+-
+ // The process of adding a new default snippet involves:
+ // * add a new entity to aboutHome.dtd
+ // * add a <span/> for it in aboutHome.xhtml
+@@ -143,7 +45,7 @@
+ // The <a/> part of the snippet will be linked to the corresponding url.
+ const DEFAULT_SNIPPETS_URLS = [
+ "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
+-, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
++, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
+ ];
+
+ const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index e79896323..e79896323 100644..100755
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo
index b0c249ebf..b0c249ebf 100644..100755
--- a/libre/iceweasel-libre/mozconfig.pgo
+++ b/libre/iceweasel-libre/mozconfig.pgo
diff --git a/libre/iceweasel-libre/region.properties b/libre/iceweasel-libre/region.properties
deleted file mode 100644
index 2e980987e..000000000
--- a/libre/iceweasel-libre/region.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Default search engine
-browser.search.defaultenginename=Duck Duck Go (SSL)
-
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Duck Duck Go (SSL)
-browser.search.order.2=Duck Duck Go (Lite)
-
-
-# Keyword URL (for location bar searches)
-keyword.URL=https://duckduckgo.com/?q=
-
-# 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/?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
diff --git a/libre/iceweasel-libre/shared-libs.patch b/libre/iceweasel-libre/shared-libs.patch
new file mode 100755
index 000000000..1f22b2b0d
--- /dev/null
+++ b/libre/iceweasel-libre/shared-libs.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
+--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000
++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000
+@@ -50,7 +50,7 @@
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+ # Some files have been already bundled with xulrunner
+ ifndef SYSTEM_LIBXUL
+-MOZ_PKG_FATAL_WARNINGS = 1
++MOZ_PKG_FATAL_WARNINGS = 0
+ endif
+
+ MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index d8d606bc1..d8d606bc1 100644..100755
--- 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
index e3b8e9376..e3b8e9376 100644..100755
--- a/libre/iceweasel-libre/xulrunner-copy-stub.patch
+++ b/libre/iceweasel-libre/xulrunner-copy-stub.patch
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
new file mode 100755
index 000000000..a9b7a2423
--- /dev/null
+++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
@@ -0,0 +1,29 @@
+From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Tue, 3 Jul 2012 22:28:05 -0400
+Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi
+To: arch-projects@archlinux.org
+
+systemd-186 writes this file when running systemd-tmpfiles, but
+initscripts never removes it. This disallows all non-root logins.
+
+Reported-by: Dan McGee <dan@archlinux.org>
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+---
+ rc.multi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/rc.multi b/rc.multi
+index daf2372..7d4acaa 100755
+--- a/rc.multi
++++ b/rc.multi
+@@ -31,4 +31,6 @@ run_hook multi_end
+
+ bootlogd_stop
+
++rm -f /run/nologin
++
+ # vim: set ts=2 sw=2 noet:
+--
+1.7.11.1
+
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index e58947f8d..1f68a6356 100644..100755
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,33 +1,37 @@
-# $Id: PKGBUILD 144989 2011-12-13 15:25:38Z tomegun $
+# $Id: PKGBUILD 167943 2012-10-03 23:12:35Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Thomas Bächler <thomas@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
pkgname=initscripts
-pkgver=2012.05.2
-pkgrel=2
+pkgver=2012.10.5
+pkgrel=1
pkgdesc="System initialization/bootup scripts (Parabola branding)"
arch=('any')
url="https://parabolagnulinux.org"
license=('GPL2')
groups=('base')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
-depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=182' 'udev<=183' 'iproute2'
- 'ncurses' 'kbd' 'findutils' 'sysvinit')
-optdepends=('bridge-utils: Network bridging support'
- 'dhcpcd: DHCP network configuration'
- 'net-tools: legacy network support'
- 'wireless_tools: Wireless networking')
+provides=('initscripts-systemd')
+conflicts=('initscripts-systemd')
+replaces=('initscripts-systemd')
+backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
+depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools')
+optdepends=('dhcpcd: DHCP network configuration'
+ 'bridge-utils: Legacy network bridging support'
+ 'net-tools: Legacy network support'
+ 'wireless_tools: Legacy wireless networking'
+ 'sysvinit: Legacy init support')
makedepends=(asciidoc)
install=initscripts.install
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
- 'wireless.conf.d')
-md5sums=('2b845c1c6660b32720aa12aa5f9649be'
- '027576534885b8d5dded9be546057b12')
+source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig})
package() {
cd ${srcdir}/${pkgname}-${pkgver}
+
make DESTDIR=${pkgdir} install
- install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
}
+md5sums=('16039aeb4c996194d9466a8c66a06f5a'
+ '522804c7981c32c3c779964844d64377')
+md5sums=('3be94446496bda58051141e0d3863a7b'
+ '3f03d3a5c7d8b7e1ddebb13334441440')
diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install
index 963713bee..557faafe4 100644..100755
--- a/libre/initscripts/initscripts.install
+++ b/libre/initscripts/initscripts.install
@@ -16,4 +16,11 @@ post_upgrade() {
echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf,"
echo "as LOCALE in /etc/rc.conf no longer works."
fi
+ if [ "$(vercmp $2 2012.08.1)" -lt 0 ]; then
+ echo "----"
+ echo "> initscripts now ships a compatibility layer to make systemd use MODULES and"
+ echo "> DAEMONS from rc.conf; and run rc.local and rc.local.shutdown on boot and"
+ echo "> shutdown, respectively. Refer to arch-modules-load(8) and arch-daemons(8)."
+ echo "----"
+ fi
}
diff --git a/libre/initscripts/split-hwclock-calls.diff b/libre/initscripts/split-hwclock-calls.diff
new file mode 100644
index 000000000..c0a6a4fd6
--- /dev/null
+++ b/libre/initscripts/split-hwclock-calls.diff
@@ -0,0 +1,21 @@
+diff --git a/rc.sysinit b/rc.sysinit
+index eb49e2b..8f9727b 100755
+--- a/rc.sysinit
++++ b/rc.sysinit
+@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid
+
+ run_hook sysinit_start
+
+-HWCLOCK_PARAMS="--systz"
+ case $HARDWARECLOCK in
+ "") ;;
+ UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";;
+@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then
+
+ [[ $TIMEZONE ]] && export TZ=$TIMEZONE
+
+- hwclock $HWCLOCK_PARAMS && stat_done || stat_fail
++ { hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done || stat_fail
+
+ unset TZ
+ fi
diff --git a/libre/initscripts/wireless.conf.d b/libre/initscripts/wireless.conf.d
index 47540ef40..47540ef40 100644..100755
--- a/libre/initscripts/wireless.conf.d
+++ b/libre/initscripts/wireless.conf.d
diff --git a/libre/java-asm2/PKGBUILD b/libre/java-asm2/PKGBUILD
deleted file mode 100644
index 4853d79c0..000000000
--- a/libre/java-asm2/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=asm
-pkgname=java-asm2
-_pkgver=2
-pkgver=2.2.3
-pkgrel=4
-pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
-arch=('any')
-url="http://asm.ow2.org/"
-license=('custom:BSD3')
-depends=('java-runtime')
-makedepends=(
- apache-ant
- java-ow-util-ant-tasks
-)
-source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
-
-_M2_LOCALREPO='/usr/share/maven/repository'
-_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
-_m2_packages=(
- asm
- asm-analysis
- asm-attrs
- asm-commons
- asm-tree
- asm-util
- asm-xml
- asm-all)
-
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- mkdir -p test/lib
-
- echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
- ant dist
-
- # This will make package() easier:
- cd output/dist/lib
- ln -s all/* .
-}
-
-package() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- # Install license file
- install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- # Install documentation
- cd output/dist
- install -d "$pkgdir/usr/share/doc/$pkgname"
- cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
- cp -r examples "$pkgdir/usr/share/doc/$pkgname/examples"
-
- # Install Apache Maven modules
- cd lib
- install -d "$pkgdir"/usr/share/java/asm
- for pkg in "${_m2_packages[@]}"; do
- dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
- # Create the Maven directory
- install -d "$pkgdir$dir"
- # Install the files
- cp $pkg-$pkgver.* "$pkgdir$dir"
- # Symlink them to /usr/share/java
- ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
- ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
- done
-
- # Install a README file about the -all files
- cd "$srcdir/$_pkgname-$pkgver"
- install -m644 output/dist/lib/all/README.txt \
- "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
-}
-
-md5sums=('7a92c87bf067925685cf68dcc0dd8998')
diff --git a/libre/java-asm3/PKGBUILD b/libre/java-asm3/PKGBUILD
deleted file mode 100644
index 7e66a5b5a..000000000
--- a/libre/java-asm3/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=asm
-pkgname=java-asm3
-_pkgver=3
-pkgver=3.3.1
-pkgrel=4.1
-pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
-arch=('any')
-url="http://asm.ow2.org/"
-license=('custom:BSD3')
-depends=('java-runtime')
-makedepends=(
- apache-ant
- java-ow-util-ant-tasks
-)
-source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
-
-_M2_LOCALREPO='/usr/share/maven/repository'
-_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
-_m2_packages=(
- asm
- asm-analysis
- asm-commons
- asm-parent
- asm-tree
- asm-util
- asm-xml
- asm-all
- asm-debug-all)
-
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- rm cobertura.ser # We regenerate this
- rm examples/jasmin/test/jasmin.jar
-
- echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
- ant dist
-
- # This will make package() easier:
- cd output/dist/lib
- ln -s all/* .
-}
-
-package() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- # Install license file
- install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- # Install documentation
- cd output/dist
- install -d "$pkgdir/usr/share/doc/$pkgname"
- cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
- cp -r examples "$pkgdir/usr/share/doc/$pkgname/examples"
-
- # Install Apache Maven modules
- cd lib
- install -d "$pkgdir"/usr/share/java/asm
- for pkg in "${_m2_packages[@]}"; do
- dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
- # Create the Maven directory
- install -d "$pkgdir$dir"
- # Install the files
- cp $pkg-$pkgver.* "$pkgdir$dir"
- # Symlink them to /usr/share/java
- ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
- ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
- done
-
- # Install a README file about the -all files
- cd "$srcdir/$_pkgname-$pkgver"
- install -m644 output/dist/lib/all/README.txt \
- "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
-}
-
-md5sums=('433024df8176f09922646316e415631c')
diff --git a/libre/java-ow-util-ant-tasks/PKGBUILD b/libre/java-ow-util-ant-tasks/PKGBUILD
deleted file mode 100644
index 023048188..000000000
--- a/libre/java-ow-util-ant-tasks/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=java-ow-util-ant-tasks
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="ObjectWeb utility Ant tasks library"
-arch=('any')
-url="http://forge.ow2.org/projects/monolog"
-license=('LGPL')
-depends=('java-environment')
-makedepends=('apache-ant' 'xalan-java' 'java-asm2')
-source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src.tar.xz")
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ln -s /usr/share/java/asm-2.jar externals
- ln -s /usr/share/java/xalan.jar externals
- ant jar
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- install -d "$pkgdir"/usr/share/java
- install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java
-}
-
-md5sums=('339b3eb4b2960473a42f5f781afbeca6')
diff --git a/libre/java-ow-util-ant-tasks/SRCBUILD b/libre/java-ow-util-ant-tasks/SRCBUILD
deleted file mode 100644
index 01241907d..000000000
--- a/libre/java-ow-util-ant-tasks/SRCBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=java-ow-util-ant-tasks
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="ObjectWeb utility Ant tasks library"
-arch=('any')
-url="http://forge.ow2.org/projects/monolog"
-license=('LGPL')
-source=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip")
-noextract=("ow_util_ant_tasks_$pkgver.zip")
-
-build() {
- cd "$srcdir"
- mkdir $pkgname-$pkgver
- cd $pkgname-$pkgver
- bsdtar xf "$srcdir"/ow_util_ant_tasks_$pkgver.zip
- rm -rf output
- rm externals/*
-}
-
-
-package() {
- PKGEXT=${SRCEXT}
- PKGDEST=${SRCDEST}
- cp -a "$srcdir/$pkgname-$pkgver" "$pkgdir/"
-}
-
-md5sums=('cd602bf75a0feab480fa97739955b84e')
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 9c1223d07..17fafa08c 100644..100755
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 158148 2012-05-03 13:20:53Z andrea $
+# $Id: PKGBUILD 165939 2012-09-03 21:49:19Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
-pkgver=4.8.3
-pkgrel=1.3
+pkgver=4.9.2
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/internet/konqueror/"
license=('GPL' 'LGPL' 'FDL')
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
"konq-about-fsdg.diff")
-sha1sums=('593053e7fdd50b32e6f9264edf2a69e499ddc0a6'
+sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66'
'f41541371414dcbe5e76687835e648112b3ff364')
pkgdesc='KDE File Manager & Web Browser'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-konqueror-libre/kdebase-konqueror.install b/libre/kdebase-konqueror-libre/kdebase-konqueror.install
index 5495fb1b5..5495fb1b5 100644..100755
--- 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 06b2103c3..06b2103c3 100644..100755
--- 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
new file mode 100644
index 000000000..008b94310
--- /dev/null
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=kdebase-runtime
+pkgname=kdebase-runtime-libre
+pkgver=4.9.2
+pkgrel=2
+pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)"
+arch=('i686' 'x86_64' 'mips64el')
+url='https://projects.kde.org/projects/kde/kde-runtime'
+license=('GPL' 'LGPL')
+depends=('nepomuk-core' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth'
+ 'kactivities')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
+ 'networkmanager')
+optdepends=('kdepimlibs: to generate drkonqi reports'
+ 'htdig: to build the search index in khelpcenter'
+ 'rarian: needed by khelpcenter'
+ 'gdb: drkonq crash handler')
+replaces=("${_pkgname}")
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
+install="${_pkgname}.install"
+source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
+ 'duckduckgo_lite.desktop')
+sha1sums=('97c811e404322e520f62320c919eecd73db8c5dd'
+ '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85')
+
+build() {
+ cd "${srcdir}"
+
+# Removing non-privacy search providers
+ rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,altavista,amazon{,_mp3},amg,austronaut,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,froogle,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,gracenote,imdb,jeeves,katatudo,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,vivisimo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
+
+# Adding DuckDuckGo Lite
+ cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
+
+ mkdir build
+ cd build
+ cmake ../kde-runtime-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_QNtrack=OFF \
+ -DWITH_Xine=OFF
+ make
+}
+
+package() {
+ cd "$srcdir/build"
+ make DESTDIR="$pkgdir" install
+ rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
+
+ ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
+}
diff --git a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
new file mode 100644
index 000000000..2b875b4c1
--- /dev/null
+++ b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Charset=
+Hidden=false
+Keys=duckduckgo,dd,dukgo
+Name=Duck Duck Go Lite
+Name[ar]=Duck Duck Go Lite
+Name[ast]=Duck Duck Go Lite
+Name[bg]=Duck Duck Go Lite
+Name[bn]=Duck Duck Go Lite
+Name[bs]=Dak dak go lite
+Name[ca]=Duck Duck Go Lite
+Name[ca@valencia]=Duck Duck Go Lite
+Name[cs]=Duck Duck Go Lite
+Name[da]=Duck Duck Go Lite
+Name[de]=Duck Duck Go Lite
+Name[el]=Duck Duck Go Lite
+Name[en_GB]=Duck Duck Go Lite
+Name[eo]=Duck Duck Go Lite
+Name[es]=Duck Duck Go Lite
+Name[et]=Duck Duck Go Lite
+Name[eu]=Duck Duck Go Lite
+Name[fa]=Duck Duck Go Lite
+Name[fi]=Duck Duck Go Lite
+Name[fr]=Duck Duck Go Lite
+Name[ga]=Duck Duck Go Lite
+Name[gl]=Duck Duck Go Lite
+Name[gu]=Duck Duck Go Lite
+Name[he]=Duck Duck Go Lite
+Name[hi]=Duck Duck Go Lite
+Name[hr]=Duck Duck Go Lite
+Name[hu]=Duck Duck Go Lite
+Name[ia]=Duck Duck Go Lite
+Name[id]=Duck Duck Go Lite
+Name[is]=Duck Duck Go Lite
+Name[it]=Duck Duck Go Lite
+Name[ja]=Duck Duck Go Lite
+Name[kk]=Duck Duck Go Lite
+Name[km]=Duck Duck Go Lite
+Name[kn]=Duck Duck Go Lite
+Name[ko]=Duck Duck Go Lite
+Name[lt]=Duck Duck Go Lite
+Name[lv]=Duck Duck Go Lite
+Name[ml]=Duck Duck Go Lite
+Name[nb]=Duck Duck Go Lite
+Name[nds]=Duck Duck Go Lite
+Name[nl]=Duck Duck Go Lite
+Name[nn]=Duck Duck Go Lite
+Name[pa]=Duck Duck Go Lite
+Name[pl]=Duck Duck Go Lite
+Name[pt]=Duck Duck Go Lite
+Name[pt_BR]=Duck Duck Go Lite
+Name[ro]=Duck Duck Go Lite
+Name[ru]=Поиск Duck Duck Go Lite
+Name[si]=Duck Duck Go Lite
+Name[sk]=Duck Duck Go Lite
+Name[sl]=Duck Duck Go Lite
+Name[sr]=Duck Duck Go Lite
+Name[sr@ijekavian]=Duck Duck Go Lite
+Name[sr@ijekavianlatin]=Duck Duck Go Lite
+Name[sr@latin]=Duck Duck Go Lite
+Name[sv]=Duck Duck Go Lite
+Name[tg]=Duck Duck Go Lite
+Name[th]=Duck Duck Go Lite
+Name[tr]=Duck Duck Go Lite
+Name[ug]=Duck Duck Go Lite
+Name[uk]=Duck Duck Go Lite
+Name[vi]=Duck Duck Go Lite
+Name[wa]=Duck Duck Go Lite
+Name[x-test]=xxDuck Duck Go Litexx
+Name[zh_CN]=Duck Duck Go Lite
+Name[zh_TW]=Duck Duck Go Lite
+Query=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[bg]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[bn]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[ca]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[cs]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[da]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[de]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[el]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[eo]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[es]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[et]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[fi]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[fr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[gl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[hi]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[hu]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[ia]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[it]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[kk]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[km]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[nb]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[nl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[pa]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[pl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[pt]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[pt_BR]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[ro]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[ru]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[sl]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[sr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[sr@ijekavian]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[sr@ijekavianlatin]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[sr@latin]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[sv]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[tr]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[uk]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[wa]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[x-test]=xxhttp://duckduckgo.com/lite/?q=\\{@}&t=KDExx
+Query[zh_CN]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+Query[zh_TW]=http://duckduckgo.com/lite/?q=\\{@}&t=KDE
+ServiceTypes=SearchProvider
+Type=Service
diff --git a/libre/kdebase-runtime-libre/kdebase-runtime.install b/libre/kdebase-runtime-libre/kdebase-runtime.install
new file mode 100644
index 000000000..c77e68041
--- /dev/null
+++ b/libre/kdebase-runtime-libre/kdebase-runtime.install
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index b031d3c90..2a4f28f33 100644..100755
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 159699 2012-05-26 07:40:36Z andrea $
+# $Id: PKGBUILD 169397 2012-10-20 10:02:56Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.8.3
-pkgrel=2.1
+pkgver=4.9.2
+pkgrel=3
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
+url='https://projects.kde.org/projects/kde/kdelibs'
license=('GPL' 'LGPL' 'FDL')
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' 'herqq')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+ 'media-player-info' 'libxtst')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
provides=("kdelibs=$pkgver")
-replaces=('kdelibs-experimental' 'kdelibs')
+replaces=('kdelibs')
conflicts=('kdelibs')
install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch'
'use-pythondontwritebytecode.patch'
'khtml-fsdg.diff')
-sha1sums=('50633efa4ea2a133e51bf55286ff754c46f2eae2'
+sha1sums=('e86ee16ac7c412b0f6abe3754cb372a45d41c71b'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- 'a1e35760d5b4e29471ad357c963a343c67200f32'
+ 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
'a1502a964081ad583a00cf90c56e74bf60121830')
build() {
@@ -38,7 +38,7 @@ build() {
# Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
-
+
# Don't ask the user to download a plugin, it's probably nonfree.
patch -p1 -i "${srcdir}"/khtml-fsdg.diff
@@ -53,7 +53,8 @@ build() {
-DSYSCONF_INSTALL_DIR=/etc \
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF
+ -DWITH_FAM=OFF \
+ -DWITH_HUpnp=OFF
make
}
diff --git a/libre/kdelibs-libre/fix-kmail-crash.patch b/libre/kdelibs-libre/fix-kmail-crash.patch
index 27caa25f0..27caa25f0 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 bab46a9a2..e221e939a 100644..100755
--- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch
+++ b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
@@ -25,14 +25,14 @@
- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
- ADD_CUSTOM_COMMAND(
- TARGET compile_python_files
-- COMMAND ${CMAKE_COMMAND} -E echo ${message}
+- COMMAND ${CMAKE_COMMAND} -E echo ${_message}
- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
- DEPENDS ${_absfilename}
- )
- ELSE(_abs_bin_py STREQUAL ${_absfilename})
- ADD_CUSTOM_COMMAND(
- TARGET compile_python_files
-- COMMAND ${CMAKE_COMMAND} -E echo ${message}
+- COMMAND ${CMAKE_COMMAND} -E echo ${_message}
- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
- DEPENDS ${_absfilename}
@@ -60,14 +60,14 @@
+ IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
+ ADD_CUSTOM_COMMAND(
+ TARGET compile_python_files
-+ COMMAND ${CMAKE_COMMAND} -E echo ${message}
++ COMMAND ${CMAKE_COMMAND} -E echo ${_message}
+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+ DEPENDS ${_absfilename}
+ )
+ ELSE(_abs_bin_py STREQUAL ${_absfilename})
+ ADD_CUSTOM_COMMAND(
+ TARGET compile_python_files
-+ COMMAND ${CMAKE_COMMAND} -E echo ${message}
++ COMMAND ${CMAKE_COMMAND} -E echo ${_message}
+ COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+ DEPENDS ${_absfilename}
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 1c2292a45..d5211499b 100644..100755
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,29 +1,24 @@
-# $Id: PKGBUILD 158333 2012-05-03 17:21:20Z andrea $
+# $Id: PKGBUILD 165994 2012-09-03 21:52:07Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgbase=kdenetwork
pkgname=('kdenetwork-kopete-libre')
-pkgver=4.8.3
-pkgrel=3.1
+pkgver=4.9.2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdenetwork')
makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
- 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
- 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
- 'libktorrent' 'libmms' 'mediastreamer')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
- 'gcc47.patch')
-sha1sums=('9da87317c6a10243d6fff8c121c04146415f65cd'
- '0e1325569e296d98e7b1be12305c1c018104685b')
+ 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
+ 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
+ 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('6779039e5354fae02cf7faa3442385b95befb430')
build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
- patch -p4 -i "${srcdir}"/gcc47.patch
-
cd "${srcdir}"
# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt"
diff --git a/libre/kdenetwork-kopete-libre/gcc47.patch b/libre/kdenetwork-kopete-libre/gcc47.patch
deleted file mode 100644
index 78af901dc..000000000
--- a/libre/kdenetwork-kopete-libre/gcc47.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:03:23 1292761
-+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:11:00 1292762
-@@ -31,6 +31,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <unistd.h>
- #endif
-
- #include <cstring>
---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:03:23 1292761
-+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:11:00 1292762
-@@ -27,6 +27,12 @@
-
- #include "talk/base/ssladapter.h"
-
-+#ifdef POSIX
-+extern "C" {
-+#include <unistd.h>
-+}
-+#endif
-+
- #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
- #ifdef WIN32
- #define SSL_USE_SCHANNEL 1
---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:03:23 1292761
-+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:11:00 1292762
-@@ -198,15 +198,6 @@
- }
-
- template<class CTYPE>
--size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
-- va_list args;
-- va_start(args, format);
-- size_t len = vsprintfn(buffer, buflen, format, args);
-- va_end(args);
-- return len;
--}
--
--template<class CTYPE>
- size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
- va_list args) {
- int len = vsnprintf(buffer, buflen, format, args);
-@@ -217,6 +208,15 @@
- return len;
- }
-
-+template<class CTYPE>
-+size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
-+ va_list args;
-+ va_start(args, format);
-+ size_t len = vsprintfn(buffer, buflen, format, args);
-+ va_end(args);
-+ return len;
-+}
-+
- ///////////////////////////////////////////////////////////////////////////////
- // Allow safe comparing and copying ascii (not UTF-8) with both wide and
- // non-wide character strings.
diff --git a/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install b/libre/kdenetwork-kopete-libre/kdenetwork-kopete.install
index 5495fb1b5..5495fb1b5 100644..100755
--- 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 100644..100755
--- a/libre/kdenetwork-kopete-libre/kdenetwork.install
+++ b/libre/kdenetwork-kopete-libre/kdenetwork.install
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 0bda68d17..68954e29b 100644..100755
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158207 2012-05-03 13:23:51Z andrea $
+# $Id: PKGBUILD 165999 2012-09-03 21:52:22Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.8.3
+pkgver=4.9.2
pkgrel=1
pkgdesc='Archiving Tool'
url='http://kde.org/applications/utilities/ark/'
@@ -14,12 +14,12 @@ groups=('kde' 'kdeutils')
depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson')
makedepends=('cmake' 'automoc4')
optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
+install=${_pkgname}.install
provides=("kdeutils-ark=$pkgver")
replaces=('kdeutils-ark')
conflicts=('kdeutils-ark')
-install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('9ff1fff082f53f31d0d31f2570005ae551fd2164')
+sha1sums=('180ad836ebfc6bdc26d245e6bd27c2fc7a59918c')
build() {
cd "${srcdir}"
diff --git a/libre/kdeutils-ark-libre/kdeutils-ark.install b/libre/kdeutils-ark-libre/kdeutils-ark.install
index 78681144b..78681144b 100644..100755
--- 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
index f40b19d3f..f40b19d3f 100644..100755
--- a/libre/kdeutils-ark-libre/rePKGBUILD
+++ b/libre/kdeutils-ark-libre/rePKGBUILD
diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD
index 7c444e8ff..7c444e8ff 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 be5acfd2f..fcc53e9d9 100644..100755
--- a/libre/kile-libre/PKGBUILD
+++ b/libre/kile-libre/PKGBUILD
@@ -2,11 +2,11 @@
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kile
pkgname=kile-libre
-pkgver=2.1.2
+pkgver=2.1.3
pkgrel=1
pkgdesc="A user friendly TeX/LaTeX frontend for KDE"
arch=("i686" "x86_64")
@@ -20,7 +20,7 @@ provides=('kile')
install=${_pkgname}.install
source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2"
"no-acroread.patch")
-sha1sums=('238a8fde4fca00e06b314c13671ff53e2ac4845c'
+sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5'
'9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6')
build() {
diff --git a/libre/kile-libre/kile.install b/libre/kile-libre/kile.install
index 9fe93eeac..9fe93eeac 100644..100755
--- 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 100644..100755
--- 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 65ec64426..2dac12636 100644..100755
--- a/libre/lame-libre/PKGBUILD
+++ b/libre/lame-libre/PKGBUILD
@@ -35,7 +35,6 @@ package() {
cd "$srcdir/$_pkgname-$pkgver"
make DESTDIR="$pkgdir" install
- rm -rf ${pkgdir}/usr/share/man
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/lesspipe-libre/PKGBUILD b/libre/lesspipe-libre/PKGBUILD
index 48d5ebe0f..48d5ebe0f 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/libre/lesspipe-libre/rePKGBUILD
+++ b/libre/lesspipe-libre/rePKGBUILD
diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD
new file mode 100644
index 000000000..1719f138d
--- /dev/null
+++ b/libre/lib32-mesa-demos-libre/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 94667 2010-10-09 11:21:35Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgbasename=mesa-demos-libre
+pkgname=lib32-$_pkgbasename
+pkgver=8.0.1
+pkgrel=2
+arch=(x86_64)
+pkgdesc="Mesa demos and tools (32-bit), libre"
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+depends=('lib32-glew>=1.5.6' mesa-demos-libre)
+provides=("lib32-mesa-demos=$pkgver")
+replaces=('lib32-mesa-demos')
+conflicts=('lib32-mesa-demos')
+makedepends=(gcc-multilib)
+source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2
+ mesa-demos-libre.patch)
+md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
+ '1858e95d40ac9e5e0b59753ce9e673e3')
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ cd "${srcdir}/mesa-demos-${pkgver}"
+ patch -Np1 -i "${srcdir}/mesa-demos-libre.patch"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/mesa-demos-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ for i in "$pkgdir/usr/bin/"*; do
+ mv "$i" "$i"32
+ done
+
+ mkdir -p "$pkgdir/usr/share/licenses"
+ ln -s mesa-demos "$pkgdir/usr/share/licenses/lib32-mesa-demos"
+}
diff --git a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch
new file mode 100755
index 000000000..c5261f8e9
--- /dev/null
+++ b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch
@@ -0,0 +1,1192 @@
+diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//src/demos/Makefile.am
+--- Desktop/mesa-demos-8.0.1//src/demos/Makefile.am 2010-07-13 14:46:40.000000000 -0400
++++ mesa-demos-8.0.1/src/demos/Makefile.am 2011-06-04 15:34:18.000000000 -0400
+@@ -62,7 +62,6 @@ bin_PROGRAMS = \
+ morph3d \
+ multiarb \
+ paltex \
+- pointblast \
+ projtex \
+ ray \
+ readpix \
+@@ -71,7 +70,6 @@ bin_PROGRAMS = \
+ shadowtex \
+ singlebuffer \
+ spectex \
+- spriteblast \
+ stex3d \
+ teapot \
+ terrain \
+diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//src/demos/Makefile.in
+--- Desktop/mesa-demos-8.0.1//src/demos/Makefile.in 2010-07-13 14:53:23.000000000 -0400
++++ mesa-demos-8.0.1/src/demos/Makefile.in 2011-06-04 15:35:32.000000000 -0400
+@@ -73,11 +73,10 @@ host_triplet = @host@
+ @HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \
+-@HAVE_GLUT_TRUE@ pointblast$(EXEEXT) projtex$(EXEEXT) \
+-@HAVE_GLUT_TRUE@ ray$(EXEEXT) readpix$(EXEEXT) reflect$(EXEEXT) \
+-@HAVE_GLUT_TRUE@ renormal$(EXEEXT) shadowtex$(EXEEXT) \
+-@HAVE_GLUT_TRUE@ singlebuffer$(EXEEXT) spectex$(EXEEXT) \
+-@HAVE_GLUT_TRUE@ spriteblast$(EXEEXT) stex3d$(EXEEXT) \
++@HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
++@HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \
++@HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
++@HAVE_GLUT_TRUE@ spectex$(EXEEXT) stex3d$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ teapot$(EXEEXT) terrain$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ tessdemo$(EXEEXT) texcyl$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ texenv$(EXEEXT) textures$(EXEEXT) \
+@@ -188,9 +187,6 @@ multiarb_DEPENDENCIES = ../util/libutil.
+ paltex_SOURCES = paltex.c
+ paltex_OBJECTS = paltex.$(OBJEXT)
+ paltex_LDADD = $(LDADD)
+-pointblast_SOURCES = pointblast.c
+-pointblast_OBJECTS = pointblast.$(OBJEXT)
+-pointblast_LDADD = $(LDADD)
+ projtex_SOURCES = projtex.c
+ projtex_OBJECTS = projtex.$(OBJEXT)
+ projtex_DEPENDENCIES = ../util/libutil.la
+@@ -215,9 +211,6 @@ singlebuffer_LDADD = $(LDADD)
+ spectex_SOURCES = spectex.c
+ spectex_OBJECTS = spectex.$(OBJEXT)
+ spectex_LDADD = $(LDADD)
+-spriteblast_SOURCES = spriteblast.c
+-spriteblast_OBJECTS = spriteblast.$(OBJEXT)
+-spriteblast_LDADD = $(LDADD)
+ stex3d_SOURCES = stex3d.c
+ stex3d_OBJECTS = stex3d.$(OBJEXT)
+ stex3d_LDADD = $(LDADD)
+@@ -285,21 +278,20 @@ SOURCES = arbfplight.c arbfslight.c arbo
+ fbo_firecube.c fbotexture.c fire.c fogcoord.c fplight.c \
+ fslight.c gamma.c gearbox.c gears.c geartrain.c glinfo.c \
+ gloss.c gltestperf.c ipers.c isosurf.c lodbias.c morph3d.c \
+- multiarb.c paltex.c pointblast.c projtex.c ray.c readpix.c \
+- reflect.c renormal.c shadowtex.c singlebuffer.c spectex.c \
+- spriteblast.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \
+- texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \
+- vao_demo.c winpos.c
++ multiarb.c paltex.c projtex.c ray.c readpix.c reflect.c \
++ renormal.c shadowtex.c singlebuffer.c spectex.c stex3d.c \
++ teapot.c terrain.c tessdemo.c texcyl.c texenv.c textures.c \
++ trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c
+ DIST_SOURCES = arbfplight.c arbfslight.c arbocclude.c bounce.c \
+ clearspd.c copypix.c cubemap.c dinoshade.c dissolve.c \
+ drawpix.c engine.c fbo_firecube.c fbotexture.c fire.c \
+ fogcoord.c fplight.c fslight.c gamma.c gearbox.c gears.c \
+ geartrain.c glinfo.c gloss.c gltestperf.c ipers.c isosurf.c \
+- lodbias.c morph3d.c multiarb.c paltex.c pointblast.c projtex.c \
+- ray.c readpix.c reflect.c renormal.c shadowtex.c \
+- singlebuffer.c spectex.c spriteblast.c stex3d.c teapot.c \
+- terrain.c tessdemo.c texcyl.c texenv.c textures.c trispd.c \
+- $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c
++ lodbias.c morph3d.c multiarb.c paltex.c projtex.c ray.c \
++ readpix.c reflect.c renormal.c shadowtex.c singlebuffer.c \
++ spectex.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \
++ texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \
++ vao_demo.c winpos.c
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -653,9 +645,6 @@ multiarb$(EXEEXT): $(multiarb_OBJECTS) $
+ paltex$(EXEEXT): $(paltex_OBJECTS) $(paltex_DEPENDENCIES)
+ @rm -f paltex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(paltex_OBJECTS) $(paltex_LDADD) $(LIBS)
+-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES)
+- @rm -f pointblast$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS)
+ projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES)
+ @rm -f projtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS)
+@@ -680,9 +669,6 @@ singlebuffer$(EXEEXT): $(singlebuffer_OB
+ spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES)
+ @rm -f spectex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
+-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES)
+- @rm -f spriteblast$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS)
+ stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES)
+ @rm -f stex3d$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS)
+@@ -756,7 +742,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/morph3d.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@
+@@ -765,7 +750,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spriteblast.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
+diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/pointblast.c mesa-demos-8.0.1//src/demos/pointblast.c
+--- Desktop/mesa-demos-8.0.1//src/demos/pointblast.c 2010-07-07 13:57:15.000000000 -0400
++++ mesa-demos-8.0.1/src/demos/pointblast.c 1969-12-31 19:00:00.000000000 -0500
+@@ -1,504 +0,0 @@
+-
+-/* Copyright (c) Mark J. Kilgard, 1997. */
+-
+-/* This program is freely distributable without licensing fees
+- and is provided without guarantee or warrantee expressed or
+- implied. This program is -not- in the public domain. */
+-
+-/* This example demonstrates how to render particle effects
+- with OpenGL. A cloud of pinkish/orange particles explodes with the
+- particles bouncing off the ground. When the EXT_point_parameters
+- is present , the particle size is attenuated based on eye distance. */
+-
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <math.h> /* for cos(), sin(), and sqrt() */
+-#ifdef _WIN32
+-#include <windows.h>
+-#endif
+-#include <GL/glew.h>
+-#include <GL/glut.h>
+-
+-/* Some <math.h> files do not define M_PI... */
+-#ifndef M_PI
+-#define M_PI 3.14159265
+-#endif
+-
+-#if 0 /* For debugging. */
+-#undef GL_EXT_point_parameters
+-#endif
+-
+-static GLfloat angle = -150; /* in degrees */
+-static int spin = 0;
+-static int moving, begin;
+-static int newModel = 1;
+-static float theTime;
+-static int repeat = 1;
+-static int blend = 1;
+-int useMipmaps = 1;
+-int linearFiltering = 1;
+-
+-static GLfloat constant[3] = { 1/5.0, 0.0, 0.0 };
+-static GLfloat linear[3] = { 0.0, 1/5.0, 0.0 };
+-static GLfloat theQuad[3] = { 0.25, 0.0, 1/60.0 };
+-
+-#define MAX_POINTS 2000
+-
+-static int numPoints = 200;
+-
+-static GLfloat pointList[MAX_POINTS][3];
+-static GLfloat pointTime[MAX_POINTS];
+-static GLfloat pointVelocity[MAX_POINTS][2];
+-static GLfloat pointDirection[MAX_POINTS][2];
+-static int colorList[MAX_POINTS];
+-static int animate = 1, motion = 0;
+-
+-static GLfloat colorSet[][4] = {
+- /* Shades of red. */
+- { 0.7, 0.2, 0.4, 0.5 },
+- { 0.8, 0.0, 0.7, 0.5 },
+- { 1.0, 0.0, 0.0, 0.5 },
+- { 0.9, 0.3, 0.6, 0.5 },
+- { 1.0, 0.4, 0.0, 0.5 },
+- { 1.0, 0.0, 0.5, 0.5 },
+-};
+-
+-#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0]))
+-
+-#define DEAD (NUM_COLORS+1)
+-
+-
+-#if 0 /* drand48 might be better on Unix machines */
+-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48())
+-#else
+-static float float_rand(void) { return rand() / (float) RAND_MAX; }
+-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand())
+-#endif
+-
+-#define MEAN_VELOCITY 3.0
+-#define GRAVITY 2.0
+-
+-/* Modeling units of ground extent in each X and Z direction. */
+-#define EDGE 12
+-
+-static void
+-makePointList(void)
+-{
+- float angle, velocity, direction;
+- int i;
+-
+- motion = 1;
+- for (i=0; i<numPoints; i++) {
+- pointList[i][0] = 0.0;
+- pointList[i][1] = 0.0;
+- pointList[i][2] = 0.0;
+- pointTime[i] = 0.0;
+- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0;
+- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0;
+- pointDirection[i][0] = cos(direction);
+- pointDirection[i][1] = sin(direction);
+- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0);
+- pointVelocity[i][0] = velocity * cos(angle);
+- pointVelocity[i][1] = velocity * sin(angle);
+- colorList[i] = rand() % NUM_COLORS;
+- }
+- theTime = 0.0;
+-}
+-
+-static void
+-updatePointList(void)
+-{
+- float distance;
+- int i;
+-
+- static double t0 = -1.;
+- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
+- if (t0 < 0.0)
+- t0 = t;
+- dt = t - t0;
+- t0 = t;
+-
+- motion = 0;
+- for (i=0; i<numPoints; i++) {
+- distance = pointVelocity[i][0] * theTime;
+-
+- /* X and Z */
+- pointList[i][0] = pointDirection[i][0] * distance;
+- pointList[i][2] = pointDirection[i][1] * distance;
+-
+- /* Z */
+- pointList[i][1] =
+- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i];
+-
+- /* If we hit the ground, bounce the point upward again. */
+- if (pointList[i][1] <= 0.0) {
+- if (distance > EDGE) {
+- /* Particle has hit ground past the distance duration of
+- the particles. Mark particle as dead. */
+- colorList[i] = NUM_COLORS; /* Not moving. */
+- continue;
+- }
+-
+- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */
+- pointTime[i] = 0.0; /* Reset the particles sense of up time. */
+- }
+- motion = 1;
+- pointTime[i] += dt;
+- }
+- theTime += dt;
+- if (!motion && !spin) {
+- if (repeat) {
+- makePointList();
+- } else {
+- glutIdleFunc(NULL);
+- }
+- }
+-}
+-
+-static void
+-idle(void)
+-{
+- updatePointList();
+- if (spin) {
+- angle += 0.3;
+- newModel = 1;
+- }
+- glutPostRedisplay();
+-}
+-
+-static void
+-visible(int vis)
+-{
+- if (vis == GLUT_VISIBLE) {
+- if (animate && (motion || spin)) {
+- glutIdleFunc(idle);
+- }
+- } else {
+- glutIdleFunc(NULL);
+- }
+-}
+-
+-static void
+-recalcModelView(void)
+-{
+- glPopMatrix();
+- glPushMatrix();
+- glRotatef(angle, 0.0, 1.0, 0.0);
+- newModel = 0;
+-}
+-
+-static void
+-redraw(void)
+-{
+- int i;
+-
+- glDepthMask(GL_TRUE);
+- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+- if (newModel)
+- recalcModelView();
+-
+-
+- /* Draw the floor. */
+-/* glEnable(GL_TEXTURE_2D);*/
+- glColor3f(0.5, 1.0, 0.5);
+- glBegin(GL_QUADS);
+- glTexCoord2f(0.0, 0.0);
+- glVertex3f(-EDGE, -0.05, -EDGE);
+- glTexCoord2f(20.0, 0.0);
+- glVertex3f(EDGE, -0.05, -EDGE);
+- glTexCoord2f(20.0, 20.0);
+- glVertex3f(EDGE, -0.05, EDGE);
+- glTexCoord2f(0.0, 20.0);
+- glVertex3f(-EDGE, -0.05, EDGE);
+- glEnd();
+-
+- /* Allow particles to blend with each other. */
+- glDepthMask(GL_FALSE);
+-
+- if (blend)
+- glEnable(GL_BLEND);
+-
+- glDisable(GL_TEXTURE_2D);
+- glBegin(GL_POINTS);
+- for (i=0; i<numPoints; i++) {
+- /* Draw alive particles. */
+- if (colorList[i] != DEAD) {
+- glColor4fv(colorSet[colorList[i]]);
+- glVertex3fv(pointList[i]);
+- }
+- }
+- glEnd();
+-
+- glDisable(GL_BLEND);
+-
+- glutSwapBuffers();
+-}
+-
+-/* ARGSUSED2 */
+-static void
+-mouse(int button, int state, int x, int y)
+-{
+- /* Scene can be spun around Y axis using left
+- mouse button movement. */
+- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) {
+- moving = 1;
+- begin = x;
+- }
+- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) {
+- moving = 0;
+- }
+-}
+-
+-/* ARGSUSED1 */
+-static void
+-mouseMotion(int x, int y)
+-{
+- if (moving) {
+- angle = angle + (x - begin);
+- begin = x;
+- newModel = 1;
+- glutPostRedisplay();
+- }
+-}
+-
+-static void
+-menu(int option)
+-{
+- switch (option) {
+- case 0:
+- makePointList();
+- break;
+-#ifdef GL_ARB_point_parameters
+- case 1:
+- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant);
+- break;
+- case 2:
+- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear);
+- break;
+- case 3:
+- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
+- break;
+-#endif
+- case 4:
+- blend = 1;
+- break;
+- case 5:
+- blend = 0;
+- break;
+-#ifdef GL_ARB_point_parameters
+- case 6:
+- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0);
+- break;
+- case 7:
+- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0);
+- break;
+-#endif
+- case 8:
+- glEnable(GL_POINT_SMOOTH);
+- break;
+- case 9:
+- glDisable(GL_POINT_SMOOTH);
+- break;
+- case 10:
+- glPointSize(2.0);
+- break;
+- case 11:
+- glPointSize(4.0);
+- break;
+- case 12:
+- glPointSize(8.0);
+- break;
+- case 13:
+- spin = 1 - spin;
+- if (animate && (spin || motion)) {
+- glutIdleFunc(idle);
+- } else {
+- glutIdleFunc(NULL);
+- }
+- break;
+- case 14:
+- numPoints = 200;
+- break;
+- case 15:
+- numPoints = 500;
+- break;
+- case 16:
+- numPoints = 1000;
+- break;
+- case 17:
+- numPoints = 2000;
+- break;
+- case 666:
+- exit(0);
+- }
+- glutPostRedisplay();
+-}
+-
+-/* ARGSUSED1 */
+-static void
+-key(unsigned char c, int x, int y)
+-{
+- switch (c) {
+- case 13:
+- animate = 1 - animate; /* toggle. */
+- if (animate && (motion || spin)) {
+- glutIdleFunc(idle);
+- } else {
+- glutIdleFunc(NULL);
+- }
+- break;
+- case ' ':
+- animate = 1;
+- makePointList();
+- glutIdleFunc(idle);
+- break;
+- case 27:
+- exit(0);
+- }
+-}
+-
+-/* Nice floor texture tiling pattern. */
+-static char *circles[] = {
+- "....xxxx........",
+- "..xxxxxxxx......",
+- ".xxxxxxxxxx.....",
+- ".xxx....xxx.....",
+- "xxx......xxx....",
+- "xxx......xxx....",
+- "xxx......xxx....",
+- "xxx......xxx....",
+- ".xxx....xxx.....",
+- ".xxxxxxxxxx.....",
+- "..xxxxxxxx......",
+- "....xxxx........",
+- "................",
+- "................",
+- "................",
+- "................",
+-};
+-
+-static void
+-makeFloorTexture(void)
+-{
+- GLubyte floorTexture[16][16][3];
+- GLubyte *loc;
+- int s, t;
+-
+- /* Setup RGB image for the texture. */
+- loc = (GLubyte*) floorTexture;
+- for (t = 0; t < 16; t++) {
+- for (s = 0; s < 16; s++) {
+- if (circles[t][s] == 'x') {
+- /* Nice blue. */
+- loc[0] = 0x1f;
+- loc[1] = 0x1f;
+- loc[2] = 0x8f;
+- } else {
+- /* Light gray. */
+- loc[0] = 0xca;
+- loc[1] = 0xca;
+- loc[2] = 0xca;
+- }
+- loc += 3;
+- }
+- }
+-
+- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+-
+- if (useMipmaps) {
+- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+- GL_LINEAR_MIPMAP_LINEAR);
+- gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 16, 16,
+- GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
+- } else {
+- if (linearFiltering) {
+- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+- } else {
+- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+- }
+- glTexImage2D(GL_TEXTURE_2D, 0, 3, 16, 16, 0,
+- GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
+- }
+-}
+-
+-int
+-main(int argc, char **argv)
+-{
+- int i;
+-
+- glutInitWindowSize(300, 300);
+- glutInit(&argc, argv);
+- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
+-
+- for (i=1; i<argc; i++) {
+- if(!strcmp("-noms", argv[i])) {
+- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
+- printf("forcing no multisampling\n");
+- } else if(!strcmp("-nomipmaps", argv[i])) {
+- useMipmaps = 0;
+- } else if(!strcmp("-nearest", argv[i])) {
+- linearFiltering = 0;
+- }
+- }
+-
+- glutCreateWindow("point burst");
+- glewInit();
+- glutDisplayFunc(redraw);
+- glutMouseFunc(mouse);
+- glutMotionFunc(mouseMotion);
+- glutVisibilityFunc(visible);
+- glutKeyboardFunc(key);
+- glutCreateMenu(menu);
+- glutAddMenuEntry("Reset time", 0);
+- glutAddMenuEntry("Constant", 1);
+- glutAddMenuEntry("Linear", 2);
+- glutAddMenuEntry("Quadratic", 3);
+- glutAddMenuEntry("Blend on", 4);
+- glutAddMenuEntry("Blend off", 5);
+- glutAddMenuEntry("Threshold 1", 6);
+- glutAddMenuEntry("Threshold 10", 7);
+- glutAddMenuEntry("Point smooth on", 8);
+- glutAddMenuEntry("Point smooth off", 9);
+- glutAddMenuEntry("Point size 2", 10);
+- glutAddMenuEntry("Point size 4", 11);
+- glutAddMenuEntry("Point size 8", 12);
+- glutAddMenuEntry("Toggle spin", 13);
+- glutAddMenuEntry("200 points ", 14);
+- glutAddMenuEntry("500 points ", 15);
+- glutAddMenuEntry("1000 points ", 16);
+- glutAddMenuEntry("2000 points ", 17);
+- glutAddMenuEntry("Quit", 666);
+- glutAttachMenu(GLUT_RIGHT_BUTTON);
+-
+- if (!glutExtensionSupported("GL_ARB_point_parameters")) {
+- fprintf(stderr, "Sorry, GL_ARB_point_parameters is not supported.\n");
+- return -1;
+- }
+-
+- glShadeModel(GL_FLAT);
+- glEnable(GL_DEPTH_TEST);
+- glEnable(GL_POINT_SMOOTH);
+- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+- glPointSize(8.0);
+-#if GL_ARB_point_parameters
+- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
+-#endif
+- glMatrixMode(GL_PROJECTION);
+- gluPerspective( /* field of view in degree */ 40.0,
+- /* aspect ratio */ 1.0,
+- /* Z near */ 0.5, /* Z far */ 40.0);
+- glMatrixMode(GL_MODELVIEW);
+- gluLookAt(0.0, 1.0, 8.0, /* eye location */
+- 0.0, 1.0, 0.0, /* center is at (0,0,0) */
+- 0.0, 1.0, 0.); /* up is in postivie Y direction */
+- glPushMatrix(); /* dummy push so we can pop on model
+- recalc */
+-
+- makePointList();
+- makeFloorTexture();
+-
+- glutMainLoop();
+- return 0; /* ANSI C requires main to return int. */
+-}
+diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c mesa-demos-8.0.1//src/demos/spriteblast.c
+--- Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c 2010-07-07 13:57:15.000000000 -0400
++++ mesa-demos-8.0.1/src/demos/spriteblast.c 1969-12-31 19:00:00.000000000 -0500
+@@ -1,555 +0,0 @@
+-
+-/* Copyright (c) Mark J. Kilgard, 1997. */
+-
+-/* This program is freely distributable without licensing fees
+- and is provided without guarantee or warrantee expressed or
+- implied. This program is -not- in the public domain. */
+-
+-/* This example demonstrates how to render particle effects
+- with OpenGL. A cloud of pinkish/orange particles explodes with the
+- particles bouncing off the ground. When the EXT_point_parameters
+- is present , the particle size is attenuated based on eye distance. */
+-
+-
+-/* Modified by Brian Paul to test GL_ARB_point_sprite */
+-
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <math.h> /* for cos(), sin(), and sqrt() */
+-#ifdef _WIN32
+-#include <windows.h>
+-#endif
+-#include <GL/glew.h>
+-#include <GL/glut.h>
+-
+-/* Some <math.h> files do not define M_PI... */
+-#ifndef M_PI
+-#define M_PI 3.14159265
+-#endif
+-
+-#if 0 /* For debugging. */
+-#undef GL_EXT_point_parameters
+-#endif
+-
+-static GLfloat angle = -150; /* in degrees */
+-static int spin = 0;
+-static int moving, begin;
+-static float theTime;
+-static int repeat = 1;
+-static int blend = 1;
+-int useMipmaps = 1;
+-int linearFiltering = 1;
+-
+-static GLfloat constant[3] = { .2, 0.0, 0.0 };
+-static GLfloat linear[3] = { .0, .1, 0.0 };
+-static GLfloat theQuad[3] = { .005, 0.1, 1/600.0 };
+-
+-#define MAX_POINTS 2000
+-
+-static int numPoints = 200;
+-
+-static GLfloat pointList[MAX_POINTS][3];
+-static GLfloat pointTime[MAX_POINTS];
+-static GLfloat pointVelocity[MAX_POINTS][2];
+-static GLfloat pointDirection[MAX_POINTS][2];
+-static int colorList[MAX_POINTS];
+-static int animate = 1, motion = 0, org = 0, sprite = 1, smooth = 1;
+-
+-static GLfloat colorSet[][4] = {
+- /* Shades of red. */
+- { 0.7, 0.2, 0.4, 0.5 },
+- { 0.8, 0.0, 0.7, 0.5 },
+- { 1.0, 0.0, 0.0, 0.5 },
+- { 0.9, 0.3, 0.6, 0.5 },
+- { 1.0, 0.4, 0.0, 0.5 },
+- { 1.0, 0.0, 0.5, 0.5 },
+-};
+-
+-#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0]))
+-
+-#define DEAD (NUM_COLORS+1)
+-
+-
+-/* GL */
+-static GLint spritePattern[16][16] = {
+- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
+- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
+- { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 },
+- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
+- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
+- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 },
+- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 },
+- { 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 },
+- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0 },
+- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0 },
+- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+-};
+-
+-
+-
+-
+-#if 0 /* drand48 might be better on Unix machines */
+-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48())
+-#else
+-static float float_rand(void) { return rand() / (float) RAND_MAX; }
+-#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand())
+-#endif
+-
+-#define MEAN_VELOCITY 3.0
+-#define GRAVITY 2.0
+-
+-/* Modeling units of ground extent in each X and Z direction. */
+-#define EDGE 12
+-
+-static void
+-makePointList(void)
+-{
+- float angle, velocity, direction;
+- int i;
+-
+- motion = 1;
+- for (i=0; i<numPoints; i++) {
+- pointList[i][0] = 0.0;
+- pointList[i][1] = 0.0;
+- pointList[i][2] = 0.0;
+- pointTime[i] = 0.0;
+- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0;
+- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0;
+- pointDirection[i][0] = cos(direction);
+- pointDirection[i][1] = sin(direction);
+- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0);
+- pointVelocity[i][0] = velocity * cos(angle);
+- pointVelocity[i][1] = velocity * sin(angle);
+- colorList[i] = rand() % NUM_COLORS;
+- }
+- theTime = 0.0;
+-}
+-
+-static void
+-updatePointList(void)
+-{
+- float distance;
+- int i;
+-
+- static double t0 = -1.;
+- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
+- if (t0 < 0.0)
+- t0 = t;
+- dt = t - t0;
+- t0 = t;
+-
+- motion = 0;
+- for (i=0; i<numPoints; i++) {
+- distance = pointVelocity[i][0] * theTime;
+-
+- /* X and Z */
+- pointList[i][0] = pointDirection[i][0] * distance;
+- pointList[i][2] = pointDirection[i][1] * distance;
+-
+- /* Z */
+- pointList[i][1] =
+- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i];
+-
+- /* If we hit the ground, bounce the point upward again. */
+- if (pointList[i][1] <= 0.0) {
+- if (distance > EDGE) {
+- /* Particle has hit ground past the distance duration of
+- the particles. Mark particle as dead. */
+- colorList[i] = NUM_COLORS; /* Not moving. */
+- continue;
+- }
+-
+- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */
+- pointTime[i] = 0.0; /* Reset the particles sense of up time. */
+- }
+- motion = 1;
+- pointTime[i] += dt;
+- }
+- theTime += dt;
+- if (!motion && !spin) {
+- if (repeat) {
+- makePointList();
+- } else {
+- glutIdleFunc(NULL);
+- }
+- }
+-}
+-
+-static void
+-idle(void)
+-{
+- updatePointList();
+- if (spin) {
+- angle += 0.3;
+- }
+- glutPostRedisplay();
+-}
+-
+-static void
+-visible(int vis)
+-{
+- if (vis == GLUT_VISIBLE) {
+- if (animate && (motion || spin)) {
+- glutIdleFunc(idle);
+- }
+- } else {
+- glutIdleFunc(NULL);
+- }
+-}
+-
+-static void
+-redraw(void)
+-{
+- int i;
+-
+- glDepthMask(GL_TRUE);
+- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+-
+- glPushMatrix();
+- glRotatef(15.0, 1.0, 0.0, 0.0);
+- glRotatef(angle, 0.0, 1.0, 0.0);
+-
+-
+- /* Draw the floor. */
+-/* glEnable(GL_TEXTURE_2D);*/
+- glColor3f(0.1, 0.5, 1.0);
+- glBegin(GL_QUADS);
+- glTexCoord2f(0.0, 0.0);
+- glVertex3f(-EDGE, -0.05, -EDGE);
+- glTexCoord2f(20.0, 0.0);
+- glVertex3f(EDGE, -0.05, -EDGE);
+- glTexCoord2f(20.0, 20.0);
+- glVertex3f(EDGE, -0.05, EDGE);
+- glTexCoord2f(0.0, 20.0);
+- glVertex3f(-EDGE, -0.05, EDGE);
+- glEnd();
+-
+- /* Allow particles to blend with each other. */
+- glDepthMask(GL_FALSE);
+-
+- if (blend)
+- glEnable(GL_BLEND);
+-
+- if (sprite) {
+- glEnable(GL_TEXTURE_2D);
+-#ifdef GL_ARB_point_sprite
+- glEnable(GL_POINT_SPRITE_ARB);
+-#endif
+- }
+-
+- glColor3f(1,1,1);
+- glBegin(GL_POINTS);
+- for (i=0; i<numPoints; i++) {
+- /* Draw alive particles. */
+- if (colorList[i] != DEAD) {
+- if (!sprite) glColor4fv(colorSet[colorList[i]]);
+- glVertex3fv(pointList[i]);
+- }
+- }
+- glEnd();
+-
+- glDisable(GL_TEXTURE_2D);
+-#ifdef GL_ARB_point_sprite
+- glDisable(GL_POINT_SPRITE_ARB);
+-#endif
+- glDisable(GL_BLEND);
+-
+- glPopMatrix();
+-
+- glutSwapBuffers();
+-}
+-
+-/* ARGSUSED2 */
+-static void
+-mouse(int button, int state, int x, int y)
+-{
+- /* Scene can be spun around Y axis using left
+- mouse button movement. */
+- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) {
+- moving = 1;
+- begin = x;
+- }
+- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) {
+- moving = 0;
+- }
+-}
+-
+-/* ARGSUSED1 */
+-static void
+-mouseMotion(int x, int y)
+-{
+- if (moving) {
+- angle = angle + (x - begin);
+- begin = x;
+- glutPostRedisplay();
+- }
+-}
+-
+-static void
+-menu(int option)
+-{
+- switch (option) {
+- case 0:
+- makePointList();
+- break;
+-#ifdef GL_ARB_point_parameters
+- case 1:
+- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant);
+- break;
+- case 2:
+- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear);
+- break;
+- case 3:
+- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
+- break;
+-#endif
+- case 4:
+- blend = 1;
+- break;
+- case 5:
+- blend = 0;
+- break;
+-#ifdef GL_ARB_point_parameters
+- case 6:
+- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0);
+- break;
+- case 7:
+- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0);
+- break;
+-#endif
+- case 8:
+- glEnable(GL_POINT_SMOOTH);
+- smooth = 1;
+- break;
+- case 9:
+- glDisable(GL_POINT_SMOOTH);
+- smooth = 0;
+- break;
+- case 10:
+- glPointSize(16.0);
+- break;
+- case 11:
+- glPointSize(32.0);
+- break;
+- case 12:
+- glPointSize(64.0);
+- break;
+- case 13:
+- spin = 1 - spin;
+- if (animate && (spin || motion)) {
+- glutIdleFunc(idle);
+- } else {
+- glutIdleFunc(NULL);
+- }
+- break;
+- case 14:
+- numPoints = 200;
+- break;
+- case 15:
+- numPoints = 500;
+- break;
+- case 16:
+- numPoints = 1000;
+- break;
+- case 17:
+- numPoints = 2000;
+- break;
+- case 666:
+- exit(0);
+- }
+- glutPostRedisplay();
+-}
+-
+-/* ARGSUSED1 */
+-static void
+-key(unsigned char c, int x, int y)
+-{
+- switch (c) {
+- case 13:
+- animate = 1 - animate; /* toggle. */
+- if (animate && (motion || spin)) {
+- glutIdleFunc(idle);
+- } else {
+- glutIdleFunc(NULL);
+- }
+- break;
+- case ' ':
+- animate = 1;
+- makePointList();
+- glutIdleFunc(idle);
+- break;
+- case 'o':
+- case 'O':
+- org ^= 1;
+-#ifdef GL_VERSION_2_0
+-#ifdef GL_ARB_point_parameters
+- glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN,
+- org ? GL_LOWER_LEFT : GL_UPPER_LEFT);
+-#endif
+-#endif
+- glutPostRedisplay();
+- break;
+- case 't':
+- case 'T':
+- sprite ^= 1;
+- glutPostRedisplay();
+- break;
+- case 's':
+- case 'S':
+- (smooth ^= 1) ? glEnable(GL_POINT_SMOOTH) : glDisable(GL_POINT_SMOOTH);
+- glutPostRedisplay();
+- break;
+- case '0':
+- glPointSize(1.0);
+- glutPostRedisplay();
+- break;
+- case '1':
+- glPointSize(16.0);
+- glutPostRedisplay();
+- break;
+- case '2':
+- glPointSize(32.0);
+- glutPostRedisplay();
+- break;
+- case '3':
+- glPointSize(64.0);
+- glutPostRedisplay();
+- break;
+- case '4':
+- glPointSize(128.0);
+- glutPostRedisplay();
+- break;
+- case 27:
+- exit(0);
+- }
+-}
+-
+-
+-
+-static void
+-makeSprite(void)
+-{
+- GLubyte texture[16][16][4];
+- int i, j;
+-
+- if (!glutExtensionSupported("GL_ARB_point_sprite")) {
+- printf("Sorry, this demo requires GL_ARB_point_sprite.\n");
+- exit(0);
+- }
+- if (!glutExtensionSupported("GL_ARB_point_parameters")) {
+- printf("Sorry, this demo requires GL_ARB_point_parameters.\n");
+- exit(0);
+- }
+-
+- for (i = 0; i < 16; i++) {
+- for (j = 0; j < 16; j++) {
+- if (spritePattern[i][j]) {
+- texture[i][j][0] = 255;
+- texture[i][j][1] = 255;
+- texture[i][j][2] = 255;
+- texture[i][j][3] = 255;
+- }
+- else {
+- texture[i][j][0] = 255;
+- texture[i][j][1] = 0;
+- texture[i][j][2] = 0;
+- texture[i][j][3] = 0;
+- }
+- }
+- }
+-
+- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+- texture);
+- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+-#ifdef GL_ARB_point_sprite
+- glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
+-#endif
+-}
+-
+-
+-static void
+-reshape(int width, int height)
+-{
+- GLfloat h = (GLfloat) height / (GLfloat) width;
+-
+- glViewport(0, 0, (GLint) width, (GLint) height);
+- glMatrixMode(GL_PROJECTION);
+- glLoadIdentity();
+- glFrustum(-1.0, 1.0, -h, h, 2.0, 30.0);
+- glMatrixMode(GL_MODELVIEW);
+- glLoadIdentity();
+- glTranslatef(0.0, 0.0, -10.0);
+-}
+-
+-int
+-main(int argc, char **argv)
+-{
+- int i;
+-
+- glutInitWindowSize(600,300);
+- glutInit(&argc, argv);
+- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
+-
+- for (i=1; i<argc; i++) {
+- if(!strcmp("-noms", argv[i])) {
+- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
+- printf("forcing no multisampling\n");
+- } else if(!strcmp("-nomipmaps", argv[i])) {
+- useMipmaps = 0;
+- } else if(!strcmp("-nearest", argv[i])) {
+- linearFiltering = 0;
+- }
+- }
+- glutCreateWindow("sprite blast");
+- glewInit();
+- glutReshapeFunc(reshape);
+- glutDisplayFunc(redraw);
+- glutMouseFunc(mouse);
+- glutMotionFunc(mouseMotion);
+- glutVisibilityFunc(visible);
+- glutKeyboardFunc(key);
+- glutCreateMenu(menu);
+- glutAddMenuEntry("Reset time", 0);
+- glutAddMenuEntry("Constant", 1);
+- glutAddMenuEntry("Linear", 2);
+- glutAddMenuEntry("Quadratic", 3);
+- glutAddMenuEntry("Blend on", 4);
+- glutAddMenuEntry("Blend off", 5);
+- glutAddMenuEntry("Threshold 1", 6);
+- glutAddMenuEntry("Threshold 10", 7);
+- glutAddMenuEntry("Point smooth on", 8);
+- glutAddMenuEntry("Point smooth off", 9);
+- glutAddMenuEntry("Point size 16", 10);
+- glutAddMenuEntry("Point size 32", 11);
+- glutAddMenuEntry("Point size 64", 12);
+- glutAddMenuEntry("Toggle spin", 13);
+- glutAddMenuEntry("200 points ", 14);
+- glutAddMenuEntry("500 points ", 15);
+- glutAddMenuEntry("1000 points ", 16);
+- glutAddMenuEntry("2000 points ", 17);
+- glutAddMenuEntry("Quit", 666);
+- glutAttachMenu(GLUT_RIGHT_BUTTON);
+-
+- makePointList();
+- makeSprite();
+-
+- glShadeModel(GL_FLAT);
+- glEnable(GL_DEPTH_TEST);
+- glEnable(GL_POINT_SMOOTH);
+- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+- glPointSize(32.0);
+-#ifdef GL_ARB_point_parameters
+- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
+-#endif
+-
+- glutMainLoop();
+- return 0; /* ANSI C requires main to return int. */
+-}
diff --git a/libre/lib32-sdl-libre/PKGBUILD b/libre/lib32-sdl-libre/PKGBUILD
new file mode 100644
index 000000000..a1fa02a0a
--- /dev/null
+++ b/libre/lib32-sdl-libre/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgbasename=sdl-libre
+pkgname=lib32-$_pkgbasename
+pkgver=1.2.15
+pkgrel=3
+pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)"
+arch=('x86_64')
+url="http://www.libsdl.org"
+license=('LGPL')
+provides=("lib32-sdl=${pkgver}")
+conflicts=('lib32-sdl')
+replaces=('lib32-sdl')
+depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename)
+makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib)
+optdepends=('lib32-alsa-lib: ALSA audio driver'
+ 'lib32-libpulse: PulseAudio audio driver')
+options=('!libtool')
+source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
+ sdl-1.2.14-fix-mouse-clicking.patch
+ sdl-1.2.14-disable-mmx.patch
+ fix_joystick_misc_axes.diff
+ libsdl-1.2.15-resizing.patch
+ libre.patch)
+md5sums=('9d96df8417572a2afb781a7c4c811a85'
+ '04d8c179f125e04bcd4c9d60e013c2d7'
+ 'e5c16b7611f62c7cb25f0534eff68852'
+ '687586a108b597a2a6b73070c1d37e51'
+ '3dd50347d8856160a9cbd7f80383a1f8'
+ '5c665f72b8a2adc97a91f6db6f2da79a')
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ cd SDL-$pkgver
+ patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
+ patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
+ patch -Np1 -i ../fix_joystick_misc_axes.diff
+ patch -Np1 -i ../libsdl-1.2.15-resizing.patch
+ patch -Np0 -i ../libre.patch
+ ./configure --prefix=/usr --disable-nasm --enable-alsa \
+ --with-x --disable-rpath --disable-static --libdir=/usr/lib32
+ make
+}
+
+package() {
+ cd SDL-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "$pkgdir"/usr/{include,share}
+
+ cd "$pkgdir/usr/bin"
+ mv sdl-config sdl-config-32
+}
diff --git a/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff b/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff
new file mode 100644
index 000000000..75e3755c9
--- /dev/null
+++ b/libre/lib32-sdl-libre/fix_joystick_misc_axes.diff
@@ -0,0 +1,13 @@
+diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
+index ee43974..80e46e4 100644
+--- a/src/joystick/linux/SDL_sysjoystick.c
++++ b/src/joystick/linux/SDL_sysjoystick.c
+@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
+ ++joystick->nbuttons;
+ }
+ }
+- for ( i=0; i<ABS_MISC; ++i ) {
++ for ( i=0; i<ABS_MAX; ++i ) {
+ /* Skip hats */
+ if ( i == ABS_HAT0X ) {
+ i = ABS_HAT3Y;
diff --git a/libre/sdl-libre/riva_mmio.patch b/libre/lib32-sdl-libre/libre.patch
index 945d9bf9b..72f7da56a 100644
--- a/libre/sdl-libre/riva_mmio.patch
+++ b/libre/lib32-sdl-libre/libre.patch
@@ -552,3 +552,27 @@
/* The Riva has an accelerated color fill */
this->info.blit_fill = 1;
+--- src/video/fbcon/SDL_fbvideo.c.orig 2011-09-08 17:30:03.670583685 +0200
++++ src/video/fbcon/SDL_fbvideo.c 2011-09-08 17:30:24.230582737 +0200
+@@ -46,7 +46,6 @@
+ #include "SDL_fbevents_c.h"
+ #include "SDL_fb3dfx.h"
+ #include "SDL_fbmatrox.h"
+-#include "SDL_fbriva.h"
+
+ /*#define FBCON_DEBUG*/
+
+@@ -769,13 +768,6 @@
+ #endif
+ FB_3DfxAccel(this, finfo.accel);
+ break;
+- case FB_ACCEL_NV3:
+- case FB_ACCEL_NV4:
+-#ifdef FBACCEL_DEBUG
+- printf("NVidia hardware accelerator!\n");
+-#endif
+- FB_RivaAccel(this, finfo.accel);
+- break;
+ default:
+ #ifdef FBACCEL_DEBUG
+ printf("Unknown hardware accelerator.\n");
diff --git a/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch b/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch
new file mode 100644
index 000000000..0655a13e1
--- /dev/null
+++ b/libre/lib32-sdl-libre/libsdl-1.2.15-resizing.patch
@@ -0,0 +1,63 @@
+Description: Revert change that breaks window corner resizing
+ http://bugzilla.libsdl.org/show_bug.cgi?id=1430
+Author: Andrew Caudwell <acaudwell@gmail.com>
+Last-Update: 2012-04-10
+Bug-Debian: http://bugs.debian.org/665779
+
+diff -r c787fb1b5699 src/video/x11/SDL_x11events.c
+--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500
++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300
+@@ -57,12 +57,6 @@
+ static SDLKey MISC_keymap[256];
+ SDLKey X11_TranslateKeycode(Display *display, KeyCode kc);
+
+-/*
+- Pending resize target for ConfigureNotify (so outdated events don't
+- cause inappropriate resize events)
+-*/
+-int X11_PendingConfigureNotifyWidth = -1;
+-int X11_PendingConfigureNotifyHeight = -1;
+
+ #ifdef X_HAVE_UTF8_STRING
+ Uint32 Utf8ToUcs4(const Uint8 *utf8)
+@@ -825,16 +819,6 @@
+ #ifdef DEBUG_XEVENTS
+ printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height);
+ #endif
+- if ((X11_PendingConfigureNotifyWidth != -1) &&
+- (X11_PendingConfigureNotifyHeight != -1)) {
+- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) &&
+- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) {
+- /* Event is from before the resize, so ignore. */
+- break;
+- }
+- X11_PendingConfigureNotifyWidth = -1;
+- X11_PendingConfigureNotifyHeight = -1;
+- }
+ if ( SDL_VideoSurface ) {
+ if ((xevent.xconfigure.width != SDL_VideoSurface->w) ||
+ (xevent.xconfigure.height != SDL_VideoSurface->h)) {
+diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h
+--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500
++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300
+@@ -27,8 +27,3 @@
+ extern void X11_InitOSKeymap(_THIS);
+ extern void X11_PumpEvents(_THIS);
+ extern void X11_SetKeyboardState(Display *display, const char *key_vec);
+-
+-/* Variables to be exported */
+-extern int X11_PendingConfigureNotifyWidth;
+-extern int X11_PendingConfigureNotifyHeight;
+-
+diff -r c787fb1b5699 src/video/x11/SDL_x11video.c
+--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500
++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300
+@@ -1182,8 +1182,6 @@
+ current = NULL;
+ goto done;
+ }
+- X11_PendingConfigureNotifyWidth = width;
+- X11_PendingConfigureNotifyHeight = height;
+ } else {
+ if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) {
+ current = NULL;
diff --git a/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch
new file mode 100644
index 000000000..1bb6e0e47
--- /dev/null
+++ b/libre/lib32-sdl-libre/sdl-1.2.14-disable-mmx.patch
@@ -0,0 +1,13 @@
+# and another one from FS#26020
+
+--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700
++++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700
+@@ -89,6 +89,8 @@
+ #include "SDL_yuvfuncs.h"
+ #include "SDL_yuv_sw_c.h"
+
++#undef __OPTIMIZE__
++
+ /* The functions used to manipulate software video overlays */
+ static struct private_yuvhwfuncs sw_yuvfuncs = {
+ SDL_LockYUV_SW,
diff --git a/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch b/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch
new file mode 100644
index 000000000..7d3e5acfc
--- /dev/null
+++ b/libre/lib32-sdl-libre/sdl-1.2.14-fix-mouse-clicking.patch
@@ -0,0 +1,23 @@
+--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700
++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700
+@@ -423,12 +423,15 @@
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+- if ( this->input_grab == SDL_GRAB_OFF ) {
+- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++ if ( (xevent.xcrossing.mode != NotifyGrab) &&
++ (xevent.xcrossing.mode != NotifyUngrab) ) {
++ if ( this->input_grab == SDL_GRAB_OFF ) {
++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++ }
++ posted = SDL_PrivateMouseMotion(0, 0,
++ xevent.xcrossing.x,
++ xevent.xcrossing.y);
+ }
+- posted = SDL_PrivateMouseMotion(0, 0,
+- xevent.xcrossing.x,
+- xevent.xcrossing.y);
+ }
+ break;
+
diff --git a/libre/libcl-libre/PKGBUILD b/libre/libcl-libre/PKGBUILD
new file mode 100644
index 000000000..425525492
--- /dev/null
+++ b/libre/libcl-libre/PKGBUILD
@@ -0,0 +1,75 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgbase=mesa
+pkgname=libcl-libre
+pkgver=9.0
+pkgrel=2
+arch=(
+ i686
+ x86_64
+ mips64el
+)
+makedepends=(
+ clang
+ dri2proto
+ git
+ glproto
+ imake
+ libdrm
+ libxdamage
+ libxext
+ libxml2
+ llvm
+ python2
+)
+license=(
+ MIT
+ Khronos
+ LGPL
+)
+url="http://${pkgbase}3d.sourceforge.net"
+depends=(
+ gcc-libs
+ libdrm
+ libffi
+ libxcb
+ udev
+)
+conflicts=(
+ ${pkgname%-libre}
+)
+provides=(
+ ${pkgname%-libre}
+)
+replaces=(
+ ${pkgname%-libre}
+)
+pkgdesc='Mesa OpenCL library and ICD loader'
+source=(
+ ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/${pkgbase^}Lib-$pkgver.tar.bz2
+)
+sha512sums=(
+ 878dc8e3f87aa4ad8d96599a87c733c15b725251c797cdfa6d03fee3c2959fd81a07ac7363e7a8946cf597303398aa581356b46827e7ffa27b33971d39bd29a2
+)
+
+build() {
+ cd $srcdir/${pkgbase^}-$pkgver
+
+ autoreconf -vfi
+ ./configure --prefix=/usr \
+ --enable-opencl \
+ --enable-gallium-llvm \
+ --enable-r600-llvm-compiler \
+ --with-clang-libdir=/usr/lib \
+ --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \
+ --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast
+ make V=0
+}
+
+package() {
+ cd $srcdir/${pkgbase^}-$pkgver
+ make -C src/gallium/targets/opencl DESTDIR=$pkgdir install
+ install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre}
+ bin/minstall docs/COPYING $pkgdir/usr/share/licenses/${pkgname%-libre}
+ bin/minstall docs/license.html $pkgdir/usr/share/licenses/${pkgname%-libre}
+}
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
index 2b3c84263..b800c1444 100644..100755
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -1,11 +1,11 @@
# $Id$
# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy>
+# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com>
pkgname=libquicktime-libre
_pkgname=libquicktime
pkgver=1.2.4
-pkgrel=1
+pkgrel=2
pkgdesc="A library for reading and writing quicktime files (no unfree faac support)."
arch=('i686' 'x86_64')
license=('GPL')
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index ecbba4e47..dec731c97 100644..100755
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=libretools
pkgname=(libretools libretools-pr libretools-mips64el)
-pkgver=20111231
+pkgver=$(date -u +%Y%m%d)
pkgrel=2
pkgdesc="Scripts for easing Parabola's tasks"
arch=('any')
@@ -12,7 +12,6 @@ license=('GPL3+')
depends=(openssh rsync git wget)
optdepends=('devtools: For chroot (libremkchroot, librechroot, libremakepkg)')
makedepends=(git)
-backup=(etc/libretools.conf)
install=libretools.install
source=()
md5sums=()
@@ -36,42 +35,52 @@ build() {
}
package_libretools() {
-
- install -d ${pkgdir}/etc
- install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
+ backup=(etc/libretools.conf)
install -d ${pkgdir}/etc/libretools.d
- install -m644 ${_gitname}/cleansystem ${pkgdir}/etc/libretools.d
+ install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
install -d ${pkgdir}/usr/bin
- install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin
- install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin
- install -m755 ${_gitname}/aur ${pkgdir}/usr/bin
- install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin/
- install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin
- install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin
- install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin
- install -m755 ${_gitname}/lb ${pkgdir}/usr/bin
- install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/
- install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/
- install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/
- install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/
- install -m755 ${_gitname}/libremkchroot ${pkgdir}/usr/bin
- install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/
- install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin
- install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/
- install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/
- install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
- install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
-
install -d ${pkgdir}/usr/sbin
- install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/
+ install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/aur ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/buildenv ${pkgdir}/usr/sbin
+ install -m755 ${_gitname}/chcleanup ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/fullpkg-build ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/fullpkg-find ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/is_unfree ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/lb ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/libreaddiff ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/librebasebuilder ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/librechroot ${pkgdir}/usr/sbin
+ install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin
+ install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/libremkchroot ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/toru-path ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/toru-utils ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/toru-where ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
+ install -m755 ${_gitname}/update-cleansystem ${pkgdir}/usr/sbin
install -d ${pkgdir}/usr/share/pacman
install -m755 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman
}
package_libretools-pr() {
+ backup=('etc/libretools.d/prtools.conf')
+
install -d ${pkgdir}/etc/libretools.d
install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d
@@ -82,6 +91,8 @@ package_libretools-pr() {
}
package_libretools-mips64el() {
+ backup=('etc/libretools.d/mips64el.conf')
+
install -d ${pkgdir}/etc/libretools.d
install -m755 ${_gitname}/mips64el/mips64el.conf ${pkgdir}/etc/libretools.d
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index 6f8c09d5c..69a0f2467 100644..100755
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,3 +1,5 @@
+#!/bin/sh
+
# arg 1: the new package version
post_install() {
cat <<EOF
@@ -8,6 +10,7 @@ If you plan using fullpkg you should read http://wiki.parabolagnulinux.org/fullp
and install libretools-$arch if avaliable
EOF
+ update-cleansystem
}
## arg 1: the new package version
@@ -19,6 +22,7 @@ Check your /etc/libretools.conf
If using fullpkg, you should install libretools-$arch if avaliable
EOF
+ update-cleansystem
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/libui-sh/PKGBUILD b/libre/libui-sh/PKGBUILD
index 075d8c0a6..075d8c0a6 100644..100755
--- a/libre/libui-sh/PKGBUILD
+++ b/libre/libui-sh/PKGBUILD
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD
index 6097d67b8..8a3d62929 100644..100755
--- a/libre/licenses-libre/PKGBUILD
+++ b/libre/licenses-libre/PKGBUILD
@@ -1,9 +1,10 @@
# $Id: PKGBUILD 82120 2010-06-08 16:36:51Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
pkgname=licenses-libre
-pkgver=2.8
+pkgver=2.9
pkgrel=1
pkgdesc="The standard licenses distribution package"
arch=('any')
@@ -13,6 +14,7 @@ groups=('base')
provides=("licenses=${pkgver}")
conflicts=('licenses')
replaces=('licenses')
+makedepends=(links)
source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
cc-by-3.0.txt
cc-by-sa-3.0.txt
@@ -120,7 +122,7 @@ md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
'd09c120ca7db95ef2aeecec0cb08293b'
'b4a94da2a1f918b217ef5156634fc9e0'
'a45bb1bbeed9e26b26c5763df1d3913d'
- '68d59ff8306e3a9f5f1c01462c77a317'
+ 'bfecdc446cd2a6a4410ac9e6d0064b3a'
'f083e41c43db25e18f36c91e57750b64'
'a055911c32fb4ed6e96c453ceaeba857'
'dc8502850eab9e1ff330a12d7ca18a19')
diff --git a/libre/licenses-libre/ZopePublicLicense.txt b/libre/licenses-libre/ZopePublicLicense.txt
index 0f06d960d..0f06d960d 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 7a1b8cfcc..01ea9167c 100644..100755
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 156321 2012-04-17 02:30:26Z eric $
+# $Id: PKGBUILD 170013 2012-10-31 00:54:28Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor (Parabola): bitlord
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=liferea
pkgname=liferea-libre
-pkgver=1.8.5
-pkgrel=1
+pkgver=1.8.10
+pkgrel=1.1
pkgdesc="A desktop news aggregator for online news feeds and weblogs"
arch=('i686' 'x86_64')
url="http://liferea.sourceforge.net/"
@@ -18,23 +18,23 @@ depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-t
makedepends=('intltool')
options=('!libtool' '!emptydirs')
install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
remove-non-free-suggestions.patch)
-sha1sums=('076cde160fff49a4b8c59fdae0571659ce8acd88'
+sha1sums=('1e71c56f4eb8ea7941fce53ced433491d0dd7c4d'
'0d68c567c3d37932a49709c58c37c3f138fd19cb')
build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd "${srcdir}/liferea-${pkgver}"
patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
make
}
package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd "${srcdir}/liferea-${pkgver}"
make DESTDIR="${pkgdir}" install
install -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${_pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
}
diff --git a/libre/liferea-libre/libnotify-0.7.patch b/libre/liferea-libre/libnotify-0.7.patch
index 6dbbffb87..6dbbffb87 100644..100755
--- 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 5ad87f7f6..7d812ccdb 100644..100755
--- a/libre/liferea-libre/liferea.install
+++ b/libre/liferea-libre/liferea.install
@@ -1,4 +1,4 @@
-pkgname=liferea-libre
+pkgname=liferea
post_install() {
usr/sbin/gconfpkg --install ${pkgname}
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch
index 325017567..325017567 100644..100755
--- a/libre/liferea-libre/remove-non-free-suggestions.patch
+++ b/libre/liferea-libre/remove-non-free-suggestions.patch
diff --git a/libre/lilo/.directory b/libre/lilo/.directory
deleted file mode 100644
index ba03b0e05..000000000
--- a/libre/lilo/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,5,3,19,29,58
diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD
index 8103a1ac1..8103a1ac1 100644..100755
--- a/libre/lilo/PKGBUILD
+++ b/libre/lilo/PKGBUILD
diff --git a/libre/lilo/lilo.conf b/libre/lilo/lilo.conf
index dea0dbe58..dea0dbe58 100644..100755
--- 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 100644..100755
--- 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 72f4c464d..c420c2070 100644..100755
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 154187 2012-03-24 08:44:42Z allan $
+# $Id: PKGBUILD 165111 2012-08-11 08:21:11Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# 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.3
-_sublevel=2
+_basekernel=3.6
+_sublevel=3
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-pkgdesc="Kernel Libre headers sanitized for use in userspace"
+pkgdesc="Kernel libre headers sanitized for use in userspace"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/libc"
license=('GPL2')
-provides=("linux-api-headers=${pkgver}" "kernel-headers=${pkgver}")
-conflicts=('linux-api-headers' 'kernel-headers')
-replaces=('linux-api-headers' 'kernel-headers')
+provides=("linux-api-headers=${pkgver}")
+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=('5487da14ca81715a469c7594d39722fa'
- 'b43d3bdecfa355bf45bd1154819e3687')
+md5sums=('a2312edd0265b5b07bd4b50afae2b380'
+ '844bd14e9f58225274e096c31bbb8a8f')
build() {
cd ${srcdir}/linux-${_basekernel}
@@ -37,8 +37,8 @@ package() {
make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
# use headers from libdrm
- rm -rf ${pkgdir}/usr/include/drm
+ rm -r ${pkgdir}/usr/include/drm
# clean-up unnecessary files generated during install
- find ${pkgdir} -name .install -or -name ..install.cmd -print0 | xargs -0 rm -f
+ find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
}
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
new file mode 100644
index 000000000..57488f6de
--- /dev/null
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Contributor: Márcio Silva <coadde@lavabit.com>
+
+pkgname=linux-libre-firmware
+pkgver=3.6
+pkgrel=2
+pkgdesc='Free firmware files for Linux-libre'
+arch=('any')
+url='http://linux-libre.fsfla.org/'
+license=('GPL2')
+provides=('linux-firmware=20120625'
+ 'kernel26-firmware=2.6.34.99')
+conflicts=('linux-firmware'
+ 'linux-firmware-git'
+ 'kernel26-firmware'
+ 'ar9170-fw'
+ 'iwlwifi-1000-ucode'
+ 'iwlwifi-3945-ucode'
+ 'iwlwifi-4965-ucode'
+ 'iwlwifi-5000-ucode'
+ 'iwlwifi-5150-ucode'
+ 'iwlwifi-6000-ucode'
+ 'rt2870usb-fw'
+ 'rt2x00-rt61-fw'
+ 'rt2x00-rt71w-fw')
+replaces=('linux-firmware'
+ 'kernel26-firmware'
+ 'ar9170-fw'
+ 'iwlwifi-1000-ucode'
+ 'iwlwifi-3945-ucode'
+ 'iwlwifi-4965-ucode'
+ 'iwlwifi-5000-ucode'
+ 'iwlwifi-5150-ucode'
+ 'iwlwifi-6000-ucode'
+ 'rt2870usb-fw'
+ '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')
+
+package() {
+ cd $srcdir/linux-$pkgver
+
+ make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
+
+ # move WHENCE file to linux-libre-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
new file mode 100644
index 000000000..294c5afbf
--- /dev/null
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+
+_kernver=3.6.5
+_kernrel=1
+pkgname=('linux-libre-kmod-alx')
+_pkgver=2012-10-03
+pkgver=20121003
+pkgrel=4
+pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
+arch=('i686' 'x86_64')
+url='http://linuxwireless.org/'
+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)
+
+md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13')
+
+
+build() {
+ # current extramodules version
+ _extraver=extramodules-3.6-LIBRE
+
+ cd $srcdir/compat-wireless-$_pkgver-pc
+
+ # 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
+ 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
+ gzip -9 alx.ko
+ install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
+}
diff --git a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install b/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
new file mode 100644
index 000000000..aad4270cd
--- /dev/null
+++ b/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
@@ -0,0 +1,33 @@
+generic() {
+ echo " > Running depmod now..."
+ depmod -a
+}
+
+unload() {
+ lsmod | grep alx > /dev/null
+ if [ "$?" = "0" ]; then
+ rmmod alx
+ fi
+}
+
+post_install() {
+ generic
+ echo " > Reloading alx module..."
+ echo " Please note that you may REBOOT your system to get it works!"
+ unload
+ sleep 0.5
+ modprobe alx
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ generic
+ echo " > Unloading memory resident module..."
+ unload
+ rmmod compat
+ echo " Module unloaded!."
+}
+
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
new file mode 100644
index 000000000..ffda9f21f
--- /dev/null
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+
+_kernver=3.0.50
+_kernrel=1
+pkgname=('linux-libre-lts-kmod-alx')
+_pkgver=2012-10-03
+pkgver=20121003
+pkgrel=5
+pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
+arch=('i686' 'x86_64')
+url='http://linuxwireless.org/'
+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)
+
+md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13')
+
+
+build() {
+ # current extramodules version
+ _extraver=extramodules-3.0-LIBRE-LTS
+
+ cd ${srcdir}/compat-wireless-$_pkgver-pc
+
+ # 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
+ 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
+ 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/linux-libre-lts-kmod-alx.install b/libre/linux-libre-lts-kmod-alx/linux-libre-lts-kmod-alx.install
new file mode 100644
index 000000000..aad4270cd
--- /dev/null
+++ b/libre/linux-libre-lts-kmod-alx/linux-libre-lts-kmod-alx.install
@@ -0,0 +1,33 @@
+generic() {
+ echo " > Running depmod now..."
+ depmod -a
+}
+
+unload() {
+ lsmod | grep alx > /dev/null
+ if [ "$?" = "0" ]; then
+ rmmod alx
+ fi
+}
+
+post_install() {
+ generic
+ echo " > Reloading alx module..."
+ echo " Please note that you may REBOOT your system to get it works!"
+ unload
+ sleep 0.5
+ modprobe alx
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ generic
+ echo " > Unloading memory resident module..."
+ unload
+ rmmod compat
+ echo " Module unloaded!."
+}
+
diff --git a/libre/linux-libre-lts/.directory b/libre/linux-libre-lts/.directory
deleted file mode 100644
index 89e875be9..000000000
--- a/libre/linux-libre-lts/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,4,16,17,55,34
diff --git a/libre/linux-libre-lts/Kbuild b/libre/linux-libre-lts/Kbuild
index 8a9d7dceb..8a9d7dceb 100644..100755
--- 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 100644..100755
--- 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 3593442f9..b7ffda209 100644..100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,18 +1,16 @@
# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-pkgbase=linux-libre-lts
-pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kernel
-# pkgname=linux-custom # Build kernel with a different name
-_kernelname=-LIBRE-LTS
+pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
+#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=32
+_sublevel=51
pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.31 # nearly always the same as pkgver
pkgrel=1
+_lxopkgver=${_basekernel}.50 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -23,18 +21,20 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
# the main kernel config files
'config.i686' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
- "${pkgname}.preset"
+ "${pkgbase}.preset"
'Kbuild'
'Kbuild.platforms'
'boot-logo.patch'
'change-default-console-loglevel.patch'
'i915-fix-ghost-tv-output.patch'
'ext4-options.patch'
- "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+ 'module-symbol-waiting-3.0.patch'
+ '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'
- '1fc88c19baf04fbb37385712ad9c4d57'
- 'df7e69a7b238c6492b589cc2beb894d2'
- '2ef390e115d6ae1c074c30fec9258442'
+ 'fb3c742b1f8b01131534a22348cfa712'
+ 'aed25ab047e1c0b020a1516c235c6a74'
+ '7d37e8ce0f4bd5a957172b12ae742ea0'
'c072b17032e80debc6a8626299245d46'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
@@ -42,13 +42,18 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
'f36222e7ce20c8e4dc27376f9be60f6c'
- 'bacdceaf5ce186cfe69dffc89cd246a0')
+ '670931649c60fcb3ef2e0119ed532bd4'
+ '8a71abc4224f575008f974a099b5cf6f'
+ 'e2cc9f33fb26b254b6b65f8981aebf13')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
unset md5sums[${#md5sums[@]}-1]
fi
+_kernelname=${pkgbase#linux-libre}
+_localversionname=-LIBRE-LTS
+
build() {
cd "${srcdir}/linux-${_basekernel}"
@@ -77,6 +82,11 @@ build() {
# https://bugs.archlinux.org/task/28653
patch -Np1 -i "${srcdir}/ext4-options.patch"
+ # fix module initialisation
+ # https://bugs.archlinux.org/task/32122
+ patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch"
+ patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
@@ -89,10 +99,10 @@ build() {
# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
# and make USB storage support builtin (e.g. for booting from USB
# disks without slowly loading an initramfs)
- sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+ sed -ri \
-e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
-e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
- -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" \
+ -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
-e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
./.config
else
@@ -100,12 +110,16 @@ build() {
fi
if [ "${_kernelname}" != "" ]; then
- sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
+ sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config
+ sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
fi
# set extraversion to pkgrel
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+ # don't run depmod on 'make install'. We'll do this ourselves in packaging
+ sed -i '2iexit 0' scripts/depmod.sh
+
# get kernel version
make prepare
@@ -117,15 +131,22 @@ build() {
#make oldconfig # using old config from previous kernel version
# ... or manually edit .config
+ # rewrite configuration
+ yes "" | make config >/dev/null
+
+ # save configuration for later reuse
+ if [ "${CARCH}" = "x86_64" ]; then
+ cat .config > "${startdir}/config.x86_64.last"
+ else
+ cat .config > "${startdir}/config.i686.last"
+ fi
+
####################
# stop here
# this is useful to configure the kernel
- #msg "Stopping build"
- #return 1
+ #msg "Stopping build"; return 1
####################
- yes "" | make config
-
# build!
if [ "$CARCH" == "mips64el" ]; then
# The build system passes it directly to linker, disable to avoid
@@ -133,21 +154,22 @@ build() {
export LDFLAGS=""
# bzImage is arch-specific and not supported on mips; vmlinux is
# useful for oprofile.
- make ${MAKEFLAGS} vmlinux vmlinuz modules
+ make ${MAKEFLAGS} LOCALVERSION= vmlinux vmlinuz modules
else
- make ${MAKEFLAGS} bzImage modules
+ make ${MAKEFLAGS} LOCALVERSION= bzImage modules
fi
}
-package_linux-libre-lts() {
- pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers"
- depends=('coreutils' 'kmod')
+_package() {
+ pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers"
+ [ "${pkgbase}" = "linux-libre" ] && groups=('base')
+ depends=('coreutils' 'linux-libre-firmware' 'kmod')
optdepends=('crda: to set the correct wireless channels of your country')
- provides=('kernel26-lts' "linux-lts=$pkgver")
- conflicts=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts')
- replaces=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts')
- backup=("etc/mkinitcpio.d/${pkgname}.preset")
- install=${pkgname}.install
+ provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
+ conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+ replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+ backup=("etc/mkinitcpio.d/${pkgbase}.preset")
+ install=${pkgbase}.install
if [ "$CARCH" = "mips64el" ]; then
optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
conflicts+=('mkinitcpio<0.7')
@@ -161,35 +183,42 @@ package_linux-libre-lts() {
[ $CARCH = "mips64el" ] && KARCH=mips
# get kernel version
- _kernver="$(make kernelrelease)"
+ _kernver="$(make LOCALVERSION= kernelrelease)"
+ _basekernel=${_kernver%%-*}
+ _basekernel=${_basekernel%.*}
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
- make INSTALL_MOD_PATH="${pkgdir}" modules_install
+ make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
if [ "$CARCH" == "mips64el" ]; then
- cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
- cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}"
+ cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}"
+ cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}"
else
- cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
+ cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}"
fi
# add vmlinux
install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
# install fallback mkinitcpio.conf file and preset file for kernel
- install -D -m644 "${srcdir}/${pkgname}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
+ install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
# set correct depmod command for install
sed \
- -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \
- -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \
- -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
- -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
+ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
+ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
+ -i "${startdir}/${pkgbase}.install"
+ sed \
+ -e "1s|'linux*.*'|'${pkgbase}'|" \
+ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
+ -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
+ -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
+ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
# mkinitcpio 0.7 relies on bzImage to find the kernel version
if [ "$CARCH" == "mips64el" ]; then
- sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|g" \
- -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
+ sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
+ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
fi
# remove build and source links
@@ -199,17 +228,23 @@ package_linux-libre-lts() {
# gzip -9 all modules to save 100MB of space
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
# make room for external modules
- ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+ ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
# add real version for building modules and running depmod from post_install/upgrade
- mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}"
- echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}/version"
+ mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}"
+ echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}/version"
+
+ # Now we call depmod...
+ depmod -b "$pkgdir" -F System.map "$_kernver"
+
+ # move module tree /lib -> /usr/lib
+ mv "$pkgdir/lib" "$pkgdir/usr"
}
-package_linux-libre-lts-headers() {
- pkgdesc="Header files and scripts for building modules for linux-libre-lts longtime supported kernel"
- provides=('kernel26-lts-headers' "linux-lts-headers=${pkgver}")
- conflicts=('kernel26-lts-headers' 'kernel26-libre-lts-headers' 'linux-lts-headers')
- replaces=('kernel26-lts-headers' 'kernel26-libre-lts-headers' 'linux-lts-headers')
+_package-headers() {
+ pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+ provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
+ conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
+ replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
KARCH=x86
[ $CARCH = "mips64el" ] && KARCH=mips
@@ -217,13 +252,13 @@ package_linux-libre-lts-headers() {
# In case of repackaging this is empty
if [ -z "${_kernver}" ]; then
cd "${srcdir}/linux-${_basekernel}"
- _kernver="$(make kernelrelease)"
+ _kernver="$(make LOCALVERSION= kernelrelease)"
fi
- mkdir -p "${pkgdir}/lib/modules/${_kernver}"
+ install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
- cd "${pkgdir}/lib/modules/${_kernver}"
- ln -sf ../../../usr/src/linux-${_kernver} build
+ cd "${pkgdir}/usr/lib/modules/${_kernver}"
+ ln -sf ../../../src/linux-${_kernver} build
cd "${srcdir}/linux-${_basekernel}"
install -D -m644 Makefile \
@@ -348,10 +383,19 @@ package_linux-libre-lts-headers() {
done
# remove unneeded architectures
- rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,um,unicore32,v850,xtensa}
+ rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
if [ "$CARCH" = "mips64el" ]; then
rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
else
rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips
fi
}
+
+pkgname=("${pkgbase}" "${pkgbase}-headers")
+for _p in ${pkgname[@]}; do
+ eval "package_${_p}() {
+ _package${_p#${pkgbase}}
+ }"
+done
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/libre/linux-libre-lts/boot-logo.patch b/libre/linux-libre-lts/boot-logo.patch
index c392928a5..c392928a5 100644..100755
--- 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 100644..100755
--- 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 7094b2731..823d65d18 100644..100755
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.29-1 Kernel Configuration
+# Linux/i386 3.0.43-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -62,7 +62,7 @@ CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION="-LIBRE-LTS"
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
@@ -81,7 +81,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_FHANDLE is not set
+CONFIG_FHANDLE=y
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
@@ -106,13 +106,13 @@ CONFIG_IRQ_FORCED_THREADING=y
#
# RCU Subsystem
#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
@@ -192,9 +192,11 @@ CONFIG_TRACEPOINTS=y
CONFIG_OPROFILE=m
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
+CONFIG_OPTPROBES=y
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
CONFIG_USER_RETURN_NOTIFIER=y
CONFIG_HAVE_IOREMAP_PROT=y
CONFIG_HAVE_KPROBES=y
@@ -251,27 +253,27 @@ CONFIG_PADATA=y
# 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_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
# 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=y
# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
# 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=y
# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
# CONFIG_MUTEX_SPIN_ON_OWNER is not set
CONFIG_FREEZER=y
@@ -359,9 +361,9 @@ 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_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -992,7 +994,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y
# DCCP Kernel Hacking
#
# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
@@ -1104,6 +1108,7 @@ CONFIG_XPS=y
# Network testing
#
CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
CONFIG_NET_DROP_MONITOR=y
CONFIG_HAMRADIO=y
@@ -3440,6 +3445,7 @@ CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_SAA7164=m
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_VIA_CAMERA=m
CONFIG_VIDEO_NOON010PC30=m
CONFIG_VIDEO_M5MOLS=m
CONFIG_SOC_CAMERA=m
@@ -3805,6 +3811,7 @@ CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_I810 is not set
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
CONFIG_DRM_MGA=m
@@ -3864,7 +3871,9 @@ CONFIG_FB_I810_I2C=y
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
-# CONFIG_FB_VIA is not set
+CONFIG_FB_VIA=m
+CONFIG_FB_VIA_DIRECT_PROCFS=y
+CONFIG_FB_VIA_X_COMPATIBILITY=y
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
@@ -4998,7 +5007,8 @@ CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
CONFIG_SIGMA=m
# CONFIG_GOOGLE_FIRMWARE is not set
@@ -5044,7 +5054,7 @@ CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
@@ -5059,7 +5069,7 @@ CONFIG_QUOTA_TREE=m
CONFIG_QFMT_V1=m
CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_GENERIC_ACL=y
@@ -5310,7 +5320,6 @@ CONFIG_TIMER_STATS=y
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set
# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
@@ -5341,7 +5350,7 @@ CONFIG_FRAME_POINTER=y
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_CPU_STALL_VERBOSE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -5377,7 +5386,6 @@ CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
CONFIG_SCHED_TRACER=y
CONFIG_FTRACE_SYSCALLS=y
CONFIG_BRANCH_PROFILE_NONE=y
@@ -5385,6 +5393,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ALL_BRANCHES is not set
CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5416,6 +5425,7 @@ CONFIG_DEBUG_RODATA=y
CONFIG_DOUBLEFAULT=y
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
CONFIG_IO_DELAY_TYPE_0X80=0
CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_UDELAY=2
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index f7cd1263b..89eed9382 100644..100755
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.26-1 Kernel Configuration
+# Linux/x86_64 3.0.43-1 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -63,7 +63,7 @@ CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION="-LIBRE-LTS"
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
@@ -82,7 +82,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_FHANDLE is not set
+CONFIG_FHANDLE=y
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
@@ -107,13 +107,13 @@ CONFIG_IRQ_FORCED_THREADING=y
#
# RCU Subsystem
#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=64
# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
@@ -193,9 +193,11 @@ CONFIG_TRACEPOINTS=y
CONFIG_OPROFILE=m
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
+CONFIG_OPTPROBES=y
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
CONFIG_USER_RETURN_NOTIFIER=y
CONFIG_HAVE_IOREMAP_PROT=y
CONFIG_HAVE_KPROBES=y
@@ -252,27 +254,27 @@ CONFIG_PADATA=y
# 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_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
# 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=y
# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
# 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=y
# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
# CONFIG_MUTEX_SPIN_ON_OWNER is not set
CONFIG_FREEZER=y
@@ -341,9 +343,9 @@ 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_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT is not set
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -960,7 +962,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y
# DCCP Kernel Hacking
#
# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
@@ -1070,10 +1074,9 @@ CONFIG_BPF_JIT=y
# Network testing
#
CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
CONFIG_NET_DROP_MONITOR=y
CONFIG_HAMRADIO=y
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
#
# Packet Radio protocols
@@ -1093,6 +1096,8 @@ CONFIG_BAYCOM_SER_FDX=m
CONFIG_BAYCOM_SER_HDX=m
CONFIG_BAYCOM_PAR=m
CONFIG_YAM=m
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
#
# IrDA protocols
@@ -3274,6 +3279,7 @@ CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_SAA7164=m
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_VIA_CAMERA=m
CONFIG_VIDEO_NOON010PC30=m
CONFIG_VIDEO_M5MOLS=m
CONFIG_SOC_CAMERA=m
@@ -3621,6 +3627,7 @@ CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_I810 is not set
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
CONFIG_DRM_MGA=m
@@ -3677,7 +3684,9 @@ CONFIG_FB_EFI=y
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
-# CONFIG_FB_VIA is not set
+CONFIG_FB_VIA=m
+CONFIG_FB_VIA_DIRECT_PROCFS=y
+CONFIG_FB_VIA_X_COMPATIBILITY=y
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
@@ -4739,7 +4748,8 @@ CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
CONFIG_SIGMA=m
# CONFIG_GOOGLE_FIRMWARE is not set
@@ -4785,7 +4795,7 @@ CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
@@ -4801,7 +4811,7 @@ CONFIG_QFMT_V1=m
CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_GENERIC_ACL=y
@@ -5051,7 +5061,6 @@ CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
@@ -5081,7 +5090,7 @@ CONFIG_FRAME_POINTER=y
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_CPU_STALL_VERBOSE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -5117,7 +5126,6 @@ CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
CONFIG_SCHED_TRACER=y
CONFIG_FTRACE_SYSCALLS=y
CONFIG_BRANCH_PROFILE_NONE=y
@@ -5125,6 +5133,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ALL_BRANCHES is not set
CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5156,6 +5165,7 @@ CONFIG_DEBUG_RODATA=y
# CONFIG_IOMMU_DEBUG is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
CONFIG_IO_DELAY_TYPE_0X80=0
CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_UDELAY=2
diff --git a/libre/linux-libre-lts/ext4-options.patch b/libre/linux-libre-lts/ext4-options.patch
index ef1b2417d..ef1b2417d 100644..100755
--- 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 100644..100755
--- 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 6cd9761a7..75238bf66 100644..100755
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,14 +2,19 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.32-1-LIBRE-LTS
+KERNEL_VERSION=3.0.51-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'
post_install () {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION}
- echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
- mkinitcpio -p linux-libre${KERNEL_NAME}
+ if command -v mkinitcpio 2>&1 > /dev/null; then
+ echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
+ mkinitcpio -p linux-libre${KERNEL_NAME}
+ fi
# compat symlinks for the official kernels only
if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
@@ -28,7 +33,7 @@ post_install () {
post_upgrade() {
pacman -Q grub &>/dev/null
hasgrub=$?
- pacman -Q grub2 &>/dev/null
+ pacman -Q grub-common &>/dev/null
hasgrub2=$?
pacman -Q lilo &>/dev/null
haslilo=$?
@@ -51,8 +56,10 @@ post_upgrade() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION}
- echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
- mkinitcpio -p linux-libre${KERNEL_NAME}
+ if command -v mkinitcpio 2>&1 > /dev/null; then
+ echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
+ mkinitcpio -p linux-libre${KERNEL_NAME}
+ fi
}
post_remove() {
diff --git a/libre/linux-libre-lts/linux-libre-lts.preset b/libre/linux-libre-lts/linux-libre-lts.preset
index 37cf35ed0..37cf35ed0 100644..100755
--- a/libre/linux-libre-lts/linux-libre-lts.preset
+++ b/libre/linux-libre-lts/linux-libre-lts.preset
diff --git a/libre/linux-libre-lts/module-init-wait-3.0.patch b/libre/linux-libre-lts/module-init-wait-3.0.patch
new file mode 100644
index 000000000..1bcfd2491
--- /dev/null
+++ b/libre/linux-libre-lts/module-init-wait-3.0.patch
@@ -0,0 +1,77 @@
+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-lts/module-symbol-waiting-3.0.patch b/libre/linux-libre-lts/module-symbol-waiting-3.0.patch
new file mode 100644
index 000000000..b87a38ff5
--- /dev/null
+++ b/libre/linux-libre-lts/module-symbol-waiting-3.0.patch
@@ -0,0 +1,66 @@
+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/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index 1422f451f..e6cc4238c 100644..100755
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id$
+# $Id: PKGBUILD 142395 2011-11-08 23:03:12Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=linux-libre-manpages
pkgver=3.1
-pkgrel=1
-pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel."
+pkgrel=1.2
+pkgdesc="Kernel libre hackers manual - Section 9 manpages that comes with the linux-libre kernel"
arch=('any')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl')
-replaces=('kernel26-manpages' 'linux-manpages')
-conflicts=('kernel26-manpages' 'linux-manpages')
+replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
+conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
provides=('kernel26-manpages' 'linux-manpages')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.xz")
md5sums=('38703cdbb0b9107e7220bc094c5e36b1')
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index b7dc50f94..d3154ac86 100644..100755
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,69 +1,97 @@
# $Id$
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgbase=linux-libre-tools
-_pkgname=('perf' 'cpupower')
-pkgname=('perf-libre' 'cpupower-libre')
-_basekernel=3.4
+pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
+_basekernel=3.6
#_sublevel=1
#pkgver=${_basekernel}.${_sublevel}
pkgver=${_basekernel}
-pkgrel=2
+pkgrel=1
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
options=('!strip')
-makedepends=('asciidoc' 'xmlto')
# split packages need all package dependencies set manually in makedepends
-makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils')
+# kernel source deps
+makedepends=('asciidoc' 'xmlto')
+# perf-libre deps
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils')
+# cpupower-libre deps
+makedepends+=('pciutils')
+# usbip-libre deps
+makedepends+=('glib2' 'sysfsutils')
+groups=("$pkgbase")
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"
- 'cpupower.rc'
'cpupower.conf'
- 'cpupower.service')
-md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
- '73dbc931e86b3b73d6e2338dcbee81a4'
- '18d5aa9e4c6bb23bb02bf65e155e0f0e'
- '20870541e88109d2f153be3c58a277f1')
+ 'cpupower.rc'
+ 'cpupower.systemd'
+ 'cpupower.service'
+ 'usbipd.conf'
+ 'usbipd.rc'
+ 'usbipd.service')
+md5sums=('a2312edd0265b5b07bd4b50afae2b380'
+ '56883c159381ba89e50ab8ea65efec77'
+ '5fc1fcda4cef93f16e752b1931db23e3'
+ 'c0d17b5295fe964623c772a2dd981771'
+ '2450e8ff41b30eb58d43b5fffbfde1f4'
+ 'e8fac9c45a628015644b4150b139278a'
+ '8a3831d962ff6a9968c0c20fd601cdec'
+ 'ba7c1c513314dd21fb2334fb8417738f')
build() {
- cd "${srcdir}/linux-${_basekernel}"
-
+ # apply stable patching set
if [ "${_basekernel}" != "${pkgver}" ]; then
+ msg2 'Applying stable patch set'
patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
fi
- cd ${srcdir}
- msg2 'Build perf'
+ msg2 'Build perf-libre'
pushd linux-$pkgver/tools/perf
make \
+ WERROR=0 \
DESTDIR="$pkgdir/usr" \
- perfexecdir="lib/$_pkgname" \
+ perfexecdir='lib/perf' \
PYTHON=python2 \
NO_GTK2=1 \
PERF_VERSION=$pkgver-$pkgrel \
all man
popd
- msg2 'Build cpupower'
- cd linux-$pkgver/tools/power/cpupower
+ msg2 'Build cpupower-libre'
+ pushd linux-$pkgver/tools/power/cpupower
# we cannot use --as-needed
LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
make VERSION=$pkgver-$pkgrel
+ popd
+
+ msg2 'Build x86_energy_perf_policy-libre'
+ pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+ make
+ popd
+
+ msg2 'Build usbip-libre'
+ pushd linux-$pkgver/drivers/staging/usbip/userspace
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
+ popd
}
package_perf-libre() {
pkgdesc='Linux-libre kernel performance auditing tool'
- depends=('python2' 'libnewt' 'elfutils')
+ depends=('perl' 'python2' 'libnewt' 'elfutils')
replaces=('perf')
conflicts=('perf')
provides=("perf=$pkgver")
cd linux-$pkgver/tools/perf
make \
+ WERROR=0 \
DESTDIR="$pkgdir/usr" \
- perfexecdir="lib/$_pkgname" \
+ perfexecdir='lib/perf' \
PYTHON=python2 \
NO_GTK2=1 \
PERF_VERSION=$pkgver-$pkgrel \
@@ -73,8 +101,8 @@ package_perf-libre() {
package_cpupower-libre() {
pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
backup=('etc/conf.d/cpupower')
- depends=('pciutils')
- replaces=('cpupower')
+ depends=('bash' 'pciutils')
+ replaces=('cpupower' 'cpufrequtils')
conflicts=('cpupower' 'cpufrequtils')
provides=("cpupower=$pkgver")
@@ -85,10 +113,43 @@ package_cpupower-libre() {
docdir='/usr/share/doc/cpupower' \
install install-man
popd
- # install rc.d script
- install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
- install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
- install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
+ # install startup scripts
+ install -Dm 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
+ install -Dm 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+ install -Dm 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
+ install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
+}
+
+package_x86_energy_perf_policy-libre() {
+ pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
+ depends=('glibc')
+ replaces=('x86_energy_perf_policy')
+ conflicts=('x86_energy_perf_policy')
+ provides=("x86_energy_perf_policy=$pkgver")
+
+ cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+ install -Dm 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
+ install -Dm 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
+}
+
+package_usbip-libre() {
+ pkgdesc='An USB device sharing system over IP network'
+ depends=('glib2' 'sysfsutils')
+ options=('!libtool')
+ replaces=('usbip')
+ conflicts=('usbip')
+ provides=("usbip=$pkgver")
+
+ pushd linux-$pkgver/drivers/staging/usbip/userspace
+ make install DESTDIR="$pkgdir"
+ popd
+ # module loading
+ install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+ printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+ # install daemon scripts
+ install -Dm 755 usbipd.rc "$pkgdir/etc/rc.d/usbipd"
+ install -Dm 644 usbipd.conf "$pkgdir/etc/conf.d/usbipd"
+ install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
}
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.conf
index f4e9cc4c8..b5c522ea1 100644..100755
--- a/libre/linux-libre-tools/cpupower.conf
+++ b/libre/linux-libre-tools/cpupower.conf
@@ -8,10 +8,11 @@
#max_freq="3GHz"
# Specific frequency to be set.
-# Requires userspace governor to be available and loaded.
+# Requires userspace governor to be available.
+# Do not set governor field if you use this one.
#freq=
-# Utilizes cores in one processor package/socket first before processes are
+# Utilizes cores in one processor package/socket first before processes are
# scheduled to other processor packages/sockets.
# See man (1) CPUPOWER-SET for additional details.
#mc_scheduler=
diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc
index 27a491e95..88edaf791 100644..100755
--- a/libre/linux-libre-tools/cpupower.rc
+++ b/libre/linux-libre-tools/cpupower.rc
@@ -3,39 +3,14 @@
. /etc/rc.conf
. /etc/rc.d/functions
-[[ -f /etc/conf.d/cpupower ]] && . /etc/conf.d/cpupower
-
case "$1" in
start|restart)
- stat_busy "Setting cpupower rules"
- declare -i fail=0
-
- # frequency-set options
- declare -a params=()
- params+=(${governor:+-g $governor})
- params+=(${min_freq:+-d $min_freq})
- params+=(${max_freq:+-u $max_freq})
- params+=(${freq:+-f $freq})
- if ((${#params[@]} > 0)); then
- cpupower frequency-set "${params[@]}" >/dev/null || fail=1
- fi
-
- # set options
- declare -a params=()
- params+=(${mc_scheduler:+-m $mc_scheduler})
- params+=(${smp_scheduler:+-s $smp_scheduler})
- params+=(${perf_bias:+-b $perf_bias})
- if ((${#params[@]} > 0)); then
- cpupower set "${params[@]}" >/dev/null || fail=1
- fi
-
- # print failure if any
- (($fail > 0)) && stat_fail && exit 1 || stat_done
+ status 'Setting cpupower rules' /usr/lib/systemd/scripts/cpupower || exit 1
;;
*)
- echo "usage: ${0##*/} {start|restart}"
+ echo "usage: ${0##*/} {start|restart}" >&2
+ exit 1
+ ;;
esac
-true
-
# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.service b/libre/linux-libre-tools/cpupower.service
index f77cfdc97..aaeba2b08 100644..100755
--- a/libre/linux-libre-tools/cpupower.service
+++ b/libre/linux-libre-tools/cpupower.service
@@ -3,7 +3,7 @@ Description=Apply cpupower configuration
[Service]
Type=oneshot
-ExecStart=/etc/rc.d/cpupower start
+ExecStart=/usr/lib/systemd/scripts/cpupower
RemainAfterExit=yes
[Install]
diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd
new file mode 100755
index 000000000..f45b02bc8
--- /dev/null
+++ b/libre/linux-libre-tools/cpupower.systemd
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+. /etc/conf.d/cpupower
+
+declare -i fail=0
+
+# parse frequency options
+declare -a params=()
+params+=(${governor:+-g $governor})
+params+=(${min_freq:+-d $min_freq})
+params+=(${max_freq:+-u $max_freq})
+params+=(${freq:+-f $freq})
+
+# apply frequency options
+if ((${#params[@]} > 0)); then
+ cpupower frequency-set "${params[@]}" >/dev/null || fail=1
+fi
+
+# parse cpu options
+declare -a params=()
+params+=(${mc_scheduler:+-m $mc_scheduler})
+params+=(${smp_scheduler:+-s $smp_scheduler})
+params+=(${perf_bias:+-b $perf_bias})
+
+# apply cpu options
+if ((${#params[@]} > 0)); then
+ cpupower set "${params[@]}" >/dev/null || fail=1
+fi
+
+exit $fail
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/usbipd.conf b/libre/linux-libre-tools/usbipd.conf
new file mode 100755
index 000000000..5990b857a
--- /dev/null
+++ b/libre/linux-libre-tools/usbipd.conf
@@ -0,0 +1,3 @@
+# vim:set ts=2 sw=2 ft=sh noet:
+
+DAEMON_OPTS=''
diff --git a/libre/linux-libre-tools/usbipd.rc b/libre/linux-libre-tools/usbipd.rc
new file mode 100755
index 000000000..15a1bcf00
--- /dev/null
+++ b/libre/linux-libre-tools/usbipd.rc
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/${0##*/}
+
+DAEMON=/usr/sbin/usbipd
+PID=$(pidof -o %PPID $DAEMON)
+DAEMON_OPTS="--daemon $DAEMON_OPTS"
+
+case "$1" in
+ start)
+ stat_busy "Starting ${0##*/} daemon"
+ [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
+ stat_fail
+ ;;
+ stop)
+ stat_busy "Stopping ${0##*/} daemon"
+ [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
+ stat_fail
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ exit 0
+ ;;
+ *)
+ echo "usage: ${0##*/} {start|stop|restart}" >&2
+ ;;
+esac
+
+exit 1
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service
new file mode 100755
index 000000000..ac2f5f7c1
--- /dev/null
+++ b/libre/linux-libre-tools/usbipd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=USB/IP server
+
+[Service]
+ExecStart=/usr/sbin/usbipd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/linux-libre/.directory b/libre/linux-libre/.directory
deleted file mode 100644
index f39ceed05..000000000
--- a/libre/linux-libre/.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Dolphin]
-Timestamp=2012,4,8,18,21,16
-
-[Settings]
-HiddenFilesShown=true
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index a6f62e2cd..b41198fe5 100644..100755
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,19 +1,24 @@
-2012-05-26 André Silva <andre.paulista@adinet.com.uy>
+2012-06-23 André Silva <emulatorman@lavabit.com>
+
+ * linux-libre-3.4.4-1
+ * Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
+
+2012-05-26 André Silva <emulatorman@lavabit.com>
* linux-libre-3.4-1.2
* Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
-2012-04-24 André Silva <andre.paulista@adinet.com.uy>
+2012-04-24 André Silva <emulatorman@lavabit.com>
* linux-libre-3.3.3-1
* Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90
-2012-04-08 André Silva <andre.paulista@adinet.com.uy>
+2012-04-08 André Silva <emulatorman@lavabit.com>
* linux-libre-3.3.1-1.1
* Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
-2012-03-03 André Silva <andre.paulista@adinet.com.uy>
+2012-03-03 André Silva <emulatorman@lavabit.com>
* linux-libre-2.3.9-2
* Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre/Kbuild b/libre/linux-libre/Kbuild
index 8a9d7dceb..8a9d7dceb 100644..100755
--- 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 100644..100755
--- 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 ae3f19ae1..0487c2e84 100644..100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -3,54 +3,56 @@
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
-
-pkgbase=linux-libre
-pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
-# pkgname=linux-custom # Build kernel with a different name
-_kernelname=-LIBRE
-_basekernel=3.4
-#_sublevel=6
-#pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=linux-libre # Build stock -LIBRE kernel
+#pkgbase=linux-libre-custom # Build kernel with a different name
+_basekernel=3.6
+_sublevel=6
+pkgver=${_basekernel}.${_sublevel}
+pkgrel=1
_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
-pkgrel=1.2
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl')
options=('!strip')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
- #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+ "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
# the main kernel config files
'config.i686' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
- "${pkgname}.preset"
+ "${pkgbase}.preset"
'Kbuild'
'Kbuild.platforms'
'boot-logo.patch'
'change-default-console-loglevel.patch'
- 'i915-fix-ghost-tv-output.patch'
- "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
- #'6d9d139e4b53802615833372728cc0e4'
- '631bee7d8e6e125f859fc51200699685'
- '54f6db6c3b747fbee10cb02460ba66f0'
+ 'module-symbol-waiting-3.6.patch'
+ 'module-init-wait-3.6.patch'
+ "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('a2312edd0265b5b07bd4b50afae2b380'
+ '887e4a0fd0fb10da9410f5d1a75466b8'
+ 'e4a3a4677e1fac6ecf0e0fb44c41ca08'
+ '68fc36a4efb6ade0eca409b9444fef0c'
'e49ac236dfeef709f91a3d993ea7b62c'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
- '263725f20c0b9eb9c353040792d644e5'
- 'de092ff42e61e88a67f50c351c2ad7c0')
+ '670931649c60fcb3ef2e0119ed532bd4'
+ '8a71abc4224f575008f974a099b5cf6f'
+ '16173f50a1a39e908825fe6fe90ac103')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
unset md5sums[${#md5sums[@]}-1]
fi
+_kernelname=${pkgbase#linux-libre}
+_localversionname=-LIBRE
+
build() {
cd "${srcdir}/linux-${_basekernel}"
@@ -61,21 +63,16 @@ build() {
# Add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
- # Some chips detect a ghost TV output
- # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
- # Arch Linux bug report: FS#19234
- #
- # It is unclear why this patch wasn't merged upstream, it was accepted,
- # then dropped because the reasoning was unclear. However, it is clearly
- # needed.
- patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
-
- # Patch submitted upstream, waiting for inclusion:
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (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"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
@@ -88,10 +85,10 @@ build() {
# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
# and make USB storage support builtin (e.g. for booting from USB
# disks without slowly loading an initramfs)
- sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+ sed -ri \
-e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
-e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
- -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" \
+ -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
-e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
./.config
else
@@ -99,12 +96,16 @@ build() {
fi
if [ "${_kernelname}" != "" ]; then
- sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
+ sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config
+ sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
fi
# set extraversion to pkgrel
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+ # don't run depmod on 'make install'. We'll do this ourselves in packaging
+ sed -i '2iexit 0' scripts/depmod.sh
+
# get kernel version
make prepare
@@ -116,15 +117,22 @@ build() {
#make oldconfig # using old config from previous kernel version
# ... or manually edit .config
+ # rewrite configuration
+ yes "" | make config >/dev/null
+
+ # save configuration for later reuse
+ if [ "${CARCH}" = "x86_64" ]; then
+ cat .config > "${startdir}/config.x86_64.last"
+ else
+ cat .config > "${startdir}/config.i686.last"
+ fi
+
####################
# stop here
# this is useful to configure the kernel
- #msg "Stopping build"
- #return 1
+ #msg "Stopping build"; return 1
####################
- yes "" | make config
-
# build!
if [ "$CARCH" == "mips64el" ]; then
# The build system passes it directly to linker, disable to avoid
@@ -132,22 +140,22 @@ build() {
export LDFLAGS=""
# bzImage is arch-specific and not supported on mips; vmlinux is
# useful for oprofile.
- make ${MAKEFLAGS} vmlinux vmlinuz modules
+ make ${MAKEFLAGS} LOCALVERSION= vmlinux vmlinuz modules
else
- make ${MAKEFLAGS} bzImage modules
+ make ${MAKEFLAGS} LOCALVERSION= bzImage modules
fi
}
-package_linux-libre() {
- pkgdesc="The Linux-libre Kernel and modules"
- groups=('base')
- depends=('coreutils' 'kmod')
+_package() {
+ pkgdesc="The ${pkgbase} kernel and modules"
+ [ "${pkgbase}" = "linux-libre" ] && groups=('base')
+ depends=('coreutils' 'linux-libre-firmware' 'kmod')
optdepends=('crda: to set the correct wireless channels of your country')
- provides=('kernel26' "linux=$pkgver")
- conflicts=('kernel26' 'kernel26-libre' 'linux')
- replaces=('kernel26' 'kernel26-libre' 'linux')
- backup=("etc/mkinitcpio.d/${pkgname}.preset")
- install=${pkgname}.install
+ provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
+ conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+ replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+ backup=("etc/mkinitcpio.d/${pkgbase}.preset")
+ install=${pkgbase}.install
if [ "$CARCH" = "mips64el" ]; then
optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
conflicts+=('mkinitcpio<0.7')
@@ -161,35 +169,42 @@ package_linux-libre() {
[ $CARCH = "mips64el" ] && KARCH=mips
# get kernel version
- _kernver="$(make kernelrelease)"
+ _kernver="$(make LOCALVERSION= kernelrelease)"
+ _basekernel=${_kernver%%-*}
+ _basekernel=${_basekernel%.*}
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
- make INSTALL_MOD_PATH="${pkgdir}" modules_install
+ make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
if [ "$CARCH" == "mips64el" ]; then
- cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
- cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}"
+ cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}"
+ cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}"
else
- cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
+ cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}"
fi
# add vmlinux
install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
# install fallback mkinitcpio.conf file and preset file for kernel
- install -D -m644 "${srcdir}/${pkgname}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
+ install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
# set correct depmod command for install
sed \
- -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \
- -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \
- -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
- -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
+ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
+ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
+ -i "${startdir}/${pkgbase}.install"
+ sed \
+ -e "1s|'linux*.*'|'${pkgbase}'|" \
+ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
+ -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
+ -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
+ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
# mkinitcpio 0.7 relies on bzImage to find the kernel version
if [ "$CARCH" == "mips64el" ]; then
- sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|g" \
- -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
+ sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
+ -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
fi
# remove build and source links
@@ -199,17 +214,23 @@ package_linux-libre() {
# gzip -9 all modules to save 100MB of space
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
# make room for external modules
- ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+ ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
# add real version for building modules and running depmod from post_install/upgrade
- mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}"
- echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version"
+ mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}"
+ echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version"
+
+ # Now we call depmod...
+ depmod -b "$pkgdir" -F System.map "$_kernver"
+
+ # move module tree /lib -> /usr/lib
+ mv "$pkgdir/lib" "$pkgdir/usr"
}
-package_linux-libre-headers() {
- pkgdesc="Header files and scripts for building modules for linux-libre kernel"
- provides=('kernel26-headers' "linux-headers=${pkgver}")
- conflicts=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers')
- replaces=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers')
+_package-headers() {
+ pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+ provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
+ conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
+ replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
KARCH=x86
[ $CARCH = "mips64el" ] && KARCH=mips
@@ -217,13 +238,13 @@ package_linux-libre-headers() {
# In case of repackaging this is empty
if [ -z "${_kernver}" ]; then
cd "${srcdir}/linux-${_basekernel}"
- _kernver="$(make kernelrelease)"
+ _kernver="$(make LOCALVERSION= kernelrelease)"
fi
- mkdir -p "${pkgdir}/lib/modules/${_kernver}"
+ install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
- cd "${pkgdir}/lib/modules/${_kernver}"
- ln -sf ../../../usr/src/linux-${_kernver} build
+ cd "${pkgdir}/usr/lib/modules/${_kernver}"
+ ln -sf ../../../src/linux-${_kernver} build
cd "${srcdir}/linux-${_basekernel}"
install -D -m644 Makefile \
@@ -273,7 +294,7 @@ package_linux-libre-headers() {
cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
- for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
+ 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}"
done
@@ -356,11 +377,11 @@ package_linux-libre-headers() {
fi
}
-package_linux-libre-docs() {
- pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel."
- provides=('kernel26-docs' "linux-docs=$pkgver")
- conflicts=('kernel26-docs' 'kernel26-libre-docs' 'linux-docs')
- replaces=('kernel26-docs' 'kernel26-libre-docs' 'linux-docs')
+_package-docs() {
+ pkgdesc="Kernel libre 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")
cd "${srcdir}/linux-${_basekernel}"
@@ -372,3 +393,12 @@ package_linux-libre-docs() {
# remove a file already in linux package
rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
}
+
+pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
+for _p in ${pkgname[@]}; do
+ eval "package_${_p}() {
+ _package${_p#${pkgbase}}
+ }"
+done
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/libre/linux-libre/boot-logo.patch b/libre/linux-libre/boot-logo.patch
index c392928a5..c392928a5 100644..100755
--- 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 100644..100755
--- 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 0bea26739..6533b0402 100644..100755
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.4.0-1 Kernel Configuration
+# Linux/i386 3.6.3 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -9,10 +9,6 @@ CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -26,9 +22,7 @@ CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -46,11 +40,12 @@ CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
-CONFIG_KTIME_SCALAR=y
CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_HAVE_IRQ_WORK=y
CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
@@ -78,7 +73,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_FHANDLE is not set
+CONFIG_FHANDLE=y
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
@@ -101,6 +96,20 @@ CONFIG_IRQ_DOMAIN=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
#
# RCU Subsystem
@@ -108,6 +117,7 @@ CONFIG_SPARSE_IRQ=y
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
@@ -124,10 +134,11 @@ CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
-CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+# CONFIG_CGROUP_HUGETLB is not set
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
@@ -139,11 +150,9 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
-CONFIG_USER_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
@@ -182,7 +191,6 @@ CONFIG_HAVE_PERF_EVENTS=y
# Kernel Performance Events And Counters
#
CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
@@ -196,9 +204,11 @@ CONFIG_OPROFILE=m
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
+CONFIG_UPROBES=y
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
CONFIG_USER_RETURN_NOTIFIER=y
CONFIG_HAVE_IOREMAP_PROT=y
CONFIG_HAVE_KPROBES=y
@@ -206,7 +216,9 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
@@ -218,6 +230,9 @@ 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_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
#
# GCOV-based kernel profiling
@@ -312,11 +327,6 @@ CONFIG_FREEZER=y
# Processor type and features
#
CONFIG_ZONE_DMA=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_SMP=y
CONFIG_X86_MPPARSE=y
# CONFIG_X86_BIGSMP is not set
@@ -325,7 +335,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
CONFIG_X86_32_IRIS=m
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_PARAVIRT_GUEST=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
# CONFIG_XEN_PRIVILEGED_GUEST is not set
CONFIG_KVM_CLOCK=y
CONFIG_KVM_GUEST=y
@@ -411,6 +421,7 @@ CONFIG_X86_REBOOTFIXUPS=y
CONFIG_MICROCODE=m
# CONFIG_MICROCODE_INTEL is not set
# CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
# CONFIG_NOHIGHMEM is not set
@@ -433,6 +444,7 @@ CONFIG_SPARSEMEM_STATIC=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_COMPACTION=y
@@ -450,7 +462,9 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
# CONFIG_HIGHPTE is not set
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -495,12 +509,16 @@ CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
CONFIG_PM_RUNTIME=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_CAN_PM_TRACE=y
+CONFIG_PM_SLEEP_DEBUG=y
# CONFIG_PM_TRACE_RTC is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
@@ -588,6 +606,7 @@ CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
CONFIG_INTEL_IDLE=y
#
@@ -631,7 +650,6 @@ CONFIG_PCI_LABEL=y
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
# CONFIG_EISA is not set
-# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
CONFIG_OLPC=y
CONFIG_OLPC_XO1_PM=y
@@ -677,6 +695,7 @@ CONFIG_RAPIDIO=y
CONFIG_RAPIDIO_TSI721=y
CONFIG_RAPIDIO_DISC_TIMEOUT=30
# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
CONFIG_RAPIDIO_DEBUG=y
CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
@@ -704,6 +723,7 @@ CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
CONFIG_XFRM_USER=m
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
@@ -730,6 +750,7 @@ CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
# CONFIG_ARPD is not set
CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
@@ -821,6 +842,8 @@ CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
CONFIG_NETFILTER_TPROXY=m
CONFIG_NETFILTER_XTABLES=m
@@ -842,6 +865,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
CONFIG_NETFILTER_XT_TARGET_CT=m
CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -1002,7 +1026,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1056,7 +1079,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y
# DCCP Kernel Hacking
#
# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
@@ -1098,11 +1123,11 @@ CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
CONFIG_PHONET=m
CONFIG_IEEE802154=m
CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
CONFIG_NET_SCHED=y
#
@@ -1126,6 +1151,8 @@ CONFIG_NET_SCH_DRR=m
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1161,6 +1188,7 @@ CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_RPS=y
@@ -1173,6 +1201,7 @@ CONFIG_BQL=y
# Network testing
#
CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
CONFIG_NET_DROP_MONITOR=y
CONFIG_HAMRADIO=y
@@ -1275,6 +1304,7 @@ CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
@@ -1298,14 +1328,13 @@ CONFIG_WEXT_PROC=y
CONFIG_WEXT_SPY=y
CONFIG_WEXT_PRIV=y
CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
+# CONFIG_NL80211_TESTMODE is not set
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
# CONFIG_CFG80211_REG_DEBUG is not set
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEBUGFS is not set
# CONFIG_CFG80211_INTERNAL_REGDB is not set
CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
CONFIG_LIB80211=m
CONFIG_LIB80211_CRYPT_WEP=m
CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1320,6 +1349,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
CONFIG_WIMAX=m
CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1338,6 +1368,8 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
CONFIG_NFC_NCI=m
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
# CONFIG_NFC_LLCP is not set
#
@@ -1368,7 +1400,9 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_CMA is not set
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1499,7 +1533,6 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
CONFIG_OF=y
#
@@ -1511,7 +1544,6 @@ CONFIG_OF_PROMTREE=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
CONFIG_OF_I2C=m
CONFIG_OF_NET=y
CONFIG_OF_MDIO=m
@@ -1598,7 +1630,8 @@ CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
# CONFIG_PCH_PHUB is not set
CONFIG_USB_SWITCH_FSA9480=m
CONFIG_C2PORT=m
@@ -1614,9 +1647,6 @@ CONFIG_EEPROM_93CX6=m
CONFIG_CB710_CORE=m
# CONFIG_CB710_DEBUG is not set
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
#
# Texas Instruments shared transport line discipline
@@ -1628,6 +1658,7 @@ CONFIG_SENSORS_LIS3_I2C=m
# Altera FPGA firmware download module
#
CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1657,7 +1688,6 @@ CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
#
# SCSI Transports
@@ -1763,6 +1793,7 @@ CONFIG_SCSI_PAS16=m
CONFIG_SCSI_QLOGIC_FAS=m
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
CONFIG_SCSI_QLA_ISCSI=m
CONFIG_SCSI_LPFC=m
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1916,7 +1947,6 @@ CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-# CONFIG_DM_DEBUG_SPACE_MAPS is not set
CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
@@ -1935,6 +1965,7 @@ CONFIG_TCM_PSCSI=m
CONFIG_LOOPBACK_TARGET=m
CONFIG_TCM_FC=m
CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
@@ -1971,10 +2002,13 @@ CONFIG_EQUALIZER=m
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
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
CONFIG_NETCONSOLE=m
@@ -2117,10 +2151,13 @@ CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
+CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_ELPLUS=m
@@ -2210,8 +2247,8 @@ CONFIG_EPIC100=m
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STMMAC_PCI=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=y
# CONFIG_STMMAC_DEBUG_FS is not set
# CONFIG_STMMAC_DA is not set
CONFIG_STMMAC_RING=y
@@ -2229,6 +2266,12 @@ CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
CONFIG_NET_VENDOR_XIRCOM=y
CONFIG_PCMCIA_XIRC2PS=m
# CONFIG_FDDI is not set
@@ -2248,6 +2291,7 @@ CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
CONFIG_ICPLUS_PHY=m
CONFIG_REALTEK_PHY=m
CONFIG_NATIONAL_PHY=m
@@ -2255,6 +2299,8 @@ CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@@ -2273,7 +2319,6 @@ CONFIG_SLHC=m
# CONFIG_SLIP_COMPRESSED is not set
# CONFIG_SLIP_SMART is not set
# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_TR is not set
#
# USB Network Adapters
@@ -2388,6 +2433,7 @@ CONFIG_BRCMUTIL=m
CONFIG_BRCMSMAC=m
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
+# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
@@ -2399,13 +2445,13 @@ CONFIG_HOSTAP_CS=m
# CONFIG_IPW2100 is not set
# CONFIG_IPW2200 is not set
CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
#
# Debugging Options
#
# CONFIG_IWLWIFI_DEBUG is not set
CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_TESTMODE=y
# CONFIG_IWLWIFI_P2P is not set
# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
CONFIG_IWLEGACY=m
@@ -2416,9 +2462,6 @@ CONFIG_IWL3945=m
# iwl3945 / iwl4965 Debugging Options
#
# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_IWM_TRACING=y
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
CONFIG_LIBERTAS_CS=m
@@ -2447,6 +2490,7 @@ CONFIG_RT2800PCI=m
CONFIG_RT2800PCI_RT33XX=y
CONFIG_RT2800PCI_RT35XX=y
CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
CONFIG_RT2500USB=m
CONFIG_RT73USB=m
CONFIG_RT2800USB=m
@@ -2469,25 +2513,26 @@ CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
CONFIG_WL1251=m
CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
CONFIG_WL12XX=m
-CONFIG_WL12XX_SDIO=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
#
# WiMAX Wireless Broadband devices
#
CONFIG_WIMAX_I2400M=m
CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
# CONFIG_WAN is not set
CONFIG_VMXNET3=m
@@ -2646,6 +2691,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_FF_MEMLESS=m
CONFIG_INPUT_POLLDEV=m
CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
#
# Userland interfaces
@@ -2674,6 +2720,7 @@ CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_TCA8418=m
CONFIG_KEYBOARD_MATRIX=m
# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
# CONFIG_KEYBOARD_MAX7359 is not set
CONFIG_KEYBOARD_MCS=m
CONFIG_KEYBOARD_MPR121=m
@@ -2761,13 +2808,16 @@ CONFIG_TOUCHSCREEN_ILI210X=m
CONFIG_TOUCHSCREEN_GUNZE=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
CONFIG_TOUCHSCREEN_MAX11801=m
CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
CONFIG_TOUCHSCREEN_MTOUCH=m
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_TOUCHSCREEN_HTCPEN=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
CONFIG_TOUCHSCREEN_UCB1400=m
@@ -2777,6 +2827,7 @@ CONFIG_TOUCHSCREEN_WM9705=y
CONFIG_TOUCHSCREEN_WM9712=y
CONFIG_TOUCHSCREEN_WM9713=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
CONFIG_TOUCHSCREEN_USB_EGALAX=y
CONFIG_TOUCHSCREEN_USB_PANJIT=y
CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2801,11 +2852,11 @@ CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AB8500_PONKEY=m
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
CONFIG_INPUT_BMA150=m
CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
CONFIG_INPUT_MMA8450=m
CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_APANEL=m
@@ -2952,7 +3003,6 @@ CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
-CONFIG_RAMOOPS=m
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -2995,6 +3045,7 @@ CONFIG_I2C_SCMI=m
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
+CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_EG20T=m
# CONFIG_I2C_GPIO is not set
@@ -3053,6 +3104,7 @@ CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
+CONFIG_OF_GPIO=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@@ -3062,11 +3114,13 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
# CONFIG_GPIO_VX855 is not set
#
# I2C GPIO expanders:
#
+CONFIG_GPIO_ARIZONA=m
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX732X is not set
# CONFIG_GPIO_PCA953X is not set
@@ -3077,6 +3131,7 @@ CONFIG_GPIO_SCH=m
# PCI GPIO expanders:
#
CONFIG_GPIO_CS5535=y
+CONFIG_GPIO_AMD8111=m
# CONFIG_GPIO_LANGWELL is not set
# CONFIG_GPIO_PCH is not set
# CONFIG_GPIO_ML_IOH is not set
@@ -3115,6 +3170,7 @@ CONFIG_BATTERY_OLPC=m
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3153,6 +3209,7 @@ CONFIG_SENSORS_G760A=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_HIH6130=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3216,6 +3273,7 @@ CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
CONFIG_SENSORS_TMP401=m
@@ -3235,6 +3293,7 @@ CONFIG_SENSORS_W83L786NG=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
#
# ACPI drivers
@@ -3265,6 +3324,7 @@ CONFIG_IB700_WDT=m
CONFIG_IBMASR=m
CONFIG_WAFER_WDT=m
CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
CONFIG_ITCO_WDT=m
CONFIG_ITCO_VENDOR_SUPPORT=y
CONFIG_IT8712F_WDT=m
@@ -3333,6 +3393,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
# CONFIG_BCMA_DEBUG is not set
#
@@ -3343,21 +3404,27 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
+CONFIG_MFD_LM3533=m
# CONFIG_TPS6105X is not set
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
CONFIG_MFD_TPS65217=m
# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
CONFIG_MFD_PCF50633=m
CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_I2C=m
CONFIG_ABX500_CORE=y
-CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
CONFIG_MFD_CS5535=m
# CONFIG_MFD_TIMBERDALE is not set
CONFIG_LPC_SCH=m
+CONFIG_LPC_ICH=m
CONFIG_MFD_RDC321X=m
# CONFIG_MFD_JANZ_CMODIO is not set
CONFIG_MFD_VX855=m
@@ -3368,22 +3435,28 @@ CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support
#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+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_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
#
-# Multimedia drivers
+# Media drivers
#
CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=m
-CONFIG_LIRC=m
CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IR_RC5_DECODER=m
CONFIG_IR_RC6_DECODER=m
@@ -3392,7 +3465,7 @@ CONFIG_IR_SONY_DECODER=m
CONFIG_IR_RC5_SZ_DECODER=m
CONFIG_IR_SANYO_DECODER=m
CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
+CONFIG_RC_DEVICES=y
CONFIG_RC_ATI_REMOTE=m
CONFIG_IR_ENE=m
CONFIG_IR_IMON=m
@@ -3403,6 +3476,7 @@ CONFIG_IR_NUVOTON=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
CONFIG_RC_LOOPBACK=m
CONFIG_IR_GPIO_CIR=m
CONFIG_MEDIA_ATTACH=y
@@ -3429,7 +3503,11 @@ 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
@@ -3510,6 +3588,7 @@ CONFIG_VIDEO_SAA7185=m
CONFIG_VIDEO_ADV7170=m
CONFIG_VIDEO_ADV7175=m
CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
CONFIG_VIDEO_AK881X=m
#
@@ -3548,6 +3627,10 @@ CONFIG_VIDEO_THS7303=m
CONFIG_VIDEO_M52790=m
CONFIG_VIDEO_VIVI=m
CONFIG_V4L_USB_DRIVERS=y
+
+#
+# Webcam devices
+#
CONFIG_USB_VIDEO_CLASS=m
CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
CONFIG_USB_GSPCA=m
@@ -3597,15 +3680,32 @@ CONFIG_USB_GSPCA_VC032X=m
CONFIG_USB_GSPCA_VICAM=m
CONFIG_USB_GSPCA_XIRLINK_CIT=m
CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+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
+#
+CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_SYSFS=y
CONFIG_VIDEO_PVRUSB2_DVB=y
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=y
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
@@ -3615,17 +3715,7 @@ CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_BT848=m
CONFIG_VIDEO_BT848_DVB=y
CONFIG_VIDEO_CX18=m
@@ -3670,6 +3760,8 @@ CONFIG_I2C_SI470X=m
CONFIG_USB_MR800=m
CONFIG_USB_DSBR=m
CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
CONFIG_I2C_SI4713=m
CONFIG_RADIO_SI4713=m
CONFIG_USB_KEENE=m
@@ -3740,6 +3832,7 @@ 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
@@ -3804,7 +3897,6 @@ CONFIG_DVB_DDBRIDGE=m
#
# Supported DVB Frontends
#
-# CONFIG_DVB_FE_CUSTOMISE is not set
#
# Multistandard (satellite) frontends
@@ -3871,6 +3963,7 @@ CONFIG_DVB_EC100=m
CONFIG_DVB_STV0367=m
CONFIG_DVB_CXD2820R=m
CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
#
# DVB-C (cable) frontends
@@ -3889,8 +3982,11 @@ CONFIG_DVB_OR51132=m
CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
CONFIG_DVB_S5H1409=m
CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
CONFIG_DVB_S5H1411=m
#
@@ -3922,6 +4018,7 @@ CONFIG_DVB_TDA665x=m
CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
#
# Tools to develop new frontends
@@ -3970,10 +4067,14 @@ CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m
CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_GMA500=m
CONFIG_DRM_GMA600=y
CONFIG_DRM_GMA3600=y
CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
# CONFIG_STUB_POULSBO is not set
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -4028,7 +4129,9 @@ CONFIG_FB_I810_I2C=y
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
-# CONFIG_FB_VIA is not set
+CONFIG_FB_VIA=m
+CONFIG_FB_VIA_DIRECT_PROCFS=y
+CONFIG_FB_VIA_X_COMPATIBILITY=y
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
@@ -4047,12 +4150,14 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
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
@@ -4083,6 +4188,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
# CONFIG_LOGO is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
@@ -4228,7 +4334,6 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1
CONFIG_SND_HDA_INPUT_JACK=y
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
CONFIG_SND_HDA_CODEC_ANALOG=y
CONFIG_SND_HDA_CODEC_SIGMATEL=y
CONFIG_SND_HDA_CODEC_VIA=y
@@ -4286,16 +4391,14 @@ CONFIG_SND_PDAUDIOCF=m
# CONFIG_SND_SOC is not set
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
#
-# USB Input Devices
+# HID support
#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
#
# Special HID drivers
@@ -4304,6 +4407,7 @@ CONFIG_HID_A4TECH=m
CONFIG_HID_ACRUX=m
CONFIG_HID_ACRUX_FF=y
CONFIG_HID_APPLE=m
+CONFIG_HID_AUREAL=m
CONFIG_HID_BELKIN=m
CONFIG_HID_CHERRY=m
CONFIG_HID_CHICONY=m
@@ -4324,6 +4428,7 @@ CONFIG_HID_GYRATION=m
CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
CONFIG_HID_LOGITECH=m
CONFIG_HID_LOGITECH_DJ=m
CONFIG_LOGITECH_FF=y
@@ -4361,12 +4466,18 @@ CONFIG_HID_TOPSEED=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
CONFIG_HID_WIIMOTE=m
CONFIG_HID_WIIMOTE_EXT=y
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4380,8 +4491,6 @@ CONFIG_USB=m
#
# Miscellaneous USB options
#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
@@ -4420,9 +4529,15 @@ CONFIG_USB_R8A66597_HCD=m
CONFIG_USB_RENESAS_USBHS_HCD=m
CONFIG_USB_WHCI_HCD=m
CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
CONFIG_USB_RENESAS_USBHS=m
#
@@ -4536,6 +4651,7 @@ CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
CONFIG_USB_SERIAL_ZIO=m
CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
@@ -4562,6 +4678,11 @@ CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_ISP1301=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
@@ -4573,6 +4694,10 @@ CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
CONFIG_USB_FUSB300=m
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
@@ -4580,12 +4705,10 @@ CONFIG_USB_MV_UDC=m
CONFIG_USB_GADGET_MUSB_HDRC=m
CONFIG_USB_M66592=m
CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_CI13XXX_PCI=m
CONFIG_USB_NET2272=m
CONFIG_USB_NET2272_DMA=y
CONFIG_USB_NET2280=m
CONFIG_USB_GOKU=m
-CONFIG_USB_LANGWELL=m
CONFIG_USB_EG20T=m
CONFIG_USB_DUMMY_HCD=m
CONFIG_USB_GADGET_DUALSPEED=y
@@ -4605,6 +4728,7 @@ CONFIG_USB_FUNCTIONFS_GENERIC=y
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
CONFIG_USB_MIDI_GADGET=m
CONFIG_USB_G_PRINTER=m
@@ -4624,7 +4748,6 @@ CONFIG_USB_G_WEBCAM=m
CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_AB8500_USB is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
@@ -4679,6 +4802,7 @@ CONFIG_LEDS_CLASS=y
# LED drivers
#
CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA9532_GPIO is not set
# CONFIG_LEDS_GPIO is not set
@@ -4692,14 +4816,18 @@ CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_LM3556=m
CONFIG_LEDS_OT200=m
+CONFIG_LEDS_BLINKM=m
CONFIG_LEDS_TRIGGERS=y
#
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4708,6 +4836,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
#
# iptables trigger is under Netfilter config (LED target)
#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
@@ -4716,6 +4845,7 @@ CONFIG_EDAC=y
#
# Reporting subsystems
#
+CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
CONFIG_EDAC_MCE_INJ=m
@@ -4795,11 +4925,11 @@ CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
#
# on-CPU RTC drivers
#
+CONFIG_RTC_DRV_MC13XXX=m
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4833,6 +4963,7 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
+# CONFIG_VFIO is not set
CONFIG_VIRTIO=y
CONFIG_VIRTIO_RING=y
@@ -4842,6 +4973,7 @@ CONFIG_VIRTIO_RING=y
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
# Microsoft Hyper-V guest support
@@ -4860,14 +4992,16 @@ CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
CONFIG_COMEDI=m
# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
CONFIG_COMEDI_KCOMEDILIB=m
CONFIG_COMEDI_BOND=m
CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_ISA_DRIVERS=m
+CONFIG_COMEDI_ISA_DRIVERS=y
CONFIG_COMEDI_ACL7225B=m
CONFIG_COMEDI_PCL711=m
CONFIG_COMEDI_PCL724=m
@@ -4879,9 +5013,13 @@ CONFIG_COMEDI_PCL816=m
CONFIG_COMEDI_PCL818=m
CONFIG_COMEDI_PCM3724=m
CONFIG_COMEDI_PCM3730=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
CONFIG_COMEDI_RTI800=m
CONFIG_COMEDI_RTI802=m
CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
CONFIG_COMEDI_DAS16=m
CONFIG_COMEDI_DAS800=m
CONFIG_COMEDI_DAS1800=m
@@ -4909,7 +5047,7 @@ CONFIG_COMEDI_PCMMIO=m
CONFIG_COMEDI_PCMUIO=m
CONFIG_COMEDI_MULTIQ3=m
CONFIG_COMEDI_POC=m
-CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_PCI_DRIVERS=y
CONFIG_COMEDI_ADDI_APCI_035=m
CONFIG_COMEDI_ADDI_APCI_1032=m
CONFIG_COMEDI_ADDI_APCI_1500=m
@@ -4933,12 +5071,13 @@ CONFIG_COMEDI_ADL_PCI9118=m
CONFIG_COMEDI_ADV_PCI1710=m
CONFIG_COMEDI_ADV_PCI1723=m
CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
CONFIG_COMEDI_AMPLC_PCI224=m
CONFIG_COMEDI_AMPLC_PCI230=m
CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
CONFIG_COMEDI_DT3000=m
CONFIG_COMEDI_DYNA_PCI10XX=m
CONFIG_COMEDI_UNIOXX5=m
@@ -4960,13 +5099,16 @@ CONFIG_COMEDI_NI_6527=m
CONFIG_COMEDI_NI_65XX=m
CONFIG_COMEDI_NI_660X=m
CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
CONFIG_COMEDI_S526=m
CONFIG_COMEDI_S626=m
CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=y
CONFIG_COMEDI_CB_DAS16_CS=m
CONFIG_COMEDI_DAS08_CS=m
CONFIG_COMEDI_NI_DAQ_700_CS=m
@@ -4974,19 +5116,19 @@ CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
CONFIG_COMEDI_NI_LABPC_CS=m
CONFIG_COMEDI_NI_MIO_CS=m
CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_USB_DRIVERS=y
CONFIG_COMEDI_DT9812=m
CONFIG_COMEDI_USBDUX=m
CONFIG_COMEDI_USBDUXFAST=m
CONFIG_COMEDI_USBDUXSIGMA=m
CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_TIO=m
# CONFIG_FB_OLPC_DCON is not set
CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
@@ -5012,12 +5154,9 @@ CONFIG_LINE6_USB=m
# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
CONFIG_VT6655=m
CONFIG_VT6656=m
-# CONFIG_VME_BUS is not set
CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
CONFIG_ZRAM=m
# CONFIG_ZRAM_DEBUG is not set
CONFIG_ZCACHE=y
@@ -5055,7 +5194,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPEAKUP_SYNTH_DUMMY=m
CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_INTEL_MEI=m
CONFIG_STAGING_MEDIA=y
CONFIG_DVB_AS102=m
CONFIG_DVB_CXD2099=m
@@ -5093,6 +5231,17 @@ CONFIG_LIRC_ZILOG=m
# CONFIG_ANDROID is not set
# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_QOS=y
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB_PM=y
+CONFIG_CSR_WIFI=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5151,6 +5300,7 @@ CONFIG_I8253_LOCK=y
CONFIG_CLKBLD_I8253=y
CONFIG_IOMMU_API=y
CONFIG_IOMMU_SUPPORT=y
+CONFIG_OF_IOMMU=y
CONFIG_DMAR_TABLE=y
CONFIG_INTEL_IOMMU=y
# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
@@ -5165,6 +5315,17 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
#
CONFIG_VIRT_DRIVERS=y
# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_ARIZONA=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
#
# Firmware Drivers
@@ -5177,7 +5338,8 @@ CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
# CONFIG_GOOGLE_FIRMWARE is not set
#
@@ -5224,7 +5386,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
@@ -5239,7 +5401,7 @@ CONFIG_QUOTA_TREE=m
CONFIG_QFMT_V1=m
CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_GENERIC_ACL=y
@@ -5313,11 +5475,9 @@ CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
CONFIG_LOGFS=m
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
@@ -5336,6 +5496,9 @@ CONFIG_OMFS_FS=m
# CONFIG_QNX6FS_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
# CONFIG_SYSV_FS is not set
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
@@ -5345,9 +5508,11 @@ CONFIG_EXOFS_FS=m
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
# CONFIG_NFS_V4_1 is not set
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5433,6 +5598,17 @@ CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_DLM=m
# CONFIG_DLM_DEBUG is not set
@@ -5448,6 +5624,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y
CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
@@ -5460,6 +5637,8 @@ CONFIG_HARDLOCKUP_DETECTOR=y
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
@@ -5505,18 +5684,18 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_RCU_CPU_STALL_VERBOSE is not set
# CONFIG_RCU_CPU_STALL_INFO is not set
# CONFIG_RCU_TRACE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
CONFIG_LKDTM=m
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
# CONFIG_FAULT_INJECTION is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -5527,7 +5706,6 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACER_MAX_TRACE=y
CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=y
CONFIG_EVENT_TRACING=y
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
@@ -5547,6 +5725,9 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ALL_BRANCHES is not set
CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5576,8 +5757,10 @@ CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_SET_MODULE_RONX is not set
# CONFIG_DEBUG_NX_TEST is not set
CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
CONFIG_IO_DELAY_TYPE_0X80=0
CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_UDELAY=2
@@ -5659,6 +5842,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
#
# Authenticated Encryption with Associated Data
@@ -5757,12 +5942,14 @@ CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
CONFIG_KVM_MMU_AUDIT=y
CONFIG_VHOST_NET=m
+CONFIG_TCM_VHOST=m
CONFIG_LGUEST=m
CONFIG_BINARY_PRINTF=y
@@ -5771,6 +5958,8 @@ CONFIG_BINARY_PRINTF=y
#
CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
@@ -5809,6 +5998,8 @@ CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_BCH=m
CONFIG_BCH_CONST_PARAMS=y
@@ -5824,6 +6015,8 @@ CONFIG_CHECK_SIGNATURE=y
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
CONFIG_CORDIC=m
+CONFIG_DDR=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 8a4734dac..fbc1c7588 100644..100755
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.4.0-1 Kernel Configuration
+# Linux/x86_64 3.6.3 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -9,11 +9,6 @@ CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
CONFIG_OUTPUT_FORMAT="elf64-x86-64"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -28,9 +23,7 @@ CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -48,11 +41,12 @@ CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_64_SMP=y
CONFIG_X86_HT=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-# CONFIG_KTIME_SCALAR is not set
CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_HAVE_IRQ_WORK=y
CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
@@ -80,7 +74,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_FHANDLE is not set
+CONFIG_FHANDLE=y
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
@@ -99,8 +93,25 @@ CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
#
# RCU Subsystem
@@ -108,6 +119,7 @@ CONFIG_SPARSE_IRQ=y
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
CONFIG_RCU_FANOUT=64
+CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
@@ -124,10 +136,11 @@ CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
-CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+# CONFIG_CGROUP_HUGETLB is not set
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
@@ -139,11 +152,9 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
-CONFIG_USER_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
@@ -182,7 +193,6 @@ CONFIG_HAVE_PERF_EVENTS=y
# Kernel Performance Events And Counters
#
CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
@@ -196,9 +206,11 @@ CONFIG_OPROFILE=m
# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
+CONFIG_UPROBES=y
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
CONFIG_USER_RETURN_NOTIFIER=y
CONFIG_HAVE_IOREMAP_PROT=y
CONFIG_HAVE_KPROBES=y
@@ -207,6 +219,7 @@ CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
@@ -218,7 +231,10 @@ 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_COMPAT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
#
# GCOV-based kernel profiling
@@ -313,11 +329,6 @@ CONFIG_FREEZER=y
# Processor type and features
#
CONFIG_ZONE_DMA=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_SMP=y
CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
@@ -325,7 +336,7 @@ CONFIG_X86_MPPARSE=y
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_PARAVIRT_GUEST=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_XEN=y
CONFIG_XEN_DOM0=y
CONFIG_XEN_PRIVILEGED_GUEST=y
@@ -389,6 +400,7 @@ CONFIG_I8K=m
CONFIG_MICROCODE=m
# CONFIG_MICROCODE_INTEL is not set
# CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
@@ -418,6 +430,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y
CONFIG_MEMORY_HOTREMOVE=y
@@ -438,7 +451,9 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
@@ -483,12 +498,16 @@ CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
CONFIG_PM_RUNTIME=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_CAN_PM_TRACE=y
+CONFIG_PM_SLEEP_DEBUG=y
# CONFIG_PM_TRACE_RTC is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
@@ -560,6 +579,7 @@ CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
CONFIG_INTEL_IDLE=y
#
@@ -632,6 +652,7 @@ CONFIG_RAPIDIO=y
CONFIG_RAPIDIO_TSI721=y
CONFIG_RAPIDIO_DISC_TIMEOUT=30
# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
CONFIG_RAPIDIO_DEBUG=y
CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
@@ -650,12 +671,13 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
CONFIG_BINFMT_MISC=y
CONFIG_IA32_EMULATION=y
CONFIG_IA32_AOUT=m
-# CONFIG_X86_X32 is not set
+CONFIG_X86_X32=y
CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_X86_DEV_DMA_OPS=y
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -666,6 +688,7 @@ CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
CONFIG_XFRM_USER=m
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
@@ -692,6 +715,7 @@ CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
# CONFIG_ARPD is not set
CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
@@ -783,6 +807,8 @@ CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
CONFIG_NETFILTER_TPROXY=m
CONFIG_NETFILTER_XTABLES=m
@@ -804,6 +830,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
CONFIG_NETFILTER_XT_TARGET_CT=m
CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -964,7 +991,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1018,7 +1044,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y
# DCCP Kernel Hacking
#
# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
@@ -1056,11 +1084,11 @@ CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
CONFIG_PHONET=m
CONFIG_IEEE802154=m
CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
CONFIG_NET_SCHED=y
#
@@ -1084,6 +1112,8 @@ CONFIG_NET_SCH_DRR=m
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1119,6 +1149,7 @@ CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_RPS=y
@@ -1126,13 +1157,13 @@ CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_NETPRIO_CGROUP=m
CONFIG_BQL=y
-CONFIG_HAVE_BPF_JIT=y
CONFIG_BPF_JIT=y
#
# Network testing
#
CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
CONFIG_NET_DROP_MONITOR=y
CONFIG_HAMRADIO=y
@@ -1230,6 +1261,7 @@ CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
@@ -1253,14 +1285,13 @@ CONFIG_WEXT_PROC=y
CONFIG_WEXT_SPY=y
CONFIG_WEXT_PRIV=y
CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
+# CONFIG_NL80211_TESTMODE is not set
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
# CONFIG_CFG80211_REG_DEBUG is not set
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEBUGFS is not set
# CONFIG_CFG80211_INTERNAL_REGDB is not set
CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
CONFIG_LIB80211=m
CONFIG_LIB80211_CRYPT_WEP=m
CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1275,6 +1306,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
CONFIG_WIMAX=m
CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1293,6 +1325,8 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
CONFIG_NFC_NCI=m
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
# CONFIG_NFC_LLCP is not set
#
@@ -1301,6 +1335,7 @@ CONFIG_NFC_NCI=m
CONFIG_PN544_NFC=m
CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
+CONFIG_HAVE_BPF_JIT=y
#
# Device Drivers
@@ -1323,6 +1358,7 @@ CONFIG_SYS_HYPERVISOR=y
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
@@ -1451,7 +1487,6 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
@@ -1531,7 +1566,8 @@ CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
CONFIG_PCH_PHUB=m
CONFIG_USB_SWITCH_FSA9480=m
CONFIG_C2PORT=m
@@ -1547,9 +1583,6 @@ CONFIG_EEPROM_93CX6=m
CONFIG_CB710_CORE=m
# CONFIG_CB710_DEBUG is not set
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
#
# Texas Instruments shared transport line discipline
@@ -1561,6 +1594,7 @@ CONFIG_SENSORS_LIS3_I2C=m
# Altera FPGA firmware download module
#
CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1590,7 +1624,6 @@ CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
#
# SCSI Transports
@@ -1684,6 +1717,7 @@ CONFIG_SCSI_IPR=m
# CONFIG_SCSI_IPR_DUMP is not set
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
CONFIG_SCSI_QLA_ISCSI=m
CONFIG_SCSI_LPFC=m
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1824,7 +1858,6 @@ CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-# CONFIG_DM_DEBUG_SPACE_MAPS is not set
CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
@@ -1843,6 +1876,7 @@ CONFIG_TCM_PSCSI=m
CONFIG_LOOPBACK_TARGET=m
CONFIG_TCM_FC=m
CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
@@ -1880,10 +1914,13 @@ CONFIG_EQUALIZER=m
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
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
CONFIG_NETCONSOLE=m
@@ -2014,10 +2051,13 @@ CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
+CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_ZNET=m
@@ -2090,8 +2130,8 @@ CONFIG_EPIC100=m
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STMMAC_PCI=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=y
# CONFIG_STMMAC_DEBUG_FS is not set
# CONFIG_STMMAC_DA is not set
CONFIG_STMMAC_RING=y
@@ -2109,6 +2149,12 @@ CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
CONFIG_NET_VENDOR_XIRCOM=y
CONFIG_PCMCIA_XIRC2PS=m
# CONFIG_FDDI is not set
@@ -2128,6 +2174,7 @@ CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
CONFIG_ICPLUS_PHY=m
CONFIG_REALTEK_PHY=m
CONFIG_NATIONAL_PHY=m
@@ -2153,7 +2200,6 @@ CONFIG_SLHC=m
# CONFIG_SLIP_COMPRESSED is not set
# CONFIG_SLIP_SMART is not set
# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_TR is not set
#
# USB Network Adapters
@@ -2268,6 +2314,7 @@ CONFIG_BRCMUTIL=m
CONFIG_BRCMSMAC=m
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
+# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
@@ -2279,13 +2326,13 @@ CONFIG_HOSTAP_CS=m
# CONFIG_IPW2100 is not set
# CONFIG_IPW2200 is not set
CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
#
# Debugging Options
#
# CONFIG_IWLWIFI_DEBUG is not set
CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_TESTMODE=y
# CONFIG_IWLWIFI_P2P is not set
# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
CONFIG_IWLEGACY=m
@@ -2296,9 +2343,6 @@ CONFIG_IWL3945=m
# iwl3945 / iwl4965 Debugging Options
#
# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_IWM_TRACING=y
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
CONFIG_LIBERTAS_CS=m
@@ -2327,6 +2371,7 @@ CONFIG_RT2800PCI=m
CONFIG_RT2800PCI_RT33XX=y
CONFIG_RT2800PCI_RT35XX=y
CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
CONFIG_RT2500USB=m
CONFIG_RT73USB=m
CONFIG_RT2800USB=m
@@ -2349,25 +2394,26 @@ CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
CONFIG_WL1251=m
CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
CONFIG_WL12XX=m
-CONFIG_WL12XX_SDIO=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
#
# WiMAX Wireless Broadband devices
#
CONFIG_WIMAX_I2400M=m
CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
# CONFIG_WAN is not set
CONFIG_XEN_NETDEV_FRONTEND=m
@@ -2512,6 +2558,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_FF_MEMLESS=m
CONFIG_INPUT_POLLDEV=m
CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
#
# Userland interfaces
@@ -2540,6 +2587,7 @@ CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_TCA8418=m
CONFIG_KEYBOARD_MATRIX=m
# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
# CONFIG_KEYBOARD_MAX7359 is not set
CONFIG_KEYBOARD_MCS=m
CONFIG_KEYBOARD_MPR121=m
@@ -2622,12 +2670,15 @@ CONFIG_TOUCHSCREEN_ILI210X=m
CONFIG_TOUCHSCREEN_GUNZE=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
CONFIG_TOUCHSCREEN_MAX11801=m
CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
CONFIG_TOUCHSCREEN_MTOUCH=m
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
CONFIG_TOUCHSCREEN_UCB1400=m
@@ -2637,6 +2688,7 @@ CONFIG_TOUCHSCREEN_WM9705=y
CONFIG_TOUCHSCREEN_WM9712=y
CONFIG_TOUCHSCREEN_WM9713=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
CONFIG_TOUCHSCREEN_USB_EGALAX=y
CONFIG_TOUCHSCREEN_USB_PANJIT=y
CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2661,11 +2713,11 @@ CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AB8500_PONKEY=m
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
CONFIG_INPUT_BMA150=m
CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
CONFIG_INPUT_MMA8450=m
CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_APANEL=m
@@ -2808,7 +2860,6 @@ CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
-CONFIG_RAMOOPS=m
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -2851,6 +2902,7 @@ CONFIG_I2C_SCMI=m
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
+CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_EG20T=m
# CONFIG_I2C_GPIO is not set
@@ -2915,11 +2967,13 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
# CONFIG_GPIO_VX855 is not set
#
# I2C GPIO expanders:
#
+CONFIG_GPIO_ARIZONA=m
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX732X is not set
# CONFIG_GPIO_PCA953X is not set
@@ -2930,6 +2984,7 @@ CONFIG_GPIO_SCH=m
# PCI GPIO expanders:
#
CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_AMD8111=m
CONFIG_GPIO_LANGWELL=y
# CONFIG_GPIO_PCH is not set
# CONFIG_GPIO_ML_IOH is not set
@@ -2966,6 +3021,7 @@ CONFIG_TEST_POWER=m
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3004,6 +3060,7 @@ CONFIG_SENSORS_G760A=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_HIH6130=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3067,6 +3124,7 @@ CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
CONFIG_SENSORS_TMP401=m
@@ -3086,6 +3144,7 @@ CONFIG_SENSORS_W83L786NG=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
#
# ACPI drivers
@@ -3116,6 +3175,7 @@ CONFIG_IB700_WDT=m
CONFIG_IBMASR=m
CONFIG_WAFER_WDT=m
CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
CONFIG_ITCO_WDT=m
CONFIG_ITCO_VENDOR_SUPPORT=y
CONFIG_IT8712F_WDT=m
@@ -3177,6 +3237,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
# CONFIG_BCMA_DEBUG is not set
#
@@ -3187,21 +3248,27 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
+CONFIG_MFD_LM3533=m
# CONFIG_TPS6105X is not set
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
CONFIG_MFD_TPS65217=m
# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
CONFIG_MFD_PCF50633=m
CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_I2C=m
CONFIG_ABX500_CORE=y
-CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
CONFIG_MFD_CS5535=m
# CONFIG_MFD_TIMBERDALE is not set
CONFIG_LPC_SCH=m
+CONFIG_LPC_ICH=m
CONFIG_MFD_RDC321X=m
# CONFIG_MFD_JANZ_CMODIO is not set
CONFIG_MFD_VX855=m
@@ -3212,22 +3279,28 @@ CONFIG_MEDIA_SUPPORT=m
#
# Multimedia core support
#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+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_DVB_CORE=m
CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
#
-# Multimedia drivers
+# Media drivers
#
CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=m
-CONFIG_LIRC=m
CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IR_RC5_DECODER=m
CONFIG_IR_RC6_DECODER=m
@@ -3236,7 +3309,7 @@ CONFIG_IR_SONY_DECODER=m
CONFIG_IR_RC5_SZ_DECODER=m
CONFIG_IR_SANYO_DECODER=m
CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
+CONFIG_RC_DEVICES=y
CONFIG_RC_ATI_REMOTE=m
CONFIG_IR_ENE=m
CONFIG_IR_IMON=m
@@ -3247,6 +3320,7 @@ CONFIG_IR_NUVOTON=m
CONFIG_IR_REDRAT3=m
CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
CONFIG_RC_LOOPBACK=m
CONFIG_IR_GPIO_CIR=m
CONFIG_MEDIA_ATTACH=y
@@ -3273,7 +3347,11 @@ 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
@@ -3354,6 +3432,7 @@ CONFIG_VIDEO_SAA7185=m
CONFIG_VIDEO_ADV7170=m
CONFIG_VIDEO_ADV7175=m
CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
CONFIG_VIDEO_AK881X=m
#
@@ -3392,6 +3471,10 @@ CONFIG_VIDEO_THS7303=m
CONFIG_VIDEO_M52790=m
CONFIG_VIDEO_VIVI=m
CONFIG_V4L_USB_DRIVERS=y
+
+#
+# Webcam devices
+#
CONFIG_USB_VIDEO_CLASS=m
CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
CONFIG_USB_GSPCA=m
@@ -3441,15 +3524,32 @@ CONFIG_USB_GSPCA_VC032X=m
CONFIG_USB_GSPCA_VICAM=m
CONFIG_USB_GSPCA_XIRLINK_CIT=m
CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+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
+#
+CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_SYSFS=y
CONFIG_VIDEO_PVRUSB2_DVB=y
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=y
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
@@ -3459,17 +3559,7 @@ CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_BT848=m
CONFIG_VIDEO_BT848_DVB=y
CONFIG_VIDEO_CX18=m
@@ -3514,6 +3604,8 @@ CONFIG_I2C_SI470X=m
CONFIG_USB_MR800=m
CONFIG_USB_DSBR=m
CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
CONFIG_I2C_SI4713=m
CONFIG_RADIO_SI4713=m
CONFIG_USB_KEENE=m
@@ -3583,6 +3675,7 @@ 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
@@ -3647,7 +3740,6 @@ CONFIG_DVB_DDBRIDGE=m
#
# Supported DVB Frontends
#
-# CONFIG_DVB_FE_CUSTOMISE is not set
#
# Multistandard (satellite) frontends
@@ -3714,6 +3806,7 @@ CONFIG_DVB_EC100=m
CONFIG_DVB_STV0367=m
CONFIG_DVB_CXD2820R=m
CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
#
# DVB-C (cable) frontends
@@ -3732,8 +3825,11 @@ CONFIG_DVB_OR51132=m
CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
CONFIG_DVB_S5H1409=m
CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
CONFIG_DVB_S5H1411=m
#
@@ -3765,6 +3861,7 @@ CONFIG_DVB_TDA665x=m
CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
#
# Tools to develop new frontends
@@ -3807,10 +3904,14 @@ CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m
CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_GMA500=m
CONFIG_DRM_GMA600=y
CONFIG_DRM_GMA3600=y
CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
# CONFIG_STUB_POULSBO is not set
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3862,7 +3963,9 @@ CONFIG_FB_EFI=y
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
-# CONFIG_FB_VIA is not set
+CONFIG_FB_VIA=m
+CONFIG_FB_VIA_DIRECT_PROCFS=y
+CONFIG_FB_VIA_X_COMPATIBILITY=y
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
@@ -3882,12 +3985,14 @@ CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
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
@@ -3917,6 +4022,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
# CONFIG_LOGO is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
@@ -4026,7 +4132,6 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1
CONFIG_SND_HDA_INPUT_JACK=y
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
CONFIG_SND_HDA_CODEC_ANALOG=y
CONFIG_SND_HDA_CODEC_SIGMATEL=y
CONFIG_SND_HDA_CODEC_VIA=y
@@ -4083,16 +4188,14 @@ CONFIG_SND_PDAUDIOCF=m
# CONFIG_SND_SOC is not set
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
#
-# USB Input Devices
+# HID support
#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
#
# Special HID drivers
@@ -4101,6 +4204,7 @@ CONFIG_HID_A4TECH=m
CONFIG_HID_ACRUX=m
CONFIG_HID_ACRUX_FF=y
CONFIG_HID_APPLE=m
+CONFIG_HID_AUREAL=m
CONFIG_HID_BELKIN=m
CONFIG_HID_CHERRY=m
CONFIG_HID_CHICONY=m
@@ -4121,6 +4225,7 @@ CONFIG_HID_GYRATION=m
CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
CONFIG_HID_LOGITECH=m
CONFIG_HID_LOGITECH_DJ=m
CONFIG_LOGITECH_FF=y
@@ -4158,12 +4263,18 @@ CONFIG_HID_TOPSEED=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
CONFIG_HID_WIIMOTE=m
CONFIG_HID_WIIMOTE_EXT=y
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4177,8 +4288,6 @@ CONFIG_USB=m
#
# Miscellaneous USB options
#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
@@ -4217,9 +4326,15 @@ CONFIG_USB_R8A66597_HCD=m
CONFIG_USB_RENESAS_USBHS_HCD=m
CONFIG_USB_WHCI_HCD=m
CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
CONFIG_USB_RENESAS_USBHS=m
#
@@ -4333,6 +4448,7 @@ CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
CONFIG_USB_SERIAL_ZIO=m
CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
@@ -4359,6 +4475,11 @@ CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_ISP1301=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
@@ -4370,13 +4491,16 @@ CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
CONFIG_USB_MV_UDC=m
CONFIG_USB_GADGET_MUSB_HDRC=m
CONFIG_USB_M66592=m
CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_CI13XXX_PCI=m
CONFIG_USB_NET2272=m
CONFIG_USB_NET2272_DMA=y
CONFIG_USB_NET2280=m
@@ -4400,6 +4524,7 @@ CONFIG_USB_FUNCTIONFS_GENERIC=y
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
CONFIG_USB_MIDI_GADGET=m
CONFIG_USB_G_PRINTER=m
@@ -4419,7 +4544,6 @@ CONFIG_USB_G_WEBCAM=m
CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_AB8500_USB is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
@@ -4474,6 +4598,7 @@ CONFIG_LEDS_CLASS=y
# LED drivers
#
CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA9532_GPIO is not set
# CONFIG_LEDS_GPIO is not set
@@ -4487,14 +4612,18 @@ CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_LM3556=m
CONFIG_LEDS_OT200=m
+CONFIG_LEDS_BLINKM=m
CONFIG_LEDS_TRIGGERS=y
#
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4503,6 +4632,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
#
# iptables trigger is under Netfilter config (LED target)
#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
@@ -4511,6 +4641,7 @@ CONFIG_EDAC=y
#
# Reporting subsystems
#
+CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
CONFIG_EDAC_MCE_INJ=m
@@ -4588,11 +4719,11 @@ CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
#
# on-CPU RTC drivers
#
+CONFIG_RTC_DRV_MC13XXX=m
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4626,6 +4757,7 @@ CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
+# CONFIG_VFIO is not set
CONFIG_VIRTIO=m
CONFIG_VIRTIO_RING=m
@@ -4635,6 +4767,7 @@ CONFIG_VIRTIO_RING=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
# Microsoft Hyper-V guest support
@@ -4662,6 +4795,7 @@ CONFIG_XEN_TMEM=y
CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PRIVCMD=m
CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_MCE_LOG is not set
CONFIG_STAGING=y
CONFIG_ET131X=m
CONFIG_SLICOSS=m
@@ -4674,14 +4808,16 @@ CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
CONFIG_COMEDI=m
# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
CONFIG_COMEDI_KCOMEDILIB=m
CONFIG_COMEDI_BOND=m
CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_PCI_DRIVERS=y
CONFIG_COMEDI_ADDI_APCI_035=m
CONFIG_COMEDI_ADDI_APCI_1032=m
CONFIG_COMEDI_ADDI_APCI_1500=m
@@ -4705,12 +4841,13 @@ CONFIG_COMEDI_ADL_PCI9118=m
CONFIG_COMEDI_ADV_PCI1710=m
CONFIG_COMEDI_ADV_PCI1723=m
CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
CONFIG_COMEDI_AMPLC_PCI224=m
CONFIG_COMEDI_AMPLC_PCI230=m
CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
CONFIG_COMEDI_DT3000=m
CONFIG_COMEDI_DYNA_PCI10XX=m
CONFIG_COMEDI_UNIOXX5=m
@@ -4732,13 +4869,16 @@ CONFIG_COMEDI_NI_6527=m
CONFIG_COMEDI_NI_65XX=m
CONFIG_COMEDI_NI_660X=m
CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
CONFIG_COMEDI_S526=m
CONFIG_COMEDI_S626=m
CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=y
CONFIG_COMEDI_CB_DAS16_CS=m
CONFIG_COMEDI_DAS08_CS=m
CONFIG_COMEDI_NI_DAQ_700_CS=m
@@ -4746,19 +4886,19 @@ CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
CONFIG_COMEDI_NI_LABPC_CS=m
CONFIG_COMEDI_NI_MIO_CS=m
CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_USB_DRIVERS=y
CONFIG_COMEDI_DT9812=m
CONFIG_COMEDI_USBDUX=m
CONFIG_COMEDI_USBDUXFAST=m
CONFIG_COMEDI_USBDUXSIGMA=m
CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_TIO=m
CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
CONFIG_R8187SE=m
@@ -4783,12 +4923,9 @@ CONFIG_LINE6_USB=m
# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
CONFIG_VT6655=m
CONFIG_VT6656=m
-# CONFIG_VME_BUS is not set
CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
CONFIG_ZRAM=m
# CONFIG_ZRAM_DEBUG is not set
CONFIG_ZCACHE=y
@@ -4826,7 +4963,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPEAKUP_SYNTH_DUMMY=m
CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_INTEL_MEI=m
CONFIG_STAGING_MEDIA=y
CONFIG_DVB_AS102=m
CONFIG_DVB_CXD2099=m
@@ -4864,6 +5000,17 @@ CONFIG_LIRC_ZILOG=m
# CONFIG_ANDROID is not set
# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_QOS=y
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB_PM=y
+CONFIG_CSR_WIFI=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -4937,6 +5084,17 @@ CONFIG_IRQ_REMAP=y
#
CONFIG_VIRT_DRIVERS=y
# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_ARIZONA=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
#
# Firmware Drivers
@@ -4949,7 +5107,8 @@ CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
# CONFIG_GOOGLE_FIRMWARE is not set
#
@@ -4996,7 +5155,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
@@ -5012,7 +5171,7 @@ CONFIG_QFMT_V1=m
CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_GENERIC_ACL=y
@@ -5086,11 +5245,9 @@ CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
CONFIG_LOGFS=m
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
@@ -5109,6 +5266,9 @@ CONFIG_OMFS_FS=m
# CONFIG_QNX6FS_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
# CONFIG_SYSV_FS is not set
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
@@ -5118,9 +5278,11 @@ CONFIG_EXOFS_FS=m
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
# CONFIG_NFS_V4_1 is not set
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5206,6 +5368,17 @@ CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_DLM=m
# CONFIG_DLM_DEBUG is not set
@@ -5221,6 +5394,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_FRAME_WARN=2048
CONFIG_MAGIC_SYSRQ=y
CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
@@ -5233,6 +5407,8 @@ CONFIG_HARDLOCKUP_DETECTOR=y
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
@@ -5277,18 +5453,18 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_RCU_CPU_STALL_VERBOSE is not set
# CONFIG_RCU_CPU_STALL_INFO is not set
# CONFIG_RCU_TRACE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
CONFIG_LKDTM=m
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
# CONFIG_FAULT_INJECTION is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -5299,7 +5475,6 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACER_MAX_TRACE=y
CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=y
CONFIG_EVENT_TRACING=y
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
@@ -5319,6 +5494,9 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ALL_BRANCHES is not set
CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5347,9 +5525,11 @@ CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_SET_MODULE_RONX is not set
# CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_DEBUG is not set
# CONFIG_IOMMU_STRESS is not set
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
CONFIG_IO_DELAY_TYPE_0X80=0
CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_UDELAY=2
@@ -5431,6 +5611,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
#
# Authenticated Encryption with Associated Data
@@ -5501,11 +5683,13 @@ CONFIG_CRYPTO_SALSA20_X86_64=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_TWOFISH_COMMON=m
CONFIG_CRYPTO_TWOFISH_X86_64=m
CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
#
# Compression
@@ -5531,12 +5715,14 @@ CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
CONFIG_KVM_MMU_AUDIT=y
CONFIG_VHOST_NET=m
+CONFIG_TCM_VHOST=m
CONFIG_BINARY_PRINTF=y
#
@@ -5544,6 +5730,8 @@ CONFIG_BINARY_PRINTF=y
#
CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
@@ -5581,6 +5769,8 @@ CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_BCH=m
CONFIG_BCH_CONST_PARAMS=y
@@ -5596,6 +5786,8 @@ CONFIG_CHECK_SIGNATURE=y
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
CONFIG_CORDIC=m
+CONFIG_DDR=y
diff --git a/libre/linux-libre/i915-fix-ghost-tv-output.patch b/libre/linux-libre/i915-fix-ghost-tv-output.patch
deleted file mode 100644
index 3b631361a..000000000
--- a/libre/linux-libre/i915-fix-ghost-tv-output.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
-Tested-by: Santi <santi@agolina.net>
----
- drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index dc83b7a..c8f67bf 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1267,6 +1267,15 @@
- DAC_B_0_7_V |
- DAC_C_0_7_V);
-
-+ /*
-+ * The TV sense state should be cleared to zero on cantiga platform. Otherwise
-+ * the TV is misdetected. This is hardware requirement.
-+ */
-+ if (IS_GM45(dev))
-+ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
-+ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
-+
-+
- I915_WRITE(TV_CTL, tv_ctl);
- I915_WRITE(TV_DAC, tv_dac);
- POSTING_READ(TV_DAC);
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 6a2a2795a..8a3791240 100644..100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,14 +2,19 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.4.0-1.2-LIBRE
+KERNEL_VERSION=3.6.6-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'
post_install () {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION}
- echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
- mkinitcpio -p linux-libre${KERNEL_NAME}
+ if command -v mkinitcpio 2>&1 > /dev/null; then
+ echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
+ mkinitcpio -p linux-libre${KERNEL_NAME}
+ fi
# compat symlinks for the official kernels only
if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
@@ -28,7 +33,7 @@ post_install () {
post_upgrade() {
pacman -Q grub &>/dev/null
hasgrub=$?
- pacman -Q grub2-common &>/dev/null
+ pacman -Q grub-common &>/dev/null
hasgrub2=$?
pacman -Q lilo &>/dev/null
haslilo=$?
@@ -51,8 +56,10 @@ post_upgrade() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION}
- echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
- mkinitcpio -p linux-libre${KERNEL_NAME}
+ if command -v mkinitcpio 2>&1 > /dev/null; then
+ echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
+ mkinitcpio -p linux-libre${KERNEL_NAME}
+ fi
}
post_remove() {
diff --git a/libre/linux-libre/linux-libre.preset b/libre/linux-libre/linux-libre.preset
index 0ac59eb14..0ac59eb14 100644..100755
--- 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
new file mode 100644
index 000000000..1bcfd2491
--- /dev/null
+++ b/libre/linux-libre/module-init-wait-3.6.patch
@@ -0,0 +1,77 @@
+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
new file mode 100644
index 000000000..b87a38ff5
--- /dev/null
+++ b/libre/linux-libre/module-symbol-waiting-3.6.patch
@@ -0,0 +1,66 @@
+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
new file mode 100755
index 000000000..2d7f3be5f
--- /dev/null
+++ b/libre/lirc-libre/PKGBUILD
@@ -0,0 +1,124 @@
+# $Id$
+# Maintainer: Paul Mattal <paul@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgbase=lirc
+pkgbase=lirc-libre
+pkgname=('lirc-libre' 'lirc-utils-libre')
+pkgver=0.9.0
+pkgrel=34
+epoch=1
+_extramodules=extramodules-3.6-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')
+options=('!makeflags' '!strip')
+source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
+ lirc_wpc8769l.patch
+ lircd-handle-large-config.patch
+ lirc_atiusb-kfifo.patch
+ kernel-2.6.39.patch
+ lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
+ lirc.service lircm.service irexec.service
+ lirc.tmpfiles
+ )
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${srcdir}/lirc-${pkgver}"
+ patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
+ patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
+ patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
+ patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
+
+ sed -i '/AC_PATH_XTRA/d' configure.ac
+ sed -e 's/@X_CFLAGS@//g' \
+ -e 's/@X_LIBS@//g' \
+ -e 's/@X_PRE_LIBS@//g' \
+ -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
+ libtoolize
+ autoreconf
+
+ PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
+ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
+ --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
+ --with-transmitter
+
+ # Remove drivers already in kernel
+ sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
+ -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
+ -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
+ -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
+ make
+}
+
+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')
+ replaces=('lirc' 'lirc+pctv')
+ conflicts=('lirc')
+ provides=("lirc=$pkgver")
+ install=lirc.install
+
+ cd "${srcdir}/lirc-${pkgver}/drivers"
+ make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install
+
+ # set the kernel we've built for inside the install script
+ sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
+ # gzip -9 modules
+ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+}
+
+package_lirc-utils-libre() {
+ pkgdesc="Linux-libre Infrared Remote Control utils"
+ depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
+ optdepends=('python2: pronto2lirc utility')
+ options=('strip' '!libtool')
+ replaces=('lirc-utils')
+ conflicts=('lirc-utils')
+ provides=("lirc-utils=$pkgver")
+ backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
+ install=lirc-utils.install
+
+ cd "${srcdir}/lirc-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
+ cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
+ install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service
+ install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service
+ install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service
+ install -D -m644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
+ cp -rp remotes "${pkgdir}/usr/share/lirc"
+ chmod -R go-w "${pkgdir}/usr/share/lirc/"
+
+ # install the logrotate config
+ install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
+
+ # install conf.d file
+ install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
+
+ # install conf.d file
+ install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
+
+ install -d "${pkgdir}/etc/lirc"
+
+ # remove built modules
+ rm -r "${pkgdir}/usr/lib/modules"
+}
+md5sums=('b232aef26f23fe33ea8305d276637086'
+ '1cce37e18e3f6f46044abab29016d18f'
+ 'b70cc9640505205446ec47b7d4779f38'
+ '1f8b104a2365d9f93404b143f499059b'
+ '087a7d102e1c96bf1179f38db2b0b237'
+ '8d0e238dc0eda95e340fe570605da492'
+ '85f7fdac55e5256967241864049bf5e9'
+ '3deb02604b37811d41816e9b4385fcc3'
+ '5b1f8c9cd788a39a6283f93302ce5c6e'
+ 'f0c0ac930326168035f0c8e24357ae55'
+ '69d099e6deedfa3c1ee2b6e82d9b8bfb'
+ 'dab8a73bcc5fd5479d8750493d8d97dc'
+ 'c2e20fe68b034df752dba2773db16ebe'
+ '07131d117fcfe9dcd50c453c3a5e9531'
+ 'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/libre/lirc-libre/irexec.conf b/libre/lirc-libre/irexec.conf
new file mode 100755
index 000000000..f911c7515
--- /dev/null
+++ b/libre/lirc-libre/irexec.conf
@@ -0,0 +1,5 @@
+#
+# Parameters for irexec daemon (path to lircrc)
+#
+
+IREXEC_OPTS="" \ No newline at end of file
diff --git a/libre/lirc-libre/irexec.service b/libre/lirc-libre/irexec.service
new file mode 100644
index 000000000..5d7915b29
--- /dev/null
+++ b/libre/lirc-libre/irexec.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=IR Exec
+After=lirc.service
+Wants=lirc.service
+
+[Service]
+ExecStart=/usr/bin/irexec --daemon
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/lirc-libre/irexecd b/libre/lirc-libre/irexecd
new file mode 100755
index 000000000..a64b033a5
--- /dev/null
+++ b/libre/lirc-libre/irexecd
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/irexec.conf
+
+PID=`pidof -o %PPID /usr/bin/irexec`
+case "$1" in
+ start)
+ stat_busy "Starting IREXEC Daemon"
+ [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon irexecd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping IREXEC Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon irexecd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
diff --git a/libre/lirc-libre/kernel-2.6.39.patch b/libre/lirc-libre/kernel-2.6.39.patch
new file mode 100755
index 000000000..7353d61ca
--- /dev/null
+++ b/libre/lirc-libre/kernel-2.6.39.patch
@@ -0,0 +1,54 @@
+diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
+--- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200
+@@ -48,7 +48,6 @@
+ #include <linux/slab.h>
+ #include <linux/module.h>
+ #include <linux/kmod.h>
+-#include <linux/smp_lock.h>
+ #include <linux/completion.h>
+ #include <linux/uaccess.h>
+ #include <linux/usb.h>
+diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
+--- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200
+@@ -555,8 +555,8 @@
+ kfree(ir);
+ return -EINVAL;
+ }
+- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
+- adap->id, addr, ir->c.name);
++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
++ addr, ir->c.name);
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+ /* register device */
+diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200
+@@ -361,14 +361,14 @@
+ size = count << 3;
+
+ ldata = (unsigned long *) data_buf;
+- next_one = generic_find_next_le_bit(ldata, size, 0);
++ next_one = find_next_zero_bit_le(ldata, size, 0);
+
+ if (next_one > 0)
+ put_pulse_bit(next_one
+ * WPC8769L_USECS_PER_BIT);
+
+ while (next_one < size) {
+- next_zero = generic_find_next_zero_le_bit(ldata,
++ next_zero = find_next_zero_bit_le(ldata,
+ size, next_one + 1);
+
+ put_space_bit(
+@@ -376,7 +376,7 @@
+ * WPC8769L_USECS_PER_BIT);
+
+ if (next_zero < size) {
+- next_one = generic_find_next_le_bit(ldata,
++ next_one = find_next_bit_le(ldata,
+ size, next_zero + 1);
+
+ put_pulse_bit(
diff --git a/libre/lirc-libre/lirc-utils.install b/libre/lirc-libre/lirc-utils.install
new file mode 100644
index 000000000..293d1ed7c
--- /dev/null
+++ b/libre/lirc-libre/lirc-utils.install
@@ -0,0 +1,7 @@
+post_install() {
+ systemd-tmpfiles --create lirc.conf
+}
+
+post_upgrade() {
+ post_install
+}
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
new file mode 100755
index 000000000..976f5ab8a
--- /dev/null
+++ b/libre/lirc-libre/lirc.install
@@ -0,0 +1,16 @@
+EXTRAMODULES=extramodules-3.6-LIBRE
+
+post_install() {
+ # updating module dependencies
+ echo ">>> Updating module dependencies. Please wait ..."
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
+}
+
+post_upgrade() {
+ post_install
+}
+
+# arg 1: the old package version
+post_remove() {
+ post_install
+}
diff --git a/libre/lirc-libre/lirc.logrotate b/libre/lirc-libre/lirc.logrotate
new file mode 100755
index 000000000..623c4f328
--- /dev/null
+++ b/libre/lirc-libre/lirc.logrotate
@@ -0,0 +1,5 @@
+/var/log/lircd {
+ missingok
+ notifempty
+ delaycompress
+}
diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service
new file mode 100644
index 000000000..953601fd3
--- /dev/null
+++ b/libre/lirc-libre/lirc.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Linux Infrared Remote Control
+
+[Service]
+ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
+ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid
+Type=forking
+PIDFile=/run/lirc/lircd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/lirc-libre/lirc.tmpfiles b/libre/lirc-libre/lirc.tmpfiles
new file mode 100644
index 000000000..0b80e2e47
--- /dev/null
+++ b/libre/lirc-libre/lirc.tmpfiles
@@ -0,0 +1 @@
+d /run/lirc 0755 root root -
diff --git a/libre/lirc-libre/lirc_atiusb-kfifo.patch b/libre/lirc-libre/lirc_atiusb-kfifo.patch
new file mode 100755
index 000000000..a64984dce
--- /dev/null
+++ b/libre/lirc-libre/lirc_atiusb-kfifo.patch
@@ -0,0 +1,31 @@
+From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
+From: Jason Martin <publicmsu@gmail.com>
+Date: Fri, 3 Jun 2011 00:12:51 -0400
+Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo
+
+I came across posts with regards to lirc_atiusb and its compatibility
+with newer kernels, and their use of kfifo.I spent a little bit of time
+this evening, and was able to correct the issues with the driver, and
+now have a functioning lirc_atiusb device under the 2.6.38 kernel.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_atiusb/lirc_atiusb.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
+index 52080de..bf2b631 100644
+--- a/drivers/lirc_atiusb/lirc_atiusb.c
++++ b/drivers/lirc_atiusb/lirc_atiusb.c
+@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
+ goto new_irctl_failure_check;
+ }
+
+- if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
+ mem_failure = 4;
+ goto new_irctl_failure_check;
+ }
+--
+1.7.0.1
+
diff --git a/libre/lirc-libre/lirc_wpc8769l.patch b/libre/lirc-libre/lirc_wpc8769l.patch
new file mode 100755
index 000000000..e4e2a049b
--- /dev/null
+++ b/libre/lirc-libre/lirc_wpc8769l.patch
@@ -0,0 +1,88 @@
+From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com>
+Date: Wed, 30 Mar 2011 16:46:35 -0400
+Subject: [PATCH] Make lirc_wpc8769l functional again
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++-----------
+ 1 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+index f820d11..4d04063 100644
+--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
+ /* Reset last timeout value. */
+ lastus = 0;
+
+- /* Init the read buffer. */
+- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
+- return -ENOMEM;
+-
+ /* Acquire the IRQ. */
+ result = request_irq(irq, irq_handler,
+ IRQF_DISABLED | IRQF_SHARED,
+@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
+ /* Free the IRQ. */
+ free_irq(irq, THIS_MODULE);
+ dprintk("Freed IRQ %d\n", irq);
+-
+- /* Free the RX buffer. */
+- lirc_buffer_free(&rbuf);
+ }
+
+ static struct lirc_driver driver = {
+@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
+ /* Do load-time checks. */
+ wpc8769l_power_up_and_check_if_we_woke_us_up();
+
++ /* Init the read buffer. */
++ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
++ rc = -ENOMEM;
++ goto exit_platform_exit;
++ }
++
+ /* Configure the driver hooks. */
+ driver.features = LIRC_CAN_REC_MODE2;
++ driver.dev = &lirc_wpc8769l_platform_dev->dev;
+ driver.minor = lirc_register_driver(&driver);
+ if (driver.minor < 0) {
+ eprintk("lirc_register_driver failed!\n");
+ rc = -EIO;
+- goto exit_platform_exit;
++ goto exit_release_buffer;
+ }
+
+ iprintk("Driver loaded.\n");
+
+ return 0; /* Everything OK. */
+
++exit_release_buffer:
++ lirc_buffer_free(&rbuf);
++
+ exit_platform_exit:
+ lirc_wpc8769l_platform_exit();
+
+@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
+
+ static void __exit lirc_wpc8769l_module_exit(void)
+ {
+- /* Unregister the platform driver and device. */
+- lirc_wpc8769l_platform_exit();
+-
+ /* Unregister the LIRC driver. */
+ lirc_unregister_driver(driver.minor);
+
++ /* Free the buffer. */
++ lirc_buffer_free(&rbuf);
++
++ /* Unregister the platform driver and device. */
++ lirc_wpc8769l_platform_exit();
++
+ /* Release the second range. */
+ if (baseport2)
+ release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
+--
+1.7.0.1
+
diff --git a/libre/lirc-libre/lircd b/libre/lirc-libre/lircd
new file mode 100755
index 000000000..e9739b36e
--- /dev/null
+++ b/libre/lirc-libre/lircd
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/lircd.conf
+
+PID=$(pidof -o %PPID /usr/sbin/lircd)
+LIRCD_SYMLINKFILE=/dev/lircd
+LIRCD_SOCKET=/var/run/lirc/lircd
+case "$1" in
+ start)
+ stat_busy "Starting LIRC Daemon"
+ [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
+ rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
+ if [ $? -ne 0 ]; then
+ stat_fail
+ exit 0
+ fi
+ [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
+ [ -z "$PID" ] &&
+ if [ -n "$LIRC_DEVICE" ] ; then
+ eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+ else
+ /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+ fi
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon lircd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping LIRC Daemon"
+ rm -f $LIRCD_SYMLINKFILE
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon lircd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 start|stop|restart"
+esac
+exit 0
diff --git a/libre/lirc-libre/lircd-handle-large-config.patch b/libre/lirc-libre/lircd-handle-large-config.patch
new file mode 100755
index 000000000..85bc20518
--- /dev/null
+++ b/libre/lirc-libre/lircd-handle-large-config.patch
@@ -0,0 +1,39 @@
+From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Wed, 6 Apr 2011 11:04:12 -0400
+Subject: [PATCH] lircd: handle larger config files in write_socket better
+
+Pointed out by Michael Zanetti on list, irsend LIST has issues with long
+config files, which didn't exist in maintainer mode, as we were using a
+do while loop to make sure we spit out everything. Just use that loop
+all the time.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ daemons/lircd.c | 8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index 6c21a3a..ddcca05 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
+ int done, todo = len;
+
+ while (todo) {
+-#ifdef SIM_REC
+ do {
+ done = write(fd, buf, todo);
+- }
+- while (done < 0 && errno == EAGAIN);
+-#else
+- done = write(fd, buf, todo);
+-#endif
++ } while (done < 0 && errno == EAGAIN);
++
+ if (done <= 0)
+ return (done);
+ buf += done;
+--
+1.7.0.1
+
diff --git a/libre/lirc-libre/lircd.conf b/libre/lirc-libre/lircd.conf
new file mode 100755
index 000000000..760dab065
--- /dev/null
+++ b/libre/lirc-libre/lircd.conf
@@ -0,0 +1,8 @@
+#
+# Parameters for lirc daemon
+#
+
+LIRC_DEVICE="/dev/lirc0"
+LIRC_DRIVER=""
+LIRC_EXTRAOPTS=""
+LIRC_CONFIGFILE=""
diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service
new file mode 100644
index 000000000..6b258e312
--- /dev/null
+++ b/libre/lirc-libre/lircm.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=LIRC Mouse
+After=lirc.service
+Wants=lirc.service
+
+[Service]
+ExecStart=/usr/sbin/lircmd -u
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/lirc-libre/lircmd b/libre/lirc-libre/lircmd
new file mode 100755
index 000000000..220c47c9c
--- /dev/null
+++ b/libre/lirc-libre/lircmd
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/lircmd`
+case "$1" in
+ start)
+ stat_busy "Starting lircmd Daemon"
+ [ -z "$PID" ] && /usr/sbin/lircmd
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon lircmd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping lircmd Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon lircmd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release-libre/PKGBUILD
index 51ec79bea..51ec79bea 100644..100755
--- 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 100644..100755
--- a/libre/lsb-release-libre/lsb-release.install
+++ b/libre/lsb-release-libre/lsb-release.install
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
new file mode 100644
index 000000000..245aba247
--- /dev/null
+++ b/libre/luxblend25/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=luxrender
+pkgname=luxblend25
+srcver=3a928b723b29
+pkgver=1.1.v2.64
+_pkgver=${pkgver::3}
+reqname=blender
+reqver=${pkgver:5}
+pkgrel=2
+pkgdesc='A LuxRender exporter for Blender-libre'
+arch=(
+ any
+)
+url="http://www.$pkgbase.net/"
+license=(
+ GPL
+)
+depends=(
+ $pkgbase=$_pkgver
+ "$reqname>=$reqver"
+)
+provides=(
+ $pkgname=$_pkgver
+)
+conflicts=(
+ $pkgname
+ #"$reqname>=${reqver::2}$((${reqver:2}+1))"
+)
+replaces=(
+ $pkgname
+)
+source=(
+ "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2"
+)
+sha512sums=(
+ f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017
+)
+
+package() {
+ a=$pkgname-$srcver/src/$pkgbase
+ b=usr/share/$reqname/$reqver/scripts/addons
+ install -d -m755 $pkgdir/$b
+ cp -a $srcdir/$a $pkgdir/$b
+}
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
deleted file mode 100644
index 564ca267d..000000000
--- a/libre/luxrays-libre/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
-_pkgname=luxrays
-pkgname=luxrays-libre
-pkgver=1.0rc1
-_pkgver=396d39b06aa6
-pkgrel=1
-epoch=0
-pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('freeimage' 'freeglut' 'glew')
-makedepends=('cmake' 'boost')
-replaces=('luxrays')
-conflicts=('luxrays')
-provides=("luxrays=$pkgver")
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('a96ac693ec2900d8d1b209f88edd7e94')
-
-build() {
- cd "$srcdir/luxrender-$_pkgname-$_pkgver"
-
- export CXXFLAGS="$CXXFLAGS -lpthread"
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_SKIP_RPATH=ON \
- -DLUXRAYS_DISABLE_OPENCL=ON \
- .
- make
-}
-
-package() {
- cd "$srcdir/luxrender-$_pkgname-$_pkgver"
-
- install -d -m755 "$pkgdir"/usr/{bin,include,lib}
- install -m755 bin/* "$pkgdir"/usr/bin
- install -m644 lib/* "$pkgdir"/usr/lib
- cp -a include/luxrays "$pkgdir"/usr/include
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
deleted file mode 100644
index f4684ee7f..000000000
--- a/libre/luxrender-libre/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Initial contributor: flixie <69one@gmx.net>
-# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
-pkgname=luxrender-libre
-pkgver=1.0rc1
-_pkgver=08ae99830f8e
-pkgrel=1
-pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenGL)"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr')
-optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
- 'python: Python interface (pylux)')
-makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python')
-replaces=('luxrender')
-conflicts=('luxrender')
-provides=("luxrender=$pkgver")
-source=(https://bitbucket.org/luxrender/lux/get/"$_pkgver".tar.bz2)
-md5sums=('738616b55ac58c98de431b98f90a05fb')
-
-build() {
- cd "$srcdir"/luxrender-lux-$_pkgver
-
- export CXXFLAGS="$CXXFLAGS -lpthread"
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DLUXRAYS_DISABLE_OPENCL=ON \
- -DPYTHON_CUSTOM=ON \
- -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
- -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
- .
- make
-}
-
-package() {
- cd "$srcdir"/luxrender-lux-$_pkgver
- make DESTDIR="$pkgdir" install
-
- # fix library path on x86_64
- [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
-
- #install pylux
- install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD
index a5b733e9f..a5b733e9f 100644..100755
--- a/libre/mariadb/PKGBUILD
+++ b/libre/mariadb/PKGBUILD
diff --git a/libre/mariadb/mariadb.install b/libre/mariadb/mariadb.install
index f56a0dcaa..f56a0dcaa 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/libre/mariadb/mysql.install
+++ b/libre/mariadb/mysql.install
diff --git a/libre/mariadb/mysqld b/libre/mariadb/mysqld
index 1ac88a7cc..1ac88a7cc 100644..100755
--- a/libre/mariadb/mysqld
+++ b/libre/mariadb/mysqld
diff --git a/libre/maven-libre/PKGBUILD b/libre/maven-libre/PKGBUILD
deleted file mode 100644
index 2bd99940e..000000000
--- a/libre/maven-libre/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-_pkgname=maven
-pkgname=maven-libre
-pkgver=3.0.4
-
-provides=("$_pkgname=$pkgver")
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
-
-pkgrel=1
-pkgdesc="A Java project management and project comprehension tool"
-arch=('any')
-url="http://maven.apache.org"
-license=('Apache')
-depends=('java-environment')
-makedepends=('apache-ant')
-backup=('etc/maven/settings.xml')
-
-_mirror=http://archive.apache.org/dist
-source=($_mirror/maven/source/apache-maven-$pkgver-src.tar.gz
- maven.sh maven.csh)
-
-_M2_LOCALREPO="/usr/share/maven/repository"
-
-# FIXME: This also does tasks for package()
-build() {
- cd $srcdir/apache-maven-$pkgver
-
- . /etc/profile.d/jre.sh
- . /etc/profile.d/jdk.sh
-
- export MAVEN_OPTS=-Xmx512m
- export M2_HOME="$pkgdir"/opt/maven
- export PATH="$PATH:$M2_HOME/bin"
-
- # FIXME: Downloads many deps from Internet. They should be
- # packaged separately and added to depends=()
- install -d "$pkgdir`dirname $_M2_LOCALREPO`"
- cp -r $_M2_LOCALREPO "$pkgdir$_M2_LOCALREPO"
- install -d "$pkgdir"/opt
- ant -Dmaven.repo.local="$pkgdir$_M2_LOCALREPO"
- rm "$pkgdir"/opt/maven/*.txt
-}
-
-package() {
- install -d "$pkgdir$_M2_LOCALREPO"
-
- # Install config file in /etc
- # Unlike the other directories, we symlink from the system to /opt/maven
- # because that way all conf files stay in /etc
- install -d "$pkgdir"/etc/maven
- sed "55i<localRepository>$_M2_LOCALREPO</localRepository>" \
- < "$pkgdir"/opt/maven/conf/settings.xml \
- > "$pkgdir"/etc/maven/settings.xml
- rm -rf "$pkgdir"/opt/maven/conf
- ln -s /etc/maven "$pkgdir"/opt/maven/conf
-
- # Install profile.d settings
- install -d "$pkgdir"/etc/profile.d
- install -m 755 "$srcdir"/maven.{csh,sh} "$pkgdir"/etc/profile.d
-
- # Link executables to /usr/bin
- install -d "$pkgdir"/usr/bin
- ln -s /opt/maven/bin/{mvn,mvnDebug,mvnyjp} "$pkgdir"/usr/bin
-
- # Link jar files to appropriate place in /usr/share
- install -d "$pkgdir"/usr/share/java
- ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven
-}
-
-md5sums=('17ca94d5be05a78c6ab12425b7a0ee10'
- '58820067a4d7384477daa134023d9b57'
- 'e2bbdeffed100cd51d05b2ba8ebd6321')
diff --git a/libre/maven-libre/maven.csh b/libre/maven-libre/maven.csh
deleted file mode 100644
index f5750cfc8..000000000
--- a/libre/maven-libre/maven.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-setenv MAVEN_OPTS -Xmx512m
-setenv M2_HOME=/opt/maven
diff --git a/libre/maven-libre/maven.sh b/libre/maven-libre/maven.sh
deleted file mode 100644
index b6655cc22..000000000
--- a/libre/maven-libre/maven.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-export MAVEN_OPTS=-Xmx512m
-export M2_HOME=/opt/maven
diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD
new file mode 100644
index 000000000..3528fba0e
--- /dev/null
+++ b/libre/mc-libre/PKGBUILD
@@ -0,0 +1,69 @@
+# $Id$
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: schuay <jakob.gruber@gmail.com>
+
+_pkgname=mc
+pkgname=mc-libre
+pkgver=4.8.4
+pkgrel=1
+pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
+arch=('i686' 'x86_64')
+url="http://www.ibiblio.org/mc/"
+license=('GPL')
+depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang')
+makedepends=('libxt' 'libx11')
+optdepends=('p7zip: support for 7zip archives'
+ 'mtools: a+ extfs'
+ 'cdparanoia: audio extfs'
+ 'gawk: hp48+ extfs'
+ 'cdrkit: iso9660 extfs'
+ 'perl: needed by several extfs scripts'
+ 'python-boto: s3+ extfs'
+ 'python2-pytz: s3+ extfs'
+ 'p7zip: u7z extfs'
+ 'arj: uarj extfs'
+ 'cabextract: ucab extfs'
+ 'ununrar: urar extfs'
+ 'zip: uzip extfs')
+conflicts=('mc')
+replaces=('mc')
+provides=("mc=${pkgver}")
+options=('!emptydirs' '!makeflags')
+backup=('etc/mc/edit.indent.rc'
+ 'etc/mc/edit.spell.rc'
+ 'etc/mc/filehighlight.ini'
+ 'etc/mc/mcedit.menu'
+ 'etc/mc/mc.ext'
+ 'etc/mc/mc.keymap'
+ 'etc/mc/mc.menu'
+ 'etc/mc/sfs.ini')
+source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2")
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ ./configure \
+ --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
+ --enable-background --enable-charset --enable-largefile \
+ --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \
+ --with-screen=slang --with-subshell --with-vfs --with-x \
+ --without-debug --without-gnome --without-included-gettext \
+ --libexecdir=/usr/lib
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ # Fix FS#15177
+ sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
+ -i "${pkgdir}/usr/lib/mc/extfs.d/uzip"
+
+ sed 's#/usr/bin/env python#/usr/bin/python2#' \
+ -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
+}
+
+md5sums=('a8edb8226cb25869f925ecce043faf1e')
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
new file mode 100644
index 000000000..d30bbb1a3
--- /dev/null
+++ b/libre/mcomix-libre/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: schuay <jakob.gruber@gmail.com>
+# Contributor: Ray Powell <ray_al@xphoniexx.net>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=mcomix
+pkgname=mcomix-libre
+pkgver=0.99
+pkgrel=1
+pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
+arch=('any')
+url="http://sourceforge.net/projects/mcomix/"
+license=('GPL')
+depends=('pygtk' 'python-imaging' 'xdg-utils' 'python2' \
+ 'desktop-file-utils' 'hicolor-icon-theme' 'python2-distribute')
+makedepends=('gettext' 'intltool')
+optdepends=('ununrar: for rar compressed comics')
+conflicts=('mcomix' 'comix')
+replaces=('mcomix' 'comix')
+provides=("mcomix=${pkgver}")
+install='mcomix.install'
+source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2")
+
+build() {
+ cd ${srcdir}/${_pkgname}-${pkgver}
+
+ # python2 fix
+ for file in $(grep -Rl "/usr/bin/env python" .);
+ do
+ sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+ done
+}
+
+package() {
+ cd ${srcdir}/${_pkgname}-${pkgver}
+
+ export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/
+ mkdir -p $PYTHONPATH
+
+ python2 setup.py install --prefix=${pkgdir}/usr --optimize=1 \
+ --single-version-externally-managed --root=/
+
+ install -Dm644 mime/comicbook.schemas \
+ ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas
+}
+
+md5sums=('a1ff7e1955042069d5005b4034e7a914')
diff --git a/libre/mcomix-libre/mcomix.install b/libre/mcomix-libre/mcomix.install
new file mode 100644
index 000000000..2d3c6c3e3
--- /dev/null
+++ b/libre/mcomix-libre/mcomix.install
@@ -0,0 +1,32 @@
+pkgname=mcomix
+
+post_install() {
+ if [ -f usr/bin/xdg-icon-resource ]; then
+ xdg-icon-resource forceupdate
+ fi
+ if [ -f usr/sbin/gconfpkg ]; then
+ usr/sbin/gconfpkg --install ${pkgname}
+ fi
+ update-desktop-database -q
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ if [ -f usr/sbin/gconfpkg ]; then
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+ fi
+}
+
+post_remove() {
+ if [ -f usr/bin/xdg-icon-resource ]; then
+ xdg-icon-resource forceupdate
+ fi
+ update-desktop-database -q
+}
diff --git a/libre/mesa-demos-libre/LICENSE b/libre/mesa-demos-libre/LICENSE
index ae33d2709..ae33d2709 100644..100755
--- 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 100644..100755
--- a/libre/mesa-demos-libre/PKGBUILD
+++ b/libre/mesa-demos-libre/PKGBUILD
diff --git a/libre/metalog/PKGBUILD b/libre/metalog/PKGBUILD
index 41a570b7c..41a570b7c 100644..100755
--- a/libre/metalog/PKGBUILD
+++ b/libre/metalog/PKGBUILD
diff --git a/libre/metalog/metalog b/libre/metalog/metalog
index d30f47289..d30f47289 100644..100755
--- a/libre/metalog/metalog
+++ b/libre/metalog/metalog
diff --git a/libre/metalog/metalog.confd b/libre/metalog/metalog.confd
index 3d76ffab3..3d76ffab3 100644..100755
--- a/libre/metalog/metalog.confd
+++ b/libre/metalog/metalog.confd
diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD
index faa4b3a2a..ef7ea7641 100644..100755
--- a/libre/mozilla-devscripts/PKGBUILD
+++ b/libre/mozilla-devscripts/PKGBUILD
@@ -1,8 +1,9 @@
# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: Márcio Silva <coadde@lavabit.com>
pkgname=mozilla-devscripts
-pkgver=0.30
-pkgrel=1.1
+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"
@@ -11,8 +12,8 @@ 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=("6e517cef69c115356eb808866fd29268"
- "4e95fb93d0d93b56543d2a789d457309")
+md5sums=("386a5854601f29dca4a293f90f6c2a69"
+ "230126afa15fa654eb254bb4e61b4a93")
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index c86c9514a..288ce698d 100644..100755
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -3,24 +3,26 @@
# Contributor: Figue <ffigue at gmail>
# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): vando <facundo@esdebian.org>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
# Thank you very much to the older contributors:
# Contributor: evr <evanroman at gmail>
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
pkgname=mozilla-searchplugins
-pkgver=1.0
-pkgrel=1
+pkgver=1.2
+pkgrel=3
pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
arch=('any')
license=('MPL' 'GPL' 'LGPL')
url="https://parabolagnulinux.org/"
source=(
duck-duck-go-lite.xml
- duck-duck-go-ssl.xml
internet-archive.xml
jamendo-en.xml
logless-search.xml
- scroogle-ssl-english.xml
+ parabola-packages.xml
+ parabola-wiki-en.xml
+ seeks-search.xml
wikipedia.xml
yacy.xml
)
@@ -31,10 +33,11 @@ package() {
}
md5sums=('e1bda0854de7d764f7401c81bb82b5ef'
- 'c5f00b6b24222aacd5a749d1f59c4d24'
'462c68585461f8cdc23c93c46f6ee4cf'
'2d492295c4308f9bba9ece28d8b3af2d'
'937ac0e5392b060d93bd33e761fbfa51'
- 'cf97082e77e3ef5f1bd74b1db9329965'
+ '3c4a7f901bfe9000a702c68f7f78428c'
+ '5bf9ca2558026fa3f4ec52d8e64fee47'
+ '86ccb1d02683e69e6bc0543cb77a06bc'
'c35f4971feff8387e0570d7a165eb6fa'
'24528ca3f7f1e1a0ba735231aa3ac1de')
diff --git a/libre/mozilla-searchplugins/duck-duck-go-lite.xml b/libre/mozilla-searchplugins/duck-duck-go-lite.xml
index 3142d3410..3142d3410 100644..100755
--- a/libre/mozilla-searchplugins/duck-duck-go-lite.xml
+++ b/libre/mozilla-searchplugins/duck-duck-go-lite.xml
diff --git a/libre/mozilla-searchplugins/duck-duck-go-ssl.xml b/libre/mozilla-searchplugins/duck-duck-go-ssl.xml
deleted file mode 100644
index 4fb1391ab..000000000
--- a/libre/mozilla-searchplugins/duck-duck-go-ssl.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Duck Duck Go (SSL)</os:ShortName>
-<os:Description>Search Duck Duck Go (SSL)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin> \ No newline at end of file
diff --git a/libre/mozilla-searchplugins/internet-archive.xml b/libre/mozilla-searchplugins/internet-archive.xml
index 1556a2d8c..1556a2d8c 100644..100755
--- a/libre/mozilla-searchplugins/internet-archive.xml
+++ b/libre/mozilla-searchplugins/internet-archive.xml
diff --git a/libre/mozilla-searchplugins/jamendo-en.xml b/libre/mozilla-searchplugins/jamendo-en.xml
index 91d6df6e4..91d6df6e4 100644..100755
--- a/libre/mozilla-searchplugins/jamendo-en.xml
+++ b/libre/mozilla-searchplugins/jamendo-en.xml
diff --git a/libre/mozilla-searchplugins/logless-search.xml b/libre/mozilla-searchplugins/logless-search.xml
index 1538d1ef0..1538d1ef0 100644..100755
--- a/libre/mozilla-searchplugins/logless-search.xml
+++ b/libre/mozilla-searchplugins/logless-search.xml
diff --git a/libre/mozilla-searchplugins/parabola-packages.xml b/libre/mozilla-searchplugins/parabola-packages.xml
new file mode 100755
index 000000000..8f20628dc
--- /dev/null
+++ b/libre/mozilla-searchplugins/parabola-packages.xml
@@ -0,0 +1,9 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Parabola Packages</os:ShortName>
+<os:Description>Search the Parabola package repositories.</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA==</os:Image>
+<os:Url type="text/html" method="GET" template="http://parabolagnulinux.org/packages/?q={searchTerms}">
+</os:Url><os:Url type="application/opensearchdescription+xml" method="GET" template="http://parabolagnulinux.org/opensearch/packages/" rel="self">
+</os:Url>
+</SearchPlugin> \ No newline at end of file
diff --git a/libre/mozilla-searchplugins/parabola-wiki-en.xml b/libre/mozilla-searchplugins/parabola-wiki-en.xml
new file mode 100755
index 000000000..d218b21f8
--- /dev/null
+++ b/libre/mozilla-searchplugins/parabola-wiki-en.xml
@@ -0,0 +1,11 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Parabola GNU/Linux-Libre Wiki (en)</os:ShortName>
+<os:Description>Parabola GNU/Linux-Libre Wiki (en)</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///
+8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA==</os:Image>
+<SearchForm>https://wiki.parabolagnulinux.org/Special:Search</SearchForm>
+<os:Url type="text/html" method="GET" template="https://wiki.parabolagnulinux.org/index.php?title=Special:Search&amp;search={searchTerms}">
+</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://wiki.parabolagnulinux.org/api.php?action=opensearch&amp;search={searchTerms}&amp;namespace=0">
+</os:Url>
+</SearchPlugin> \ No newline at end of file
diff --git a/libre/mozilla-searchplugins/scroogle-ssl-english.xml b/libre/mozilla-searchplugins/scroogle-ssl-english.xml
deleted file mode 100644
index f817dce40..000000000
--- a/libre/mozilla-searchplugins/scroogle-ssl-english.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Scroogle SSL English</os:ShortName>
-<os:Description>Scroogle SSL English</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAACZmZmZAAAAmZmZmZmZAAmZqqqqqpmQCZmQAAAAqZCZqQAAAAAKmZmgAAAAAAqZmaAACaoACpmZoACZAAAKmZmgAKkAAAqZmaAACpmaqpmZoAAAAAAKmZmqAAAAAAqZCZqgAAAJmZAJmaqqqqqZkACZmZmZmZkAAACZmZmZAADwDzgFwAPgA4ABAHyAAQAAAAAAAAAAAAAAAAAAAAAAAAAA4AMAAOADAAAAfAAAAHyAAeADgAHgA8ADAADwDwAA</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.xml</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.ico</IconUpdateUrl>
-<SearchForm>https://ssl.scroogle.org/scrapen8.html</SearchForm>
-<os:Url type="text/html" method="GET" template="https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi">
- <os:Param name="Gw" value="{searchTerms}"/>
- <os:Param name="l" value="en"/>
-</os:Url>
-</SearchPlugin> \ No newline at end of file
diff --git a/libre/mozilla-searchplugins/seeks-search.xml b/libre/mozilla-searchplugins/seeks-search.xml
new file mode 100755
index 000000000..5025f5a06
--- /dev/null
+++ b/libre/mozilla-searchplugins/seeks-search.xml
@@ -0,0 +1,8 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Seeks Search</os:ShortName>
+<os:Description>Real-time p2p pattern matching network for social websearch.</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAwwAAAMMBnc7+MwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAJCSURBVDiNpZJLSFRxGMV/f2fGGWcc8zI6U5qSmmVPyIW0kURoES1CMgODwgh72yZoU1EQRItMooLQLAiLBAsiaVGRBKFID0oqMpqy0UIdnWke1zuPe/8tNHtAwdTZfHyc75zDB0dUtiiXgAZAkBokcFlUtigyReEvSPsf8T8ZSAkYP3bz3w6TGiQ00OMgDTCM6QmQZgKr4zcDaUA8CnEN9NhM2h9g6KDrPxloIYiFp1NSgdnQIToBpTkrqaneQp5SyIexd1x/3MrngA+AEs9ialdvo8BVxJDfS2dvO0Pj76cdyg8r8lBHo0zqCflVDci+wR6pxqIyooXl1nPr5P72ehlLaDKkBmXvYI+MaGGpxafkrtZaWX5UkaLqRLG8c/AFL4eesLutDt1IkpFu51rTPWyWDBw2J97Rt+y4WENST2C12Liyp5u52fmsb16BeWneKhzWTFzOXNp23pr9zWJKZ75rAQBz7AqtjTdnOXu6gxynm1LPcsxqTKWr7yoIgfjeZgE2SwZqLIoQgshUmOHJTzOUYCTgY8D3jGQiifmptw+HSaGitJK2B2eYCI8zTyngZP0Fnnv7sVszmYqrNN8+xkR4nHxXIdurD/BwoJs3wwOYpQ6ByCQl7jKObDxNSA3icrpRY1HO3z1FliObhqp9HK87iz88hiszF7PJgj/kx9BBLGlSpJGEIs9C1ixbS5FnEaPBEbp6OxgNfgGgMLeYDRWbyclyMzjyikev7+Pzf8RkAVG2V+mUkk2p1QeQINK48Q3fpPIi5xKaPwAAAABJRU5ErkJggg==</os:Image>
+<os:Url type="text/html" method="GET" template="http://www.seeks-project.info/search.php/search/txt/{searchTerms}">
+</os:Url>
+</SearchPlugin> \ No newline at end of file
diff --git a/libre/mozilla-searchplugins/wikipedia.xml b/libre/mozilla-searchplugins/wikipedia.xml
index 36b8ed494..36b8ed494 100644..100755
--- a/libre/mozilla-searchplugins/wikipedia.xml
+++ b/libre/mozilla-searchplugins/wikipedia.xml
diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml
index 61201ad20..61201ad20 100644..100755
--- a/libre/mozilla-searchplugins/yacy.xml
+++ b/libre/mozilla-searchplugins/yacy.xml
diff --git a/libre/mplayer-libre/.directory b/libre/mplayer-libre/.directory
index 724f09760..724f09760 100644..100755
--- a/libre/mplayer-libre/.directory
+++ b/libre/mplayer-libre/.directory
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index cf2be2b5f..3e9d0a44d 100644..100755
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,33 +1,27 @@
-# $Id: PKGBUILD 152227 2012-03-05 09:38:48Z ibiru $
+# $Id: PKGBUILD 163126 2012-07-07 16:29:25Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-
-# libvdpau is currently useful only with proprietary software
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=34799
-pkgrel=2
+pkgver=35014
+pkgrel=1
arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio')
+'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion')
license=('GPL')
url="http://www.mplayerhq.hu/"
options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop
- live-media.patch)
-md5sums=('e8bd960bcdb48fdc5a1f45390dc13c53'
- 'c0d6ef795cf6de48e3b87ff7c23f0319'
- 'b6c057633ff7001ee0c102b5f81ec1e3')
+source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop)
+md5sums=('d0785560e5e8eb02e089728ef4412eae'
+ 'c0d6ef795cf6de48e3b87ff7c23f0319')
build() {
cd "$srcdir/$_pkgbase"
- patch -Np0 -i "$srcdir/live-media.patch"
-
./configure --prefix=/usr \
--enable-runtime-cpudetection \
--disable-gui \
@@ -52,11 +46,11 @@ build() {
}
package_mplayer-libre() {
- pkgdesc="A movie player for GNU/Linux (no unfree faac support)"
+ pkgdesc="A movie player for GNU/Linux (without unfree faac support)"
install=mplayer.install
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl'
- 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+ 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio')
provides=("mplayer=$pkgver")
replaces=('mplayer')
@@ -76,7 +70,7 @@ package_mplayer-libre() {
package_mencoder-libre() {
pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
- depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
+ depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio')
provides=("mencoder=$pkgver")
replaces=('mencoder')
diff --git a/libre/mplayer-libre/live-media.patch b/libre/mplayer-libre/live-media.patch
deleted file mode 100644
index b704b5381..000000000
--- a/libre/mplayer-libre/live-media.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libmpdemux/demux_rtp.cpp
-===================================================================
---- libmpdemux/demux_rtp.cpp (revision 34798)
-+++ libmpdemux/demux_rtp.cpp (working copy)
-@@ -19,6 +19,8 @@
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-+#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
-+
- extern "C" {
- // on MinGW, we must include windows.h before the things it conflicts
- #ifdef __MINGW32__ // with. they are each protected from
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
index 07acea13f..07acea13f 100644..100755
--- 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 100644..100755
--- 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
index 799769335..799769335 100644..100755
--- a/libre/mplayer-libre/mplayer.png
+++ b/libre/mplayer-libre/mplayer.png
Binary files differ
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 3ef5c65ee..41f84e022 100644..100755
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,47 +1,42 @@
# $Id$
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
+# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-_pkgname=mplayer-vaapi
pkgname=mplayer-vaapi-libre
-pkgver=34578
-pkgrel=5.1
-pkgdesc="A movie player, compiled with vaapi support"
+pkgver=35014
+pkgrel=1
+pkgdesc="A movie player, compiled with vaapi (without unfree faac support)"
arch=('i686' 'x86_64')
url="http://gitorious.org/vaapi/mplayer"
license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl-libre'
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl'
'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa'
'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2'
'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
- 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'faad2'
- 'libva' 'libass' 'desktop-file-utils')
+ 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
+ 'libbluray' 'libva' 'libass' 'desktop-file-utils')
makedepends=('unzip-libre' 'live-media' 'yasm' 'ladspa' 'git')
-provides=("$_pkgname=$pkgver" "mplayer=$pkgver")
-conflicts=('mplayer' "$_pkgname")
+provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver")
+conflicts=('mplayer' 'mplayer-vaapi')
replaces=('mplayer-vaapi')
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
- tweak-desktop-file.patch
- mplayer.png
- live-media.patch)
+ tweak-desktop-file.patch)
options=('!buildflags' '!emptydirs')
install=mplayer-vaapi.install
-sha256sums=('cc35a057c8a64d2cdec2dc0a037811ef0f91dd03cd3d07465c7272a08665a37d'
- '5b39f0a61969bf330c4434cb17975101be93c27334f65e154e4a93033033e795'
- '061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48'
- '9c1400f27dd2ea54c125c66ed1af0eab19761b1b2ae808fa491cd3732fd8a685')
+sha256sums=('db19a938e7de46aad567b6d7d8866ec6cb3919a29d60236609a83ebf4e1bb5f0'
+ '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b')
build() {
cd "$srcdir/mplayer-vaapi-$pkgver"
patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
- patch -Np0 -i "$srcdir/live-media.patch"
- ./configure --prefix=/usr \
+ ./configure \
+ --prefix=/usr \
--enable-runtime-cpudetection \
--disable-gui \
--disable-arts \
@@ -56,6 +51,8 @@ build() {
--disable-ass-internal \
--disable-faac \
--enable-xvmc \
+ --enable-radio \
+ --enable-radio-capture \
--disable-vdpau \
--enable-vaapi \
--language=all \
@@ -69,13 +66,13 @@ build() {
package() {
cd "$srcdir/mplayer-vaapi-$pkgver"
- make -j1 DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+ make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop"
install -d "$pkgdir/usr/share/mplayer/"
ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
rm -rf "$pkgdir/usr/share/mplayer/font"
- install -Dm644 "$srcdir/mplayer.png" "$pkgdir/usr/share/pixmaps/mplayer.png"
+ install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/mplayer-vaapi-libre/gcc-4.6-mp3lib-sse-code-miscompilation.patch b/libre/mplayer-vaapi-libre/gcc-4.6-mp3lib-sse-code-miscompilation.patch
deleted file mode 100644
index 58daa09e7..000000000
--- a/libre/mplayer-vaapi-libre/gcc-4.6-mp3lib-sse-code-miscompilation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: mp3lib/dct64_sse.c
-===================================================================
---- mp3lib/dct64_sse.c (revision 33468)
-+++ mp3lib/dct64_sse.c (revision 33469)
-@@ -112,7 +112,6 @@
- }
-
- {
-- real *costab = costab_mmx + 24;
- int i;
-
- __asm__(
-@@ -121,7 +120,7 @@
- "movaps %1, %%xmm5\n\t"
- "movaps %%xmm5, %%xmm6\n\t"
- :
-- :"m"(*costab), "m"(*nnnn)
-+ :"m"(costab_mmx[24]), "m"(*nnnn)
- );
-
- for (i = 0; i < 0x20; i += 8)
diff --git a/libre/mplayer-vaapi-libre/live-media.patch b/libre/mplayer-vaapi-libre/live-media.patch
deleted file mode 100644
index 73a6451f5..000000000
--- a/libre/mplayer-vaapi-libre/live-media.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libmpdemux/demux_rtp.cpp
-===================================================================
---- libmpdemux/demux_rtp.cpp (revision 34798)
-+++ libmpdemux/demux_rtp.cpp (working copy)
-@@ -19,6 +19,8 @@
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-+#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
-+
- extern "C" {
- // on MinGW, we must include windows.h before the things it conflicts
- #ifdef __MINGW32__ // with. they are each protected from
diff --git a/libre/mplayer-vaapi-libre/mplayer-vaapi.install b/libre/mplayer-vaapi-libre/mplayer-vaapi.install
index af56cdbf4..a44f19aef 100644..100755
--- a/libre/mplayer-vaapi-libre/mplayer-vaapi.install
+++ b/libre/mplayer-vaapi-libre/mplayer-vaapi.install
@@ -1,9 +1,11 @@
post_install() {
- update-desktop-database -q
+ update-desktop-database -q
}
post_upgrade() {
- post_install
+ post_install
}
post_remove() {
- post_install
+ post_install
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/mplayer-vaapi-libre/mplayer.desktop b/libre/mplayer-vaapi-libre/mplayer.desktop
deleted file mode 100644
index e3229d042..000000000
--- a/libre/mplayer-vaapi-libre/mplayer.desktop
+++ /dev/null
@@ -1,21 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MPlayer Media Player
-Name[ca]=Reproductor multimèdia MPlayer
-Name[pl]=MPlayer odtwarzacz multimedialny
-GenericName=Multimedia player
-Comment=Play movies and songs
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lecteur multimédia
-Comment[it]=Lettore multimediale
-Comment[zh]=多媒体播放器
-Comment[pl]=Odtwarzaj filmy i muzykę
-Icon=mplayer
-TryExec=mplayer
-Exec=mplayer -really-quiet %F
-Terminal=false
-NoDisplay=true
-Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
diff --git a/libre/mplayer-vaapi-libre/mplayer.png b/libre/mplayer-vaapi-libre/mplayer.png
deleted file mode 100644
index 799769335..000000000
--- a/libre/mplayer-vaapi-libre/mplayer.png
+++ /dev/null
Binary files differ
diff --git a/libre/mplayer-vaapi-libre/patch-fixes.patch b/libre/mplayer-vaapi-libre/patch-fixes.patch
deleted file mode 100644
index 5da97d1d9..000000000
--- a/libre/mplayer-vaapi-libre/patch-fixes.patch
+++ /dev/null
@@ -1,491 +0,0 @@
-diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vaapi-0.29.patch mplayer-vaapi-20110127/patches/mplayer-vaapi-0.29.patch
---- mplayer-vaapi-20110127.orig/patches/mplayer-vaapi-0.29.patch 2011-01-27 17:15:16.000000000 +0200
-+++ mplayer-vaapi-20110127/patches/mplayer-vaapi-0.29.patch 2011-03-30 21:22:32.000000000 +0300
-@@ -434,7 +434,7 @@ diff --git a/ffmpeg/libavcodec/vaapi_vc1
- index 34e9056..b29e50e 100644
- --- a/ffmpeg/libavcodec/vaapi_vc1.c
- +++ b/ffmpeg/libavcodec/vaapi_vc1.c
--@@ -146,101 +146,103 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
-+@@ -146,103 +146,103 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
- pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferVC1));
- if (!pic_param)
- return -1;
-@@ -452,7 +452,9 @@ index 34e9056..b29e50e 100644
- - pic_param->sequence_fields.bits.syncmarker = s->resync_marker;
- - pic_param->sequence_fields.bits.rangered = v->rangered;
- - pic_param->sequence_fields.bits.max_b_frames = s->avctx->max_b_frames;
-+-#if VA_CHECK_VERSION(0,32,0)
- - pic_param->sequence_fields.bits.profile = v->profile;
-+-#endif
- - pic_param->coded_width = s->avctx->coded_width;
- - pic_param->coded_height = s->avctx->coded_height;
- - pic_param->entrypoint_fields.value = 0; /* reset all bits */
-diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vaapi.patch mplayer-vaapi-20110127/patches/mplayer-vaapi.patch
---- mplayer-vaapi-20110127.orig/patches/mplayer-vaapi.patch 2011-01-27 17:15:29.000000000 +0200
-+++ mplayer-vaapi-20110127/patches/mplayer-vaapi.patch 2011-03-30 21:09:14.000000000 +0300
-@@ -207,15 +207,6 @@ index 1e0f7fc..45e4574 100755
- echocheck "Xv"
- if test "$_xv" = auto ; then
- _xv=no
--@@ -4372,7 +4435,7 @@ if test "$_vdpau" = yes ; then
-- else
-- def_vdpau='#define CONFIG_VDPAU 0'
-- novomodules="vdpau $novomodules"
--- libavdecoders=$(echo $libavdecoders | sed -e s/MPEG_VDPAU_DECODER// -e s/MPEG1_VDPAU_DECODER// -e s/H264_VDPAU_DECODER// -e s/WMV3_VDPAU_DECODER// -e s/VC1_VDPAU_DECODER// -e s/MPEG4_VDPAU_DECODER//)
--+ libavdecoders=$(echo $libavdecoders | sed -e "s/\(MPEG\|MPEG[124]\|H26[34]\|WMV3\|VC1\)_VDPAU_DECODER//g")
-- fi
-- echores "$_vdpau"
--
- @@ -4791,6 +4854,31 @@ echores "$_corevideo"
- fi #if darwin
-
-@@ -433,30 +424,19 @@ index d353bb5..e39a926 100644
- out YV12,I420,IYUV
-
- videocodec ffzygo
--diff --git a/ffmpeg/libavcodec/vaapi_vc1.c b/ffmpeg/libavcodec/vaapi_vc1.c
--index 2c24042..34e9056 100644
----- a/ffmpeg/libavcodec/vaapi_vc1.c
--+++ b/ffmpeg/libavcodec/vaapi_vc1.c
--@@ -160,6 +160,7 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
-- pic_param->sequence_fields.bits.syncmarker = s->resync_marker;
-- pic_param->sequence_fields.bits.rangered = v->rangered;
-- pic_param->sequence_fields.bits.max_b_frames = s->avctx->max_b_frames;
--+ pic_param->sequence_fields.bits.profile = v->profile;
-- pic_param->coded_width = s->avctx->coded_width;
-- pic_param->coded_height = s->avctx->coded_height;
-- pic_param->entrypoint_fields.value = 0; /* reset all bits */
- diff --git a/fmt-conversion.c b/fmt-conversion.c
- index 9e88100..bd32ce8 100644
- --- a/fmt-conversion.c
- +++ b/fmt-conversion.c
--@@ -18,12 +18,14 @@
-+@@ -18,6 +18,7 @@
-
- #include "mp_msg.h"
- #include "libavutil/avutil.h"
- +#include "libavcodec/avcodec.h"
- #include "libmpcodecs/img_format.h"
-- #include "fmt-conversion.h"
--
-+ #include "libavutil/samplefmt.h"
-+ #include "libaf/af_format.h"
-+@@ -26,6 +27,7 @@
- static const struct {
- int fmt;
- enum PixelFormat pix_fmt;
-@@ -503,14 +483,15 @@ diff --git a/fmt-conversion.h b/fmt-conv
- index 9e133a8..962ca4e 100644
- --- a/fmt-conversion.h
- +++ b/fmt-conversion.h
--@@ -23,6 +23,6 @@
-- #include "libavutil/avutil.h"
-+@@ -24,7 +24,7 @@
-+ #include "libavutil/samplefmt.h"
-
- enum PixelFormat imgfmt2pixfmt(int fmt);
- -int pixfmt2imgfmt(enum PixelFormat pix_fmt);
- +int pixfmt2imgfmt(enum PixelFormat pix_fmt, int codec_id);
-+ enum AVSampleFormat affmt2samplefmt(int fmt);
-+ int samplefmt2affmt(enum AVSampleFormat sample_fmt);
-
-- #endif /* MPLAYER_FMT_CONVERSION_H */
- diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
- index 4f7ffb2..0da5434 100644
- --- a/gui/mplayer/gtk/opts.c
-@@ -808,7 +789,7 @@ index 7c68a20..609ac41 100644
- sh_video_t *sh = avctx->opaque;
- vd_ffmpeg_ctx *ctx = sh->context;
- @@ -295,6 +296,12 @@ static int init(sh_video_t *sh){
-- avctx->codec_type = CODEC_TYPE_VIDEO;
-+ avctx->codec_type = AVMEDIA_TYPE_VIDEO;
- avctx->codec_id = lavc_codec->id;
-
- +#if CONFIG_VAAPI
-@@ -817,9 +798,9 @@ index 7c68a20..609ac41 100644
- + avctx->get_format = get_format;
- + }
- +#endif /* CONFIG_VAAPI */
-- #if CONFIG_VDPAU
-- if(lavc_codec->capabilities & CODEC_CAP_HWACCEL_VDPAU){
-- avctx->get_format = get_format;
-+ avctx->get_format = get_format;
-+ if(ctx->do_dr1){
-+ avctx->flags|= CODEC_FLAG_EMU_EDGE;
- @@ -487,7 +494,7 @@ static void draw_slice(struct AVCodecContext *s,
- const AVFrame *src, int offset[4],
- int y, int type, int height){
-@@ -841,12 +822,10 @@ index 7c68a20..609ac41 100644
- ctx->vo_initialized = 1;
- }
- return 0;
--@@ -972,24 +980,62 @@ static mp_image_t *decode(sh_video_t *sh, void *data, int len, int flags){
-+@@ -974,22 +974,60 @@ static mp_image_t *decode(sh_video_t *sh
- return mpi;
- }
-
---#if CONFIG_XVMC || CONFIG_VDPAU
--+#if CONFIG_XVMC || CONFIG_VAAPI || CONFIG_VDPAU
- +static inline int is_hwaccel_format(int imgfmt)
- +{
- + switch (get_video_hwaccel()) {
-@@ -883,15 +862,14 @@ index 7c68a20..609ac41 100644
- int imgfmt;
- sh_video_t *sh = avctx->opaque;
- - int i;
---
-++ int i, try_hwaccel;
-+
- - for(i=0;fmt[i]!=PIX_FMT_NONE;i++){
- - imgfmt = pixfmt2imgfmt(fmt[i]);
- - if(!IMGFMT_IS_HWACCEL(imgfmt)) continue;
- - mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_TryingPixfmt, i);
- - if(init_vo(sh, fmt[i]) >= 0) {
- - break;
--+ int i, try_hwaccel;
--+
- + for (try_hwaccel = 1; try_hwaccel >= 0; --try_hwaccel) {
- + for (i = 0; fmt[i] != PIX_FMT_NONE; i++) {
- + imgfmt = pixfmt2imgfmt(fmt[i], avctx->codec_id);
-@@ -912,11 +890,9 @@ index 7c68a20..609ac41 100644
- + break;
- }
- - selected_format = fmt[i];
-+ if (selected_format == PIX_FMT_NONE)
-+ selected_format = avcodec_default_get_format(avctx, fmt);
- set_format_params(avctx, selected_format);
-- return selected_format;
-- }
---#endif /* CONFIG_XVMC || CONFIG_VDPAU */
--+#endif /* CONFIG_XVMC || CONFIG_VAAPI || CONFIG_VDPAU */
- diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h
- index 3619e69..fd869b7 100644
- --- a/libmpcodecs/vf.h
-diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-20110127/patches/mplayer-vdpau.patch
---- mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch 2010-11-15 08:41:19.000000000 +0200
-+++ mplayer-vaapi-20110127/patches/mplayer-vdpau.patch 2011-03-30 22:29:47.000000000 +0300
-@@ -11,15 +11,6 @@ index 91fd164..1f4434e 100755
- libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
- libavdemuxers=$(echo $libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/AVISYNTH_DEMUXER//)
- libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
--@@ -4466,7 +4466,7 @@ if test "$_vdpau" = yes ; then
-- else
-- def_vdpau='#define CONFIG_VDPAU 0'
-- novomodules="vdpau $novomodules"
--- libavdecoders=$(echo $libavdecoders | sed -e "s/\(MPEG\|MPEG[124]\|H26[34]\|WMV3\|VC1\)_VDPAU_DECODER//g")
--+ libavhwaccels=$(echo $libavhwaccels | sed -e "s/\(MPEG[124]\|H26[34]\|WMV3\|VC1\)_VDPAU_HWACCEL//g")
-- fi
-- echores "$_vdpau"
--
- diff --git a/etc/codecs.conf b/etc/codecs.conf
- index b0d00f4..745d3e4 100644
- --- a/etc/codecs.conf
-@@ -48,7 +39,7 @@ index b0d00f4..745d3e4 100644
- out YV12,I420,IYUV
- out 422P,444P
-
--@@ -332,41 +335,6 @@ videocodec ffmpeg12mc
-+@@ -332,38 +335,6 @@ videocodec ffmpeg12mc
- out IDCT_MPEG2
- out MOCO_MPEG2
-
-@@ -73,9 +64,6 @@ index b0d00f4..745d3e4 100644
- - fourcc xdv7,xdv8,xdv9
- - fourcc xdva,xdvb,xdvc
- - fourcc xdvd,xdve,xdvf
--- fourcc xd5a,xd5b,xd5c
--- fourcc xd5d,xd5e,xd5f
--- fourcc xd59,xd54
- - fourcc mx5n,mx4n,mx4p
- - fourcc mx3n,mx3p
- - fourcc AVmp
-@@ -87,9 +75,9 @@ index b0d00f4..745d3e4 100644
- - out VDPAU_MPEG1
- - out VDPAU_MPEG2
- -
-- videocodec mpegpes
-- info "MPEG-PES output (.mpg or DXR3/IVTV/DVB/V4L2 card)"
-- comment "for hardware decoding"
-+ videocodec ffmpeg2crystalhd
-+ info "FFmpeg MPEG-2 (CrystalHD)"
-+ status working
- @@ -943,6 +911,7 @@ videocodec ffwmv3
- driver ffmpeg
- dll wmv3
-@@ -133,7 +121,7 @@ index b0d00f4..745d3e4 100644
-
- videocodec ffh264
- info "FFmpeg H.264"
--@@ -993,19 +947,8 @@ videocodec ffh264
-+@@ -993,21 +947,8 @@ videocodec ffh264
- driver ffmpeg
- dll h264
- out VAAPI_H264
-@@ -146,6 +134,8 @@ index b0d00f4..745d3e4 100644
- - fourcc X264,x264
- - fourcc avc1,AVC1
- - fourcc davc,DAVC
-+- fourcc ai55,ai15 ; flip4mac avc intra
-+- fourcc ai1q,ai5q ; flip4mac avc intra
- - format 0x10000005
- - driver ffmpeg
- - dll h264_vdpau
-@@ -200,55 +190,41 @@ diff --git a/ffmpeg/libavcodec/allcodecs
- index fbae0f6..4b6d2e9 100644
- --- a/ffmpeg/libavcodec/allcodecs.c
- +++ b/ffmpeg/libavcodec/allcodecs.c
--@@ -65,6 +65,13 @@ void avcodec_register_all(void)
-- REGISTER_HWACCEL (WMV3_DXVA2, wmv3_dxva2);
-- REGISTER_HWACCEL (WMV3_VAAPI, wmv3_vaapi);
--
--+ REGISTER_HWACCEL (H264_VDPAU, h264_vdpau);
--+ REGISTER_HWACCEL (MPEG1_VDPAU, mpeg1_vdpau);
--+ REGISTER_HWACCEL (MPEG2_VDPAU, mpeg2_vdpau);
--+ REGISTER_HWACCEL (MPEG4_VDPAU, mpeg4_vdpau);
--+ REGISTER_HWACCEL (VC1_VDPAU, vc1_vdpau);
--+ REGISTER_HWACCEL (WMV3_VDPAU, wmv3_vdpau);
--+
-- /* video codecs */
-- REGISTER_ENCODER (A64MULTI, a64multi);
-- REGISTER_ENCODER (A64MULTI5, a64multi5);
- @@ -116,7 +123,6 @@ void avcodec_register_all(void)
-- REGISTER_DECODER (H263I, h263i);
- REGISTER_ENCODER (H263P, h263p);
- REGISTER_DECODER (H264, h264);
-+ REGISTER_DECODER (H264_CRYSTALHD, h264_crystalhd);
- - REGISTER_DECODER (H264_VDPAU, h264_vdpau);
- REGISTER_ENCDEC (HUFFYUV, huffyuv);
- REGISTER_DECODER (IDCIN, idcin);
- REGISTER_DECODER (IFF_BYTERUN1, iff_byterun1);
- @@ -140,10 +146,7 @@ void avcodec_register_all(void)
-- REGISTER_ENCDEC (MPEG1VIDEO, mpeg1video);
- REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video);
- REGISTER_ENCDEC (MPEG4, mpeg4);
-+ REGISTER_DECODER (MPEG4_CRYSTALHD, mpeg4_crystalhd);
- - REGISTER_DECODER (MPEG4_VDPAU, mpeg4_vdpau);
- REGISTER_DECODER (MPEGVIDEO, mpegvideo);
- - REGISTER_DECODER (MPEG_VDPAU, mpeg_vdpau);
- - REGISTER_DECODER (MPEG1_VDPAU, mpeg1_vdpau);
-+ REGISTER_DECODER (MPEG2_CRYSTALHD, mpeg2_crystalhd);
-+ REGISTER_DECODER (MSMPEG4_CRYSTALHD, msmpeg4_crystalhd);
- REGISTER_ENCDEC (MSMPEG4V1, msmpeg4v1);
-- REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2);
-- REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3);
- @@ -196,7 +199,6 @@ void avcodec_register_all(void)
-- REGISTER_DECODER (V210X, v210x);
- REGISTER_DECODER (VB, vb);
- REGISTER_DECODER (VC1, vc1);
-+ REGISTER_DECODER (VC1_CRYSTALHD, vc1_crystalhd);
- - REGISTER_DECODER (VC1_VDPAU, vc1_vdpau);
- REGISTER_DECODER (VCR1, vcr1);
- REGISTER_DECODER (VMDVIDEO, vmdvideo);
- REGISTER_DECODER (VMNC, vmnc);
- @@ -210,7 +212,6 @@ void avcodec_register_all(void)
-- REGISTER_ENCDEC (WMV1, wmv1);
- REGISTER_ENCDEC (WMV2, wmv2);
- REGISTER_DECODER (WMV3, wmv3);
-+ REGISTER_DECODER (WMV3_CRYSTALHD, wmv3_crystalhd);
- - REGISTER_DECODER (WMV3_VDPAU, wmv3_vdpau);
- REGISTER_DECODER (WNV1, wnv1);
- REGISTER_DECODER (XAN_WC3, xan_wc3);
-- REGISTER_DECODER (XL, xl);
-+ REGISTER_DECODER (XAN_WC4, xan_wc4);
- diff --git a/ffmpeg/libavcodec/avcodec.h b/ffmpeg/libavcodec/avcodec.h
- index bff9477..1e77fa6 100644
- --- a/ffmpeg/libavcodec/avcodec.h
-@@ -285,9 +261,9 @@ index b0a3a8a..b5b9026 100644
- #include "mpeg4video_parser.h"
- #include "msmpeg4.h"
- -#include "vdpau_internal.h"
-+ #include "thread.h"
- #include "flv.h"
- #include "mpeg4video.h"
--
- @@ -620,11 +619,6 @@ retry:
- if(MPV_frame_start(s, avctx) < 0)
- return -1;
-@@ -305,23 +281,23 @@ index f99f7ea..faafa97 100644
- --- a/ffmpeg/libavcodec/h264.c
- +++ b/ffmpeg/libavcodec/h264.c
- @@ -37,7 +37,6 @@
-- #include "golomb.h"
- #include "mathops.h"
- #include "rectangle.h"
-+ #include "thread.h"
- -#include "vdpau_internal.h"
- #include "libavutil/avassert.h"
-
- #include "cabac.h"
- @@ -1647,9 +1646,6 @@ static void field_end(H264Context *h){
-- s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
-- s->current_picture_ptr->pict_type= s->pict_type;
-+ ff_thread_report_progress((AVFrame*)s->current_picture_ptr, (16*s->mb_height >> FIELD_PICTURE) - 1,
-+ s->picture_structure==PICT_BOTTOM_FIELD);
-
- - if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
- - ff_vdpau_h264_set_reference_frames(s);
- -
-- if(!s->dropable) {
-- ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
-- h->prev_poc_msb= h->poc_msb;
-+ if(in_setup || !(avctx->active_thread_type&FF_THREAD_FRAME)){
-+ if(!s->dropable) {
-+ ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
- @@ -1663,9 +1659,6 @@ static void field_end(H264Context *h){
- av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n");
- }
-@@ -362,13 +338,13 @@ index f99f7ea..faafa97 100644
- context_count++;
- }
- break;
--@@ -3408,20 +3392,3 @@ AVCodec h264_decoder = {
-+@@ -3408,21 +3392,3 @@ AVCodec h264_decoder = {
- .flush= flush_dpb,
- .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
- };
- -
- -#if CONFIG_H264_VDPAU_DECODER
---AVCodec h264_vdpau_decoder = {
-+-AVCodec ff_h264_vdpau_decoder = {
- - "h264_vdpau",
- - AVMEDIA_TYPE_VIDEO,
- - CODEC_ID_H264,
-@@ -381,6 +357,7 @@ index f99f7ea..faafa97 100644
- - .flush= flush_dpb,
- - .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
- - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_H264, PIX_FMT_NONE},
-+- .profiles = NULL_IF_CONFIG_SMALL(profiles),
- -};
- -#endif
- diff --git a/ffmpeg/libavcodec/mpeg12.c b/ffmpeg/libavcodec/mpeg12.c
-@@ -449,7 +426,7 @@ index 6a331eb..c226797 100644
- - break;
- - }
- -
-- if(avctx->thread_count > 1){
-+ if(HAVE_THREADS && avctx->active_thread_type&FF_THREAD_SLICE){
- int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count;
- if(threshold <= mb_y){
- @@ -2578,36 +2561,3 @@ AVCodec mpeg_xvmc_decoder = {
-@@ -458,7 +435,7 @@ index 6a331eb..c226797 100644
- #endif
- -
- -#if CONFIG_MPEG_VDPAU_DECODER
---AVCodec mpeg_vdpau_decoder = {
-+-AVCodec ff_mpeg_vdpau_decoder = {
- - "mpegvideo_vdpau",
- - AVMEDIA_TYPE_VIDEO,
- - CODEC_ID_MPEG2VIDEO,
-@@ -474,7 +451,7 @@ index 6a331eb..c226797 100644
- -#endif
- -
- -#if CONFIG_MPEG1_VDPAU_DECODER
---AVCodec mpeg1_vdpau_decoder = {
-+-AVCodec ff_mpeg1_vdpau_decoder = {
- - "mpeg1video_vdpau",
- - AVMEDIA_TYPE_VIDEO,
- - CODEC_ID_MPEG1VIDEO,
-@@ -500,7 +477,7 @@ index b339f78..1928d03 100644
- -
- -
- -#if CONFIG_MPEG4_VDPAU_DECODER
---AVCodec mpeg4_vdpau_decoder = {
-+-AVCodec ff_mpeg4_vdpau_decoder = {
- - "mpeg4_vdpau",
- - AVMEDIA_TYPE_VIDEO,
- - CODEC_ID_MPEG4,
-@@ -527,9 +504,17 @@ index 9650066..5f8440b 100644
- PIX_FMT_NONE
- };
- @@ -1064,7 +1065,6 @@ void MPV_frame_end(MpegEncContext *s)
-- if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){
- ff_xvmc_field_end(s);
-- }else if(!s->avctx->hwaccel
-+ }else if((s->error_count || s->encoding)
-+ && !s->avctx->hwaccel
-+- && !(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
-+ && s->unrestricted_mv
-+ && s->current_picture.reference
-+ && !s->intra_only
-+@@ -2254,7 +2254,6 @@ void ff_draw_horiz_band(MpegEncContext *
-+ }
-+
-+ if (!s->avctx->hwaccel
- - && !(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
- && s->unrestricted_mv
- && s->current_picture.reference
-@@ -582,13 +567,13 @@ index c9a547b..71c50e7 100644
- if (avctx->hwaccel->start_frame(avctx, buf, buf_size) < 0)
- return -1;
- if (avctx->hwaccel->decode_slice(avctx, buf_start, (buf + buf_size) - buf_start) < 0)
--@@ -3376,37 +3364,3 @@ AVCodec wmv3_decoder = {
-- .pix_fmts = ff_hwaccel_pixfmt_list_420
-+@@ -3376,39 +3364,3 @@ AVCodec wmv3_decoder = {
-+ .profiles = NULL_IF_CONFIG_SMALL(profiles)
- };
- #endif
- -
- -#if CONFIG_WMV3_VDPAU_DECODER
---AVCodec wmv3_vdpau_decoder = {
-+-AVCodec ff_wmv3_vdpau_decoder = {
- - "wmv3_vdpau",
- - AVMEDIA_TYPE_VIDEO,
- - CODEC_ID_WMV3,
-@@ -600,12 +585,13 @@ index c9a547b..71c50e7 100644
- - CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
- - NULL,
- - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"),
--- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE}
-+- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE},
-+- .profiles = NULL_IF_CONFIG_SMALL(profiles)
- -};
- -#endif
- -
- -#if CONFIG_VC1_VDPAU_DECODER
---AVCodec vc1_vdpau_decoder = {
-+-AVCodec ff_vc1_vdpau_decoder = {
- - "vc1_vdpau",
- - AVMEDIA_TYPE_VIDEO,
- - CODEC_ID_VC1,
-@@ -617,7 +603,8 @@ index c9a547b..71c50e7 100644
- - CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
- - NULL,
- - .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"),
--- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_VC1, PIX_FMT_NONE}
-+- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_VC1, PIX_FMT_NONE},
-+- .profiles = NULL_IF_CONFIG_SMALL(profiles)
- -};
- -#endif
- diff --git a/ffmpeg/libavcodec/vdpau.c b/ffmpeg/libavcodec/vdpau.c
-@@ -1163,9 +1150,9 @@ index 8ec91c8..2386a81 100644
- PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
- PIX_FMT_Y400A, ///< 8bit gray, 8bit alpha
- + PIX_FMT_VDPAU, ///< HW decoding with VDPAU, Picture.data[3] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-+ PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-+ PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
- PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-- };
--
- diff --git a/fmt-conversion.c b/fmt-conversion.c
- index bd32ce8..8994caa 100644
- --- a/fmt-conversion.c
-@@ -1198,19 +1185,6 @@ index bd32ce8..8994caa 100644
- {0, PIX_FMT_NONE}
- };
-
--diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
--index 84b5430..aef79e9 100644
----- a/libmpcodecs/vd_ffmpeg.c
--+++ b/libmpcodecs/vd_ffmpeg.c
--@@ -303,7 +303,7 @@ static int init(sh_video_t *sh){
-- }
-- #endif /* CONFIG_VAAPI */
-- #if CONFIG_VDPAU
--- if(lavc_codec->capabilities & CODEC_CAP_HWACCEL_VDPAU){
--+ if(get_video_hwaccel() == HWACCEL_VDPAU){
-- avctx->get_format = get_format;
-- }
-- #endif /* CONFIG_VDPAU */
- diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
- index 5133b66..0ce6104 100644
- --- a/libvo/vo_vdpau.c
diff --git a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch b/libre/mplayer-vaapi-libre/tweak-desktop-file.patch
index db0f377d2..606e356b0 100644..100755
--- a/libre/mplayer-vaapi-libre/tweak-desktop-file.patch
+++ b/libre/mplayer-vaapi-libre/tweak-desktop-file.patch
@@ -1,19 +1,6 @@
---- mplayer.desktop.orig 2012-05-13 19:25:26.000000000 +0300
-+++ mplayer.desktop 2012-05-13 19:32:19.000000000 +0300
-@@ -7,12 +7,6 @@ GenericName[de]=Medienwiedergabe
- GenericName[fr]=Lecteur multimédia
- GenericName[it]=Lettore multimediale
- GenericName[ja]=メディアプレーヤー
--X-GNOME-FullName=MPlayer Media Player
--X-GNOME-FullName[ca]=MPlayer Reproductor multimèdia
--X-GNOME-FullName[de]=MPlayer Medienwiedergabe
--X-GNOME-FullName[fr]=MPlayer Lecteur multimédia
--X-GNOME-FullName[it]=MPlayer Lettore multimediale
--X-GNOME-FullName[ja]=MPlayer メディアプレーヤー
- Comment=Play movies and songs
- Comment[ca]=Reproduïu vídeos i cançons
- Comment[de]=Filme und Musik wiedergeben
-@@ -20,8 +14,9 @@ Comment[fr]=Lit les films et musiques
+--- mplayer.desktop.orig 2012-07-08 22:18:27.000000000 +0300
++++ mplayer.desktop 2012-07-08 22:19:08.000000000 +0300
+@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques
Comment[it]=Riproduce filmati e musica
Comment[ja]=動画や音声のファイルを再生します
Icon=mplayer
@@ -24,5 +11,4 @@
Terminal=false
+NoDisplay=true
Categories=GTK;AudioVideo;Audio;Video;Player;TV;
--MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;video/3gpp;application/x-flash-video;
-+MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;video/3gpp;application/x-flash-video;
+ MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;
diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD
new file mode 100644
index 000000000..673ee8435
--- /dev/null
+++ b/libre/ogre-libre/PKGBUILD
@@ -0,0 +1,131 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=ogre
+pkgname=(
+ ogre-libre
+ #ogre-docs
+)
+pkgver=1.8.1
+pkgrel=2
+pkgdesc='A scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support'
+arch=(
+ i686
+ x86_64
+ mips64el
+)
+url="http://www.${pkgbase}3d.org"
+license=(
+ 'custom:MIT'
+)
+depends=(
+ boost-libs
+ freeimage
+ freetype2
+ libxaw
+ libxrandr
+ zziplib
+ ois
+ glu
+)
+makedepends=(
+ boost
+ cmake
+ doxygen
+ graphviz
+ ttf-dejavu
+ mesa
+)
+install=$pkgbase.install
+source=(
+ "https://downloads.sourceforge.net/$pkgbase/${pkgbase}_src_v${pkgver//./-}.tar.bz2"
+)
+sha512sums=(
+ 0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2
+)
+
+build() {
+ cd $srcdir/${pkgbase}_src_v${pkgver//./-}
+
+ # get a clean build dir
+ [[ -d build ]] && rm -rf build
+ mkdir build && cd build
+
+ # generate CMake Makefile
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -D${pkgbase^^}_INSTALL_PLUGINS_HEADERS=TRUE \
+ -D${pkgbase^^}_INSTALL_SAMPLES=TRUE \
+ -D${pkgbase^^}_INSTALL_DOCS=TRUE \
+ -D${pkgbase^^}_INSTALL_MEDIA=TRUE \
+ -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=TRUE \
+ -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
+
+ # compile
+ make
+
+ # generate docs
+ if [[ $(which dot) && $(which doxygen) ]]; then
+ make doc
+ fi
+}
+
+package_ogre-libre() {
+ optdepends=(
+ 'cppunit: unit testing'
+ 'intel-tbb: better threading support'
+ 'poco: portability'
+ "boost: for developing using $pkgbase"
+ "$pkgbase-docs: documentation"
+ )
+ provides=(
+ $pkgbase=$pkgver
+ )
+ conflicts=(
+ $pkgbase
+ )
+ replaces=(
+ $pkgbase
+ )
+
+ cd $srcdir/${pkgbase}_src_v${pkgver//./-}/build
+
+ # install the bugger
+ make DESTDIR=$pkgdir install
+
+ # fix up samples
+ install -dm775 -o root -g users $pkgdir/opt/${pkgbase^^}/samples
+ mv $pkgdir/usr/share/${pkgbase^^}/*.cfg $pkgdir/opt/${pkgbase^^}/samples
+ mv $pkgdir/usr/bin/SampleBrowser $pkgdir/opt/${pkgbase^^}/samples
+
+ # make sample launcher
+ echo '#!/bin/bash' > $pkgdir/usr/bin/${pkgbase^}SampleBrowser
+ echo 'cd /opt/${pkgbase^^}/samples && ./SampleBrowser' >> $pkgdir/usr/bin/${pkgbase^}SampleBrowser
+ chmod +x $pkgdir/usr/bin/${pkgbase^}SampleBrowser
+
+ # install license
+ install -Dm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html
+
+ # move docs out of this package
+ mv $pkgdir/usr/share/${pkgbase^^}/docs $srcdir/docs
+}
+
+package_ogre-docs() {
+ pkgdesc="Documentation for $pkgbase"
+ depends=(
+ )
+
+ cd $srcdir/${pkgbase}_src_v${pkgver//./-}/build
+
+ # move docs into this package
+ install -dm755 $pkgdir/usr/share/doc
+ mv $srcdir/docs $pkgdir/usr/share/doc/${pkgbase^^}
+
+ # symlink for docs
+ install -dm755 $pkgdir/usr/share/${pkgbase^^}
+ cd $pkgdir/usr/share
+ ln -s doc/${pkgbase^^} ${pkgbase^^}/docs
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/ogre-libre/ogre.install b/libre/ogre-libre/ogre.install
new file mode 100644
index 000000000..5db668d9e
--- /dev/null
+++ b/libre/ogre-libre/ogre.install
@@ -0,0 +1,4 @@
+post_install() {
+ echo "To view the OGRE samples just run OgreSampleBrowser or launch"
+ echo "it directly in /opt/OGRE/samples/"
+}
diff --git a/libre/p7zip-libre/7zFM.desktop b/libre/p7zip-libre/7zFM.desktop
index 62b8e8562..62b8e8562 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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
new file mode 100755
index 000000000..85622aaac
--- /dev/null
+++ b/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
@@ -0,0 +1,152 @@
+From 717fdb8ee0fd23cf72fc7d2832317f513caefa2c Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan@archlinux.org>
+Date: Sun, 8 Jul 2012 21:36:36 +1000
+Subject: [PATCH 1/4] Add conflict for replacing owned empty directory
+
+When two packages own an empty directory, pacman finds no conflict when
+one of those packages wants to replace the directory with a file or a
+symlink. When it comes to actually extracting the new file/symlink,
+pacman sees the directory is still there (we do not remove empty
+directories if they are owned by a package) and refuses to extract.
+
+Detect this potential conflict early and bail. Note that it is a
+_potential_ conflict and not a guaranteed one as the other package owning
+the directory could be updated or removed first which would remove
+the conflict. However, pacman currently can not sort package installation
+order to ensure this, so this conflict requires manual upgrade ordering.
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+Signed-off-by: Dan McGee <dan@archlinux.org>
+---
+ lib/libalpm/conflict.c | 32 ++++++++++++++++++++++++++------
+ test/pacman/tests/fileconflict009.py | 20 ++++++++++++++++++++
+ test/pacman/tests/fileconflict010.py | 20 ++++++++++++++++++++
+ 3 files changed, 66 insertions(+), 6 deletions(-)
+ create mode 100644 test/pacman/tests/fileconflict009.py
+ create mode 100644 test/pacman/tests/fileconflict010.py
+
+diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
+index 32f6f30..efa1a87 100644
+--- a/lib/libalpm/conflict.c
++++ b/lib/libalpm/conflict.c
+@@ -328,15 +328,35 @@ const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist,
+ return NULL;
+ }
+
+-static int dir_belongsto_pkg(const char *root, const char *dirpath,
++static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
+ alpm_pkg_t *pkg)
+ {
++ alpm_list_t *i;
+ struct stat sbuf;
+ char path[PATH_MAX];
+ char abspath[PATH_MAX];
+- struct dirent *ent = NULL;
+ DIR *dir;
++ struct dirent *ent = NULL;
++ const char *root = handle->root;
++
++ /* TODO: this is an overly strict check but currently pacman will not
++ * overwrite a directory with a file (case 10/11 in add.c). Adjusting that
++ * is not simple as even if the directory is being unowned by a conflicting
++ * package, pacman does not sort this to ensure all required directory
++ * "removals" happen before installation of file/symlink */
++
++ /* check that no other _installed_ package owns the directory */
++ for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) {
++ if(pkg == i->data) {
++ continue;
++ }
++
++ if(_alpm_filelist_contains(alpm_pkg_get_files(i->data), dirpath)) {
++ return 0;
++ }
++ }
+
++ /* check all files in directory are owned by the package */
+ snprintf(abspath, PATH_MAX, "%s%s", root, dirpath);
+ dir = opendir(abspath);
+ if(dir == NULL) {
+@@ -349,13 +369,13 @@ static int dir_belongsto_pkg(const char *root, const char *dirpath,
+ if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
+ continue;
+ }
+- snprintf(path, PATH_MAX, "%s/%s", dirpath, name);
++ snprintf(path, PATH_MAX, "%s%s", dirpath, name);
+ snprintf(abspath, PATH_MAX, "%s%s", root, path);
+ if(stat(abspath, &sbuf) != 0) {
+ continue;
+ }
+ if(S_ISDIR(sbuf.st_mode)) {
+- if(dir_belongsto_pkg(root, path, pkg)) {
++ if(dir_belongsto_pkg(handle, path, pkg)) {
+ continue;
+ } else {
+ closedir(dir);
+@@ -529,9 +549,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
+ sprintf(dir, "%s/", filestr);
+ if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) {
+ _alpm_log(handle, ALPM_LOG_DEBUG,
+- "check if all files in %s belongs to %s\n",
++ "check if all files in %s belong to %s\n",
+ dir, dbpkg->name);
+- resolved_conflict = dir_belongsto_pkg(handle->root, filestr, dbpkg);
++ resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg);
+ }
+ free(dir);
+ }
+diff --git a/test/pacman/tests/fileconflict009.py b/test/pacman/tests/fileconflict009.py
+new file mode 100644
+index 0000000..904af4a
+--- /dev/null
++++ b/test/pacman/tests/fileconflict009.py
+@@ -0,0 +1,20 @@
++self.description = "dir->symlink change during package upgrade (directory conflict)"
++
++lp1 = pmpkg("pkg1")
++lp1.files = ["dir/"]
++self.addpkg2db("local", lp1)
++
++lp2 = pmpkg("pkg2")
++lp2.files = ["dir/"]
++self.addpkg2db("local", lp2)
++
++p = pmpkg("pkg1", "1.0-2")
++p.files = ["dir -> /usr/dir"]
++self.addpkg2db("sync", p)
++
++self.args = "-S pkg1"
++
++self.addrule("PACMAN_RETCODE=1")
++self.addrule("PKG_VERSION=pkg1|1.0-1")
++self.addrule("PKG_VERSION=pkg2|1.0-1")
++self.addrule("DIR_EXIST=dir/")
+diff --git a/test/pacman/tests/fileconflict010.py b/test/pacman/tests/fileconflict010.py
+new file mode 100644
+index 0000000..0a3ce83
+--- /dev/null
++++ b/test/pacman/tests/fileconflict010.py
+@@ -0,0 +1,20 @@
++self.description = "dir->file change during package upgrade (directory conflict)"
++
++lp1 = pmpkg("pkg1")
++lp1.files = ["dir/"]
++self.addpkg2db("local", lp1)
++
++lp2 = pmpkg("pkg2")
++lp2.files = ["dir/"]
++self.addpkg2db("local", lp2)
++
++p = pmpkg("pkg1", "1.0-2")
++p.files = ["dir"]
++self.addpkg2db("sync", p)
++
++self.args = "-S pkg1"
++
++self.addrule("PACMAN_RETCODE=1")
++self.addrule("PKG_VERSION=pkg1|1.0-1")
++self.addrule("PKG_VERSION=pkg2|1.0-1")
++self.addrule("DIR_EXIST=dir/")
+--
+1.7.11.1
+
diff --git a/libre/pacman/0002-Check-empty-subdirectory-ownership.patch b/libre/pacman/0002-Check-empty-subdirectory-ownership.patch
new file mode 100755
index 000000000..6cf496d16
--- /dev/null
+++ b/libre/pacman/0002-Check-empty-subdirectory-ownership.patch
@@ -0,0 +1,61 @@
+From 44e9fdd0e848382337edb97d41e7317638a67bac Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan@archlinux.org>
+Date: Sun, 8 Jul 2012 23:58:37 +1000
+Subject: [PATCH 2/4] Check empty subdirectory ownership
+
+When checking if a package owns a directory, it is important to check
+not only that all the files in the directory are part of the package,
+but also if the directory is part of a package. This catches empty
+subdirectories during conflict checking for directory to file/symlink
+replacements.
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+Signed-off-by: Dan McGee <dan@archlinux.org>
+---
+ lib/libalpm/conflict.c | 5 +++++
+ test/pacman/tests/fileconflict012.py | 17 +++++++++++++++++
+ 2 files changed, 22 insertions(+)
+ create mode 100644 test/pacman/tests/fileconflict012.py
+
+diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
+index efa1a87..d6e5d8c 100644
+--- a/lib/libalpm/conflict.c
++++ b/lib/libalpm/conflict.c
+@@ -339,6 +339,11 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
+ struct dirent *ent = NULL;
+ const char *root = handle->root;
+
++ /* check directory is actually in package - used for subdirectory checks */
++ if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) {
++ return 0;
++ }
++
+ /* TODO: this is an overly strict check but currently pacman will not
+ * overwrite a directory with a file (case 10/11 in add.c). Adjusting that
+ * is not simple as even if the directory is being unowned by a conflicting
+diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py
+new file mode 100644
+index 0000000..421b739
+--- /dev/null
++++ b/test/pacman/tests/fileconflict012.py
+@@ -0,0 +1,17 @@
++self.description = "dir->file change during package upgrade (filesystem file conflict)"
++
++lp1 = pmpkg("pkg1")
++lp1.files = ["dir/"]
++self.addpkg2db("local", lp1)
++
++self.filesystem = ["dir/file"]
++
++p = pmpkg("pkg1", "1.0-2")
++p.files = ["dir"]
++self.addpkg2db("sync", p)
++
++self.args = "-S pkg1"
++
++self.addrule("PACMAN_RETCODE=1")
++self.addrule("PKG_VERSION=pkg1|1.0-1")
++self.addrule("DIR_EXIST=dir/")
+--
+1.7.11.1
+
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index d8d3a6d26..4f05be586 100644..100755
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -4,38 +4,42 @@
# Maintainer: Dave Reisner <dave@archlinux.org>
pkgname=pacman
-pkgver=4.0.2
-pkgrel=1
+pkgver=4.0.3
+pkgrel=3
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.archlinux.org/pacman/"
license=('GPL')
groups=('base')
depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
- 'gpgme' 'pacman-mirrorlist')
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring')
makedepends=('asciidoc')
optdepends=('fakeroot: for makepkg usage as normal user')
backup=(etc/pacman.conf etc/makepkg.conf)
install=pacman.install
options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+ 0001-Add-conflict-for-replacing-owned-empty-directory.patch
+ 0002-Check-empty-subdirectory-ownership.patch
pacman.conf
pacman.conf.x86_64
pacman.conf.mips64el
makepkg.conf)
-md5sums=('289ba4a19a16393096e065cec1cb9b0a'
- '575140dce3ea597d91b6d081aa3f6a00'
- '858d1ffb284afc6b15f72578ba3cac50'
- '7dade0c0a4d597c480d779afa4f5097c'
- 'd4ca1a1d8e6708c0302a225628a489eb'
+md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
+ '1a70392526c8768470da678b31905a6e'
+ '1a9b79788640907a2b34e8671cacc94a'
+ 'a9ddd43891bed364e1e97d27b2887bf1'
+ '080d9f76f56e135cc62205874636aa0f'
+ 'ce9943fc8086d491890565e91ea1a0d8'
+ 'eb8dba9bd0b315230fbf0e5dc0a7335b'
'debc512689a1aa8c124fe0ccf27f5758')
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
build() {
cd $srcdir/$pkgname-$pkgver
+ patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
+ patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
+
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --enable-doc
make
@@ -83,8 +87,10 @@ package() {
-e "s|@CARCHFLAGS[@]|$myflags|g"
# install completion files
- mkdir -p $pkgdir/etc/bash_completion.d/
- install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
- mkdir -p $pkgdir/usr/share/zsh/site-functions/
- install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
+ install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
+ for f in makepkg pacman-key; do
+ ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
+ done
+
+ install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
}
diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf
index 08a44167b..08a44167b 100644..100755
--- a/libre/pacman/makepkg.conf
+++ b/libre/pacman/makepkg.conf
diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf
index 92befa5fa..115217b59 100644..100755
--- a/libre/pacman/pacman.conf
+++ b/libre/pacman/pacman.conf
@@ -36,18 +36,13 @@ Architecture = auto
CheckSpace
#VerbosePkgLists
-# PGP signature checking
-# NOTE: None of this will work without running `pacman-key --init` first.
-# The compiled in default is equivalent to the following line. This requires
-# you to locally sign and trust packager keys using `pacman-key` for them to be
-# considered valid.
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
#SigLevel = Optional TrustedOnly
-# If you wish to check signatures but avoid local sign and trust issues, use
-# the following line. This will treat any key imported into pacman's keyring as
-# trusted.
-#SigLevel = Optional TrustAll
-# For now, off by default unless you read the above.
-SigLevel = Never
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
#
# REPOSITORIES
@@ -77,7 +72,7 @@ SigLevel = Never
#Include = /etc/pacman.d/mirrorlist
[libre]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[testing]
@@ -85,11 +80,11 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[core]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[extra]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[community-testing]
@@ -97,7 +92,7 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[community]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# Parabola also supports community projects and personal repositories, to find
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index a74f2d3da..f286c3290 100644..100755
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -16,9 +16,7 @@
#GPGDir = /etc/pacman.d/gnupg/
HoldPkg = pacman glibc
# If upgrades are available for these packages they will be asked for first
-# Don't list pacman here unless you want it broken when there is a
-# libarchive or glibc update.
-#SyncFirst =
+SyncFirst = pacman
#XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
@@ -35,21 +33,16 @@ Architecture = mips64el
#UseSyslog
#UseDelta
#TotalDownload
-#CheckSpace
+CheckSpace
#VerbosePkgLists
-# PGP signature checking
-# NOTE: None of this will work without running `pacman-key --init` first.
-# The compiled in default is equivalent to the following line. This requires
-# you to locally sign and trust packager keys using `pacman-key` for them to be
-# considered valid.
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
#SigLevel = Optional TrustedOnly
-# If you wish to check signatures but avoid local sign and trust issues, use
-# the following line. This will treat any key imported into pacman's keyring as
-# trusted.
-#SigLevel = Optional TrustAll
-# For now, off by default unless you read the above.
-SigLevel = Never
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
#
# REPOSITORIES
@@ -79,7 +72,7 @@ SigLevel = Never
#Include = /etc/pacman.d/mirrorlist
[libre]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[testing]
@@ -87,11 +80,11 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[core]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[extra]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[community-testing]
@@ -99,7 +92,7 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[community]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# Parabola also supports community projects and personal repositories, to find
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index 0eddc159c..4c67b089f 100644..100755
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -36,18 +36,13 @@ Architecture = auto
CheckSpace
#VerbosePkgLists
-# PGP signature checking
-# NOTE: None of this will work without running `pacman-key --init` first.
-# The compiled in default is equivalent to the following line. This requires
-# you to locally sign and trust packager keys using `pacman-key` for them to be
-# considered valid.
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
#SigLevel = Optional TrustedOnly
-# If you wish to check signatures but avoid local sign and trust issues, use
-# the following line. This will treat any key imported into pacman's keyring as
-# trusted.
-#SigLevel = Optional TrustAll
-# For now, off by default unless you read the above.
-SigLevel = Never
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
#
# REPOSITORIES
@@ -77,7 +72,7 @@ SigLevel = Never
#Include = /etc/pacman.d/mirrorlist
[libre]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[testing]
@@ -85,11 +80,11 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[core]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[extra]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[community-testing]
@@ -97,7 +92,7 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[community]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# If you want to run 32 bit applications on your x86_64 system,
@@ -108,7 +103,7 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
#[multilib]
-#SigLevel = PackageOptional
+#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
# Parabola also supports community projects and personal repositories, to find
diff --git a/libre/pacman/pacman.install b/libre/pacman/pacman.install
index 4369edab1..5dc55c0c2 100644..100755
--- a/libre/pacman/pacman.install
+++ b/libre/pacman/pacman.install
@@ -9,7 +9,9 @@ post_upgrade() {
if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then
_warnupgrade
fi
- _check_pubring
+ if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then
+ _check_pubring
+ fi
}
post_install() {
@@ -17,9 +19,10 @@ post_install() {
}
_check_pubring() {
- if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ]; then
- echo " >>> Run \`pacman-key --init\` to set up your pacman keyring."
- fi
+ echo " >>> Run \`pacman-key --init; pacman-key --populate archlinux\`"
+ echo " >>> And \`pacman-key --populate parabola\`"
+ echo " >>> to import the data required by pacman for package verification."
+ echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages"
}
_warnupgrade() {
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
new file mode 100755
index 000000000..810eff5b9
--- /dev/null
+++ b/libre/pacman/rePKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+source PKGBUILD
+unset build package md5sums source check
+_repo=core
+source=(PKGBUILD
+ ftp://ftp.archlinux.org/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+ # files for pkg modifications
+ pacman.conf
+ pacman.conf.x86_64
+ )
+options=(!strip)
+
+build() {
+ cd "${srcdir}/"
+ rm -vf .{INSTALL,PKGINFO} ${srcdir}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+ # put actions for package modifications below this line
+
+}
+
+package() {
+ cp -a ${srcdir}/* ${pkgdir}
+
+ rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}}
+
+# No need to repackage for mips64el
+ case "$CARCH" in
+ i686)
+ install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+ ;;
+ x86_64)
+ install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
+ ;;
+ esac
+}
+
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/parabola-archiso-git/PKGBUILD b/libre/parabola-archiso-git/PKGBUILD
index 0b07ddf8d..0b07ddf8d 100644..100755
--- a/libre/parabola-archiso-git/PKGBUILD
+++ b/libre/parabola-archiso-git/PKGBUILD
diff --git a/libre/parabola-archiso/PKGBUILD b/libre/parabola-archiso/PKGBUILD
new file mode 100755
index 000000000..336892373
--- /dev/null
+++ b/libre/parabola-archiso/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
+
+pkgname=parabola-archiso
+pkgver=2012.10.17
+pkgrel=1
+pkgdesc='Tools for creating Parabola GNU/Linux-libre live and install iso images'
+arch=('any')
+url='https://parabolagnulinux.org'
+license=('GPL')
+depends=('make' 'squashfs-tools' 'libisoburn' 'dosfstools' 'patch' 'lynx' 'wget')
+provides=('archiso')
+conflicts=('archiso')
+source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
+ "https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
+md5sums=('b8a5d4a6ee2547a502cbecea0e238e61'
+ '9425cc4353b5654d7478e9e2b0bf848d')
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
new file mode 100755
index 000000000..8292119d8
--- /dev/null
+++ b/libre/parabola-keyring/PKGBUILD
@@ -0,0 +1,19 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+
+pkgname=parabola-keyring
+pkgver=20121102
+pkgrel=1
+pkgdesc='Parabola GNU/Linux-libre PGP keyring'
+arch=('any')
+url='https://projects.parabolagnulinux.org/hackers.git/'
+license=('GPL')
+install="${pkgname}.install"
+source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
+ "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make PREFIX=/usr DESTDIR=${pkgdir} install
+}
+md5sums=('63c49a827ef05575514412ae76637c67'
+ '9b887e116a8e115a2ca082f65b3ea65a')
diff --git a/libre/parabola-keyring/parabola-keyring.install b/libre/parabola-keyring/parabola-keyring.install
new file mode 100755
index 000000000..1c70f1a8d
--- /dev/null
+++ b/libre/parabola-keyring/parabola-keyring.install
@@ -0,0 +1,11 @@
+post_upgrade() {
+ if usr/bin/pacman-key -l >/dev/null 2>&1; then
+ usr/bin/pacman-key --populate parabola
+ fi
+}
+
+post_install() {
+ if [ -x usr/bin/pacman-key ]; then
+ post_upgrade
+ fi
+}
diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD
index 9c29caf0b..a921253da 100644..100755
--- a/libre/parabola-themes-slim/PKGBUILD
+++ b/libre/parabola-themes-slim/PKGBUILD
@@ -6,7 +6,7 @@ replaces=('archlinux-themes-slim')
conflicts=('archlinux-themes-slim')
pkgname=parabola-themes-slim
pkgver=1.0
-pkgrel=1
+pkgrel=1.1
pkgdesc="a theme parabolero to the Slim login manager"
arch=('any')
url="https://parabolagnulinux.org/"
diff --git a/libre/parabolaweb-git/Makefile b/libre/parabolaweb-git/Makefile
deleted file mode 100644
index 55115aba3..000000000
--- a/libre/parabolaweb-git/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-all:
- makepkg
-
-python_packages=south
-python2_packages=markdown|psycopg2|pyinotify|pytz
-requirements= https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt
-
-requirements_prod.txt: WEB
- rm -f $@
- wget --no-check-certificate $(requirements)
-
-deps-ver.txt: requirements_prod.txt
- sed -r -e 's/.*/\L&/' -e 's/==/=/' \
- -e 's/^(${python_packages})/python-&/' \
- -e 's/^(${python2_packages})/python2-&/' $< >$@
-
-deps-nover.txt: deps-ver.txt
- sed 's/[<>=].*//' $< >$@
-
-clean:
- rm requirements_prod.txt deps-ver.txt deps-nover.txt
-
-WEB: FORCE
-FORCE: PHONY
-PHONY:
-.PHONY: PHONY
diff --git a/libre/parabolaweb-git/PKGBUILD b/libre/parabolaweb-git/PKGBUILD
deleted file mode 100644
index 4641ea8d3..000000000
--- a/libre/parabolaweb-git/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=parabolaweb-git
-pkgver=20120506
-pkgrel=3
-pkgdesc="The Parabola website, fork of archweb"
-arch=('any')
-url="https://projects.parabolagnulinux.org/parabolaweb.git/"
-license=('GPL2')
-
-_deps_file=deps-ver.txt
-#_deps_file=deps-nover.txt
-make "$_deps_file" 1>&2
-depends=('python2' 'git' 'libretools' `cat $_deps_file`)
-
-source=('parabolaweb.init.sh' 'parabolaweb.update.sh.in')
-
-# These will make it install into /http/srv/web
-_install_dir=/srv/http
-_gitname=web
-
-_gitroot=https://projects.parabolagnulinux.org/parabolaweb.git
-_gitbranch="master"
-
-build() {
- cd "${srcdir}"
- sed \
- -e "s|^_install_dir=.*|_install_dir='$_install_dir'|" \
- -e "s|^_gitname=.*|_gitname='$_gitname'|" \
- -e "s|^_gitroot=.*|_gitroot='$_gitroot'|" \
- -e "s|^_gitbranch=.*|_gitbranch='$_gitbranch'|" \
- < parabolaweb.update.sh.in > parabolaweb.update.sh
-}
-
-package() {
- cd "${srcdir}"
- install -d "${pkgdir}/${_install_dir}"
- install -Dm755 parabolaweb.init.sh "${pkgdir}/etc/rc.d/parabolaweb"
- install -Dm755 parabolaweb.update.sh "${pkgdir}/usr/sbin/parabolaweb.update"
-}
-
-md5sums=('72bc7092e4e50a2aaca8b871644520d9'
- 'f495b2e4623691925308cb4a1ec7e5a9')
diff --git a/libre/parabolaweb-git/deps-ver.txt b/libre/parabolaweb-git/deps-ver.txt
deleted file mode 100644
index 67fe6848b..000000000
--- a/libre/parabolaweb-git/deps-ver.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-django=1.3.1
-python2-markdown>=2.0.3
-python2-psycopg2
-python-south>=0.7.3
-python2-pyinotify>=0.9.2
-python-memcached>=1.47
-python2-pytz>=2011n
diff --git a/libre/parabolaweb-git/parabolaweb.init.sh b/libre/parabolaweb-git/parabolaweb.init.sh
deleted file mode 100644
index cb9f2441e..000000000
--- a/libre/parabolaweb-git/parabolaweb.init.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-HOST=127.0.0.1
-PORT=8090 # 80 is nginx
-PIDFILE=/var/run/web/fcgi.pid
-
-case $1 in
-start)
- stat_busy "Starting ParabolaWeb"
- if [[ -e /srv/http/web/manage.py ]]; then
- sudo -u nobody \
- python2 /srv/http/web/manage.py runfcgi \
- host=${HOST} \
- port=${PORT} \
- pidfile=${PIDFILE} \
- --settings=settings
-
- add_daemon parabolaweb
- stat_done
- exit 0
- else
- stat_fail
- exit 1
- fi
- ;;
-
-stop)
- stat_busy "Stopping ParabolaWeb"
- if [[ -f ${PIDFILE} ]]; then
- pid=$(cat ${PIDFILE})
- kill ${pid}
- rm_daemon parabolaweb
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
-restart)
- $0 stop
- $0 start
- ;;
-
-*)
- echo "Usage: $0 {start|stop|restart}" >&2
- exit 1
-
-esac
diff --git a/libre/parabolaweb-git/parabolaweb.update.sh.in b/libre/parabolaweb-git/parabolaweb.update.sh.in
deleted file mode 100644
index 8c3aef0f0..000000000
--- a/libre/parabolaweb-git/parabolaweb.update.sh.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-set -e
-
-_install_dir=@INSTALL_DIR@
-_gitname=@GIT_NAME@
-
-_gitroot=@GITROOT@
-_gitbranch=@GITBRANCH@
-
-. /usr/bin/libremessages
-
-if [ ! -d "$_install_dir" ]; then
- mkdir "$_install_dir"
-fi
-cd "$_install_dir"
-
-msg "Connecting to GIT server...."
-if [ -d ${_gitname} ] ; then
- msg2 "Updating existing tree"
- cd ${_gitname} && git pull ${_gitroot}
-else
- msg2 "Cloning tree"
- git clone ${_gitroot} ${_gitname}
- cd ${_gitname}
-fi
-git checkout ${_gitbranch}
-msg "GIT checkout done or server timeout"
-
-msg "Purging old .pyc files...."
-find . -name '*.pyc' -delete
-
-msg "Checking configuration...."
-if [ ! -f local_settings.py ]; then
- cp local_settings.py.example local_settings.tmp.$$.py
- if ${EDITOR:-xdg-open} local_settings.tmp.$$.py; then
- mv local_settings.tmp.$$.py local_settings.py
- else
- rm local_settings.tmp.$$.py
- msg "Failed to configure, exiting"
- exit 1
- fi
- msg "Creating database...."
- ./manage.py syncdb
-fi
-
-msg "Purging old .pyc files...."
-find . -name '*.pyc' -delete
-
-msg "Updating database...."
-msg2 "Running migrations...."
-./manage.py migrate
-msg2 "Loading fixtures...."
-./manage.py loaddata */fixtures/*.json
-
-msg "Checking media/admin_media symlink...."
-if [ ! -e media/admin-media ]; then
- rm media/admin_media
- ln -s /usr/lib/python2.7/site-packages/django/contrib/admin/media media/admin_media
-fi
diff --git a/libre/parabolaweb-git/requirements_prod.txt b/libre/parabolaweb-git/requirements_prod.txt
deleted file mode 100644
index 78eb51250..000000000
--- a/libre/parabolaweb-git/requirements_prod.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Django==1.3.1
-Markdown>=2.0.3
-psycopg2
-South>=0.7.3
-pyinotify>=0.9.2
-python-memcached>=1.47
-pytz>=2011n
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
new file mode 100644
index 000000000..e0b70ba1a
--- /dev/null
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -0,0 +1,55 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+. helper.sh
+# provides:
+# _get_pkgver
+# _get_depends
+# _get_depends_nover (no version requirements)
+
+pkgname=parabolaweb-utils
+pkgver=`_get_pkgver`
+pkgrel=5
+pkgdesc="Utils for the Parabola website"
+arch=('any')
+url="https://projects.parabolagnulinux.org/parabolaweb.git/"
+license=('GPL2')
+depends=(
+ 'python2' # duh
+ 'python2-flup' # for fcgi
+ 'postgresql' # for database
+ 'git' # used in parabolaweb-update
+ 'libretools' # used in parabolaweb-update
+ `_get_depends`)
+backup=('etc/conf.d/parabolaweb')
+
+export pkgver
+
+source=(git://parabolagnulinux.org/parabolaweb.git
+ parabolaweb-download
+ parabolaweb-update
+ parabolaweb-fcgi
+ parabolaweb.rc
+ parabolaweb.service
+ parabolaweb.conf)
+
+build() {
+ :
+}
+
+package() {
+ cd "${srcdir}"
+ install -Dm755 parabolaweb-download "${pkgdir}/usr/sbin/parabolaweb-download"
+ install -Dm755 parabolaweb-update "${pkgdir}/usr/sbin/parabolaweb-update"
+ install -Dm755 parabolaweb-fcgi "${pkgdir}/usr/sbin/parabolaweb-fcgi"
+ install -Dm755 parabolaweb.rc "${pkgdir}/etc/rc.d/parabolaweb"
+ install -Dm644 parabolaweb.service "${pkgdir}/usr/lib/systemd/system/parabolaweb.service"
+ install -Dm644 parabolaweb.conf "${pkgdir}/etc/conf.d/parabolaweb"
+}
+
+md5sums=('SKIP'
+ '01bed679a4fd768e720bfd0f3c7d6694'
+ 'a73063b14746720b77fdbab851f5c161'
+ 'd5294495f42df29d29519ebd0a8f6093'
+ 'cc15e153f99fba82e7bb032896f655c2'
+ 'a468016a7155b5da46521dcfc6428384'
+ '9b565ef07e44d395bf7a0e484e3d19d1')
diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh
new file mode 100644
index 000000000..5ce4182b3
--- /dev/null
+++ b/libre/parabolaweb-utils/helper.sh
@@ -0,0 +1,39 @@
+_mksource() {
+ if [[ -z _DO_NOT_RUN_MKSOURCE ]]; then
+ _DO_NOT_RUN_MKSOURCE=true makepkg -o
+ fi
+}
+
+_get_pkgver() {
+ if [[ -n $pkgver ]] && [[ $pkgver != 0.bogus ]]; then
+ echo $pkgver
+ else
+ _mksource 1>&2
+ if [[ -f "${srcdir:-src}/parabolaweb/requirements_prod.txt" ]]; then
+ pushd "${srcdir:-src}/parabolaweb" >/dev/null
+ # get the date requirements_prod.txt was last modified
+ gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
+ date -u +%Y%m%d.%H%M -d "$gitdate"
+ popd >/dev/null
+ else
+ echo 0.bogus
+ fi
+ fi
+}
+
+_get_depends() {
+ _mksource 1>&2
+ if [[ -f "${srcdir:-src}/parabolaweb/requirements_prod.txt" ]]; then
+ pushd "${srcdir:-src}" >/dev/null
+ python2_packages='markdown|psycopg2|pyinotify|pytz|south'
+ < parabolaweb/requirements_prod.txt sed -r \
+ -e 's/.*/\L&/' -e 's/==/=/' \
+ -e 's/^python-memcached/python2-memcached/' \
+ -e "s/^(${python2_packages})/python2-&/"
+ popd >/dev/null
+ fi
+}
+
+_get_depends_nover() {
+ _get_depends | sed 's/[<>=].*//'
+}
diff --git a/libre/parabolaweb-utils/parabolaweb-download b/libre/parabolaweb-utils/parabolaweb-download
new file mode 100644
index 000000000..823a18811
--- /dev/null
+++ b/libre/parabolaweb-utils/parabolaweb-download
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+. /etc/conf.d/parabolaweb
+. /usr/bin/libremessages
+
+dir=$WEBDIR
+repo=git://parabolagnulinux.org/parabolaweb.git
+ref=master
+
+cd_safe() {
+ if ! cd "$1"; then
+ error "$(gettext "Failed to change to directory %s")" "$1"
+ plain "$(gettext "Aborting...")"
+ exit 1
+ fi
+}
+
+download_git() {
+ if [[ ! -d "$dir/.git" ]] ; then
+ msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git"
+ if ! git clone "$repo" "$dir"; then
+ error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git"
+ plain "$(gettext "Aborting...")"
+ exit 1
+ fi
+ else
+ cd_safe "$dir"
+ # Make sure we are fetching the right repo
+ # if [[ "$repo" != "$(git config --get remote.origin.url)" ]] ; then
+ # error "$(gettext "%s is not a clone of %s")" "$dir" "$repo"
+ # plain "$(gettext "Aborting...")"
+ # exit 1
+ # fi
+ msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git"
+ if ! git pull origin "$ref"; then
+ # only warn on failure to allow offline builds
+ warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git"
+ fi
+ fi
+}
+
+main() {
+ [[ -d "${dir%/*}" ]] || mkdir -p "${dir%/*}"
+ download_git
+}
+
+main "$@"
diff --git a/libre/parabolaweb-utils/parabolaweb-fcgi b/libre/parabolaweb-utils/parabolaweb-fcgi
new file mode 100644
index 000000000..e42aec3cd
--- /dev/null
+++ b/libre/parabolaweb-utils/parabolaweb-fcgi
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+. /etc/conf.d/parabolaweb
+
+[[ -e ${WEBDIR}/manage.py ]]
+
+sudo -u "${WEBUSER:-$USER}" python2 "${WEBDIR}/manage.py" runfcgi \
+ host=${HOST} \
+ port=${PORT} \
+ --settings=settings \
+ "$@"
diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update
new file mode 100644
index 000000000..45e17c4f2
--- /dev/null
+++ b/libre/parabolaweb-utils/parabolaweb-update
@@ -0,0 +1,80 @@
+#!/bin/bash
+set -e
+
+. /etc/conf.d/parabolaweb
+. /usr/bin/libremessages
+
+find_makefiles() {
+ pushd "$WEBDIR" > /dev/null
+ echo ./sitestatic
+ find . -name static -type d | while read dir; do
+ if [[ -e "$WEBDIR/$dir/Makefile" ]]; then
+ printf '%s\n' "$dir"
+ fi
+ done
+}
+
+clean() {
+ msg "Purging old .pyc files...."
+ cd "$WEBDIR"
+ find . -name '*.pyc' -delete
+ for dir in `find_makefiles`; do
+ make -C "$WEBDIR/$dir" clean
+ done
+}
+
+configure() {
+ msg "Checking configuration...."
+ cd "$WEBDIR"
+ if [[ ! -f local_settings.py ]]; then
+ msg2 "Configuration file missing, opening editor..."
+ cp local_settings.py.example local_settings.tmp.$$.py
+ if "$EDITOR" local_settings.tmp.$$.py; then
+ mv local_settings.tmp.$$.py local_settings.py
+ else
+ rm local_settings.tmp.$$.py
+ msg "Failed to configure, exiting"
+ exit 1
+ fi
+ msg2 "Creating database...."
+ ./manage.py syncdb
+ else
+ msg2 "Current configuration checks out"
+ fi
+}
+
+update-database() {
+ msg "Updating database...."
+ cd "$WEBDIR"
+ msg2 "Running migrations...."
+ ./manage.py migrate
+ msg2 "Loading fixtures...."
+ ./manage.py loaddata */fixtures/*.json
+}
+
+update-filesystem() {
+ msg "Updating filesystem..."
+ for dir in `find_makefiles`; do
+ msg2 "Updating $dir with GNU Make..."
+ make -C "$WEBDIR/$dir"
+ done
+ cd "$WEBDIR"
+ msg2 "Collecting static files..."
+ echo yes | ./manage.py collectstatic -l
+}
+
+main() {
+ if [[ -z "$EDITOR" ]]; then
+ error 'Please set the $EDITOR variable'
+ exit 1
+ fi
+
+ parabolaweb-download
+ clean
+ configure
+ clean
+ update-database
+ update-filesystem
+}
+
+main "$@"
diff --git a/libre/parabolaweb-utils/parabolaweb.conf b/libre/parabolaweb-utils/parabolaweb.conf
new file mode 100644
index 000000000..467e62e2c
--- /dev/null
+++ b/libre/parabolaweb-utils/parabolaweb.conf
@@ -0,0 +1,4 @@
+HOST=127.0.0.1
+PORT=8090 # 80 is nginx
+WEBDIR=/srv/http/web
+WEBUSER=nobody
diff --git a/libre/parabolaweb-utils/parabolaweb.rc b/libre/parabolaweb-utils/parabolaweb.rc
new file mode 100644
index 000000000..5e310b01d
--- /dev/null
+++ b/libre/parabolaweb-utils/parabolaweb.rc
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PIDFILE=/run/web/parabolaweb.pid
+
+case $1 in
+start)
+ stat_busy "Starting ParabolaWeb"
+ install -dm777 ${PIDFILE%/*}
+ if parabolaweb-fcgi pidfile=${PIDFILE}; then
+ add_daemon parabolaweb
+ stat_done
+ exit 0
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+stop)
+ stat_busy "Stopping ParabolaWeb"
+ if [[ -f ${PIDFILE} ]]; then
+ pid=$(cat ${PIDFILE})
+ kill ${pid}
+ rm_daemon parabolaweb
+ stat_done
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+restart)
+ $0 stop
+ $0 start
+ ;;
+
+*)
+ echo "Usage: $0 {start|stop|restart}" >&2
+ exit 1
+
+esac
diff --git a/libre/parabolaweb-utils/parabolaweb.service b/libre/parabolaweb-utils/parabolaweb.service
new file mode 100644
index 000000000..a59d58512
--- /dev/null
+++ b/libre/parabolaweb-utils/parabolaweb.service
@@ -0,0 +1,13 @@
+[Unit]
+Requires=postgresql.service
+After=postgresql.service
+Description=ParabolaWeb
+
+[Service]
+Type=forking
+PIDFile=/run/web/parabolaweb.pid
+ExecStartPre=/usr/bin/install -dm777 /run/web
+ExecStart=/usr/sbin/parabolaweb-fcgi pidfile=/run/web/parabolaweb.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/psutils-libre/.directory b/libre/psutils-libre/.directory
deleted file mode 100644
index 60ed4bded..000000000
--- a/libre/psutils-libre/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,4,11,16,24,1
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index 25e88f492..25e88f492 100644..100755
--- 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 100644..100755
--- a/libre/psutils-libre/psutils-1.17.diff
+++ b/libre/psutils-libre/psutils-1.17.diff
diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD
deleted file mode 100644
index e0dfc9d9c..000000000
--- a/libre/python-reportlab-libre/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 29478 2010-10-14 14:58:41Z angvp $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor: borgo <nomail>
-
-pkgname=python-reportlab-libre
-_origname=reportlab
-pkgver=2.5
-pkgrel=1
-pkgdesc="A proven industry-strength PDF generating solution"
-arch=('i686' 'x86_64')
-depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging')
-license=('custom')
-source=(http://www.reportlab.org/ftp/${_origname}-$pkgver.tar.gz
- free-fonts.patch)
-url="http://www.reportlab.org/rl_toolkit.html"
-md5sums=('cdf8b87a6cf1501de1b0a8d341a217d3'
- '1fc63857754cf3e2987d2400d94e7cd7')
-provides=("python-reportlab=$pkgver")
-conflicts=('python-reportlab')
-replaces=('python-reportlab')
-optdepends=('ghostscript')
-
-build() {
- cd $srcdir/${_origname}-$pkgver
-
- # python2 fix
- for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \
- src/reportlab/pdfgen/pycanvas.py; do
- sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file
- done
-
- rm -f reportlab/fonts/Vera* reportlab/fonts/bitstream-vera-license.txt
- patch -p1 -i $srcdir/free-fonts.patch
-
- python2 setup.py install --root=$pkgdir
- install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
-}
diff --git a/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch b/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch
deleted file mode 100644
index ed8154df5..000000000
--- a/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-
-# HG changeset patch
-# User Charles-François Natali <neologix@free.fr>
-# Date 1318446474 -7200
-# Node ID ee4fe16d9b4822457ad855ea6c44e65030166304
-# Parent f6feed6ec3f9b024cecd0fd587595c403f55624f
-Issue #13156: revert changeset f6feed6ec3f9, which was only relevant for native
-TLS implementations, and fails with the ad-hoc TLS implementation when a thread
-doesn't have an auto thread state (e.g. a thread created outside of Python
-calling into a subinterpreter).
-
-diff --git a/Include/pystate.h b/Include/pystate.h
---- a/Include/pystate.h
-+++ b/Include/pystate.h
-@@ -111,7 +111,6 @@ PyAPI_FUNC(void) PyThreadState_Clear(PyT
- PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
- #ifdef WITH_THREAD
- PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
--PyAPI_FUNC(void) _PyGILState_Reinit(void);
- #endif
-
- PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
-diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
---- a/Modules/signalmodule.c
-+++ b/Modules/signalmodule.c
-@@ -976,7 +976,6 @@ void
- PyOS_AfterFork(void)
- {
- #ifdef WITH_THREAD
-- _PyGILState_Reinit();
- PyEval_ReInitThreads();
- main_thread = PyThread_get_thread_ident();
- main_pid = getpid();
-diff --git a/Python/pystate.c b/Python/pystate.c
---- a/Python/pystate.c
-+++ b/Python/pystate.c
-@@ -537,23 +537,6 @@ void
- autoInterpreterState = NULL;
- }
-
--/* Reset the TLS key - called by PyOS_AfterFork.
-- * This should not be necessary, but some - buggy - pthread implementations
-- * don't flush TLS on fork, see issue #10517.
-- */
--void
--_PyGILState_Reinit(void)
--{
-- PyThreadState *tstate = PyGILState_GetThisThreadState();
-- PyThread_delete_key(autoTLSkey);
-- if ((autoTLSkey = PyThread_create_key()) == -1)
-- Py_FatalError("Could not allocate TLS entry");
--
-- /* re-associate the current thread state with the new key */
-- if (PyThread_set_key_value(autoTLSkey, (void *)tstate) < 0)
-- Py_FatalError("Couldn't create autoTLSkey mapping");
--}
--
- /* When a thread state is created for a thread by some mechanism other than
- PyGILState_Ensure, it's important that the GILState machinery knows about
- it so it doesn't try to create another thread state for the thread (this is
-
diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD
deleted file mode 100644
index e743151b0..000000000
--- a/libre/python2-libre/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id: PKGBUILD 129895 2011-06-29 15:22:59Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributer: Allan McRae <allan@archlinux.org>
-# Contributer: Jason Chu <jason@archlinux.org>
-
-_pkgname=python2
-pkgname=python2-libre
-pkgver=2.7.2
-pkgrel=6
-_pybasever=2.7
-pkgdesc="A high-level scripting language"
-arch=('i686' 'x86_64')
-license=('PSF')
-url="http://www.python.org/"
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk')
-optdepends=('tk: for IDLE')
-conflicts=('python<3')
-options=('!makeflags')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-4-any.src.tar.xz
- doc_license_change.patch
- WDAS.patch
- linux2.patch
- gdbm-magic-values.patch
- 13156-revert-tls-changeset-subinterpreter.patch)
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-
-build() {
- cd "${srcdir}/Python-${pkgver}"
-
- # Temporary workaround for FS#22322
- # See http://bugs.python.org/issue10835 for upstream report
- sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
-
- # Enable built-in SQLite module to load extensions (fix FS#22122)
- sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
-
- # FS#23997
- sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
-
- # Make sure sys.platform is set to linux2, even on kernel 3.X
- # cf http://bugs.python.org/issue12326
- patch -Np1 -i ../linux2.patch
-
- # gdbm has new magic that whichdb does not recognize
- # http://bugs.python.org/issue13007
- patch -Np1 -i ../gdbm-magic-values.patch
-
- # http://bugs.python.org/issue13156
- patch -Np1 -i ../13156-revert-tls-changeset-subinterpreter.patch
-
- # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
- # rather than copies shipped in the tarball
- rm -r Modules/expat
- rm -r Modules/zlib
- rm -r Modules/_ctypes/{darwin,libffi}*
-
- export OPT="${CFLAGS}"
- ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
- --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
- --with-dbmliborder=gdbm:ndbm
-
- make MACHDEP=linux2
-}
-
-package() {
- cd "${srcdir}/Python-${pkgver}"
- make DESTDIR="${pkgdir}" altinstall maninstall
-
- ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2"
- ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config"
- ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1"
-
- ln -sf ../../libpython${_pybasever}.so \
- "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so"
-
- mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/"
-
- # some useful "stuff"
- install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
- install -m755 Tools/i18n/{msgfmt,pygettext}.py \
- "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/"
- install -m755 Tools/scripts/{README,*py} \
- "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/"
-
- # fix conflicts with python
- mv "${pkgdir}"/usr/bin/idle{,2}
- mv "${pkgdir}"/usr/bin/pydoc{,2}
- mv "${pkgdir}"/usr/bin/2to3{,-2.7}
-
- # clean up #!s
- find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \
- xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
- # clean-up reference to build directory
- sed -i "s#${srcdir}/Python-${pkgver}:##" \
- "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
-
- # license
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-md5sums=('456d053a5d418adc913a4971e95fe918'
- '1e6595f85a1da7f42b69456119924d50'
- '3f8c0e310a0be0bd8b319d6c46bbd427'
- '6099a7c1aed80cf04943ee4affa84b5c'
- '6de394351179c2ada82e95458ceb13e5'
- 'daa5110f092f1406c17de23171529e62')
diff --git a/libre/python2-libre/SRCBUILD b/libre/python2-libre/SRCBUILD
deleted file mode 100644
index f021d6624..000000000
--- a/libre/python2-libre/SRCBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer (Parabola): xihh
-
-pkgname=python2-libre
-pkgver=2.7.2
-pkgrel=4
-pkgdesc="A high-level scripting language"
-arch=('any')
-license=('PSF')
-url="http://www.python.org/"
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
- doc_license_change.patch
- WDAS.patch)
-md5sums=('75c87a80c6ddb0b785a57ea3583e04fa'
- '1e6595f85a1da7f42b69456119924d50'
- '3f8c0e310a0be0bd8b319d6c46bbd427')
-options=(!strip docs libtool emptydirs !zipman !purge)
-
-build() {
- cd "${srcdir}/Python-${pkgver}"
-
- export PKGEXT=.src.tar.xz
-
- patch -Np1 -i ../WDAS.patch
- patch -Np0 -i ../doc_license_change.patch
-
-}
-
-package() {
- export PKGEXT=.src.tar.xz
- export PKGDEST=${startdir}
-
- mv "${srcdir}/Python-${pkgver}" ${pkgdir}
-
-}
diff --git a/libre/python2-libre/WDAS.patch b/libre/python2-libre/WDAS.patch
deleted file mode 100644
index 86bc75e8c..000000000
--- a/libre/python2-libre/WDAS.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -r ac562d86ab71 Lib/profile.py
---- a/Lib/profile.py Fri Jun 03 17:50:59 2011 -0500
-+++ b/Lib/profile.py Mon Jun 27 00:02:20 2011 -0700
-@@ -2,35 +2,26 @@
- #
- # Class for profiling python code. rev 1.0 6/2/94
- #
-+# Written by James Roskind
- # Based on prior profile module by Sjoerd Mullender...
- # which was hacked somewhat by: Guido van Rossum
-
- """Class for profiling Python code."""
-
--# Copyright 1994, by InfoSeek Corporation, all rights reserved.
--# Written by James Roskind
--#
--# Permission to use, copy, modify, and distribute this Python software
--# and its associated documentation for any purpose (subject to the
--# restriction in the following sentence) without fee is hereby granted,
--# provided that the above copyright notice appears in all copies, and
--# that both that copyright notice and this permission notice appear in
--# supporting documentation, and that the name of InfoSeek not be used in
--# advertising or publicity pertaining to distribution of the software
--# without specific, written prior permission. This permission is
--# explicitly restricted to the copying and modification of the software
--# to remain in Python, compiled Python, or other languages (such as C)
--# wherein the modified or derived code is exclusively imported into a
--# Python module.
--#
--# INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
--# SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
--# FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
--# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
--# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
--# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
--# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--
-+# Copyright Disney Enterprises, Inc. All Rights Reserved.
-+# Licensed to PSF under a Contributor Agreement
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-+# either express or implied. See the License for the specific language
-+# governing permissions and limitations under the License.
-
-
- import sys
-diff -r ac562d86ab71 Lib/pstats.py
---- a/Lib/pstats.py Fri Jun 03 17:50:59 2011 -0500
-+++ b/Lib/pstats.py Mon Jun 27 00:02:20 2011 -0700
-@@ -2,34 +2,26 @@
-
- # Class for printing reports on profiled python code. rev 1.0 4/1/94
- #
-+# Written by James Roskind
- # Based on prior profile module by Sjoerd Mullender...
- # which was hacked somewhat by: Guido van Rossum
--#
--# see profile.py for more info.
-
--# Copyright 1994, by InfoSeek Corporation, all rights reserved.
--# Written by James Roskind
--#
--# Permission to use, copy, modify, and distribute this Python software
--# and its associated documentation for any purpose (subject to the
--# restriction in the following sentence) without fee is hereby granted,
--# provided that the above copyright notice appears in all copies, and
--# that both that copyright notice and this permission notice appear in
--# supporting documentation, and that the name of InfoSeek not be used in
--# advertising or publicity pertaining to distribution of the software
--# without specific, written prior permission. This permission is
--# explicitly restricted to the copying and modification of the software
--# to remain in Python, compiled Python, or other languages (such as C)
--# wherein the modified or derived code is exclusively imported into a
--# Python module.
--#
--# INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
--# SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
--# FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
--# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
--# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
--# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
--# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+"""Class for profiling Python code."""
-+
-+# Copyright Disney Enterprises, Inc. All Rights Reserved.
-+# Licensed to PSF under a Contributor Agreement
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-+# either express or implied. See the License for the specific language
-+# governing permissions and limitations under the License.
-
-
- import sys
diff --git a/libre/python2-libre/doc_license_change.patch b/libre/python2-libre/doc_license_change.patch
deleted file mode 100644
index 18f9447d7..000000000
--- a/libre/python2-libre/doc_license_change.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- Doc/library/profile.rst 2011-06-11 12:46:23.000000000 -0300
-+++ Doc/library/profile.rst.orig 2011-08-12 11:35:25.000000000 -0300
-@@ -12,27 +12,23 @@
-
- .. index:: single: InfoSeek Corporation
-
--Copyright © 1994, by InfoSeek Corporation, all rights reserved.
-+Copyright Disney Enterprises, Inc. All Rights Reserved.
-
- Written by James Roskind. [#]_
-
--Permission to use, copy, modify, and distribute this Python software and its
--associated documentation for any purpose (subject to the restriction in the
--following sentence) without fee is hereby granted, provided that the above
--copyright notice appears in all copies, and that both that copyright notice and
--this permission notice appear in supporting documentation, and that the name of
--InfoSeek not be used in advertising or publicity pertaining to distribution of
--the software without specific, written prior permission. This permission is
--explicitly restricted to the copying and modification of the software to remain
--in Python, compiled Python, or other languages (such as C) wherein the modified
--or derived code is exclusively imported into a Python module.
--
--INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
--INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
--SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
--DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
--WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
--OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+Licensed to PSF under a Contributor Agreement
-+
-+Licensed under the Apache License, Version 2.0 (the "License");
-+you may not use this file except in compliance with the License.
-+You may obtain a copy of the License at
-+
-+http://www.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-+either express or implied. See the License for the specific language
-+governing permissions and limitations under the License.
-
- .. _profiler-introduction:
-
diff --git a/libre/python2-libre/gdbm-magic-values.patch b/libre/python2-libre/gdbm-magic-values.patch
deleted file mode 100644
index 471faf2c7..000000000
--- a/libre/python2-libre/gdbm-magic-values.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py
---- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic 2011-06-11 11:46:26.000000000 -0400
-+++ Python-2.7.2/Lib/whichdb.py 2011-09-30 15:45:21.778872290 -0400
-@@ -91,7 +91,7 @@ def whichdb(filename):
- return ""
-
- # Check for GNU dbm
-- if magic == 0x13579ace:
-+ if magic in (0x13579ace, 0x13579acd, 0x13579acf):
- return "gdbm"
-
- # Check for old Berkeley db hash file format v2
diff --git a/libre/python2-libre/linux2.patch b/libre/python2-libre/linux2.patch
deleted file mode 100644
index 670510fde..000000000
--- a/libre/python2-libre/linux2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://hg.python.org/cpython/rev/c816479f6aaf/
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -2995,6 +2995,7 @@ then
- MACHDEP="$ac_md_system$ac_md_release"
-
- case $MACHDEP in
-+ linux*) MACHDEP="linux2";;
- cygwin*) MACHDEP="cygwin";;
- darwin*) MACHDEP="darwin";;
- atheos*) MACHDEP="atheos";;
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -293,6 +293,7 @@ then
- MACHDEP="$ac_md_system$ac_md_release"
-
- case $MACHDEP in
-+ linux*) MACHDEP="linux2";;
- cygwin*) MACHDEP="cygwin";;
- darwin*) MACHDEP="darwin";;
- atheos*) MACHDEP="atheos";;
diff --git a/libre/python2-ply/PKGBUILD b/libre/python2-ply/PKGBUILD
index fec80926a..fec80926a 100644..100755
--- a/libre/python2-ply/PKGBUILD
+++ b/libre/python2-ply/PKGBUILD
diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD
new file mode 100755
index 000000000..27014d100
--- /dev/null
+++ b/libre/python2-reportlab-libre/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 67753 2012-03-14 10:35:58Z giovanni $
+# Maintainer:
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor: borgo <nomail>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgbase=python-reportlab-libre
+pkgname=python2-reportlab-libre
+_origname=reportlab
+pkgver=2.6
+pkgrel=1
+pkgdesc="A proven industry-strength PDF generating solution (without non-free Adobe T1 fonts)"
+arch=('i686' 'x86_64')
+url="http://www.reportlab.org/rl_toolkit.html"
+depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging')
+conflicts=('python2-reportlab' 'python-reportlab<=2.5-2')
+replaces=('python2-reportlab' 'python-reportlab<=2.5-2')
+provides=("python2-reportlab=$pkgver")
+license=('custom')
+source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz
+ free-fonts.patch)
+md5sums=('e5d27a24a2c8456b168913242aa1940f'
+ '1588b88851711cc6c868db4c7d4f4dea')
+optdepends=('ghostscript')
+
+build() {
+ cd $srcdir/${_origname}-$pkgver
+
+ # remove non-free Adobe T1 fonts
+ patch -p1 -i $srcdir/free-fonts.patch
+
+ # Parabola contains those fonts from the ttf-bitstream-vera package
+ rm -f src/reportlab/fonts/{bitstream-vera-license.txt,Vera*}
+
+ # python2 fix
+ for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \
+ src/reportlab/pdfgen/pycanvas.py; do
+ sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file
+ done
+}
+
+package_python2-reportlab-libre() {
+ cd $srcdir/${_origname}-$pkgver
+
+ python2 setup.py install --root=$pkgdir --optimize=1
+ install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
+}
diff --git a/libre/python-reportlab-libre/free-fonts.patch b/libre/python2-reportlab-libre/free-fonts.patch
index 9c79839b6..b2683931b 100644
--- a/libre/python-reportlab-libre/free-fonts.patch
+++ b/libre/python2-reportlab-libre/free-fonts.patch
@@ -1,6 +1,6 @@
-diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py
---- reportlab-2.5-orig/setup.py 2010-06-16 13:56:53.000000000 +0200
-+++ reportlab-2.5/setup.py 2011-01-06 11:01:50.263333455 +0100
+diff -rupN reportlab-2.6.orig/setup.py reportlab-2.6/setup.py
+--- reportlab-2.6.orig/setup.py 2012-09-27 13:14:06.000000000 -0300
++++ reportlab-2.6/setup.py 2012-10-18 14:34:16.750336101 -0200
@@ -222,11 +222,11 @@ def get_fonts(PACKAGE_DIR, reportlab_fil
infoline("Standard T1 font curves already downloaded")
return
@@ -8,10 +8,10 @@ diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py
- infoline("Downloading standard T1 font curves")
+ #infoline("Downloading standard T1 font curves")
-- remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip")
+- remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip")
- zipdata = StringIO.StringIO(remotehandle.read())
- remotehandle.close()
-+ #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip")
++ #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip")
+ #zipdata = StringIO.StringIO(remotehandle.read())
+ #remotehandle.close()
archive = zipfile.ZipFile(zipdata)
@@ -26,9 +26,9 @@ diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py
def main():
#test to see if we've a special command
-diff -rupN reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.5/src/reportlab/pdfbase/_fontdata.py
---- reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py 2010-02-10 22:01:22.000000000 +0100
-+++ reportlab-2.5/src/reportlab/pdfbase/_fontdata.py 2011-01-06 11:03:59.459999025 +0100
+diff -rupN reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.6/src/reportlab/pdfbase/_fontdata.py
+--- reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py 2012-09-27 11:39:39.000000000 -0300
++++ reportlab-2.6/src/reportlab/pdfbase/_fontdata.py 2012-10-18 14:36:08.018365073 -0200
@@ -72,20 +72,20 @@ _font2fnrMapWin32 = {
}
if sys.platform in ('linux2',):
@@ -64,9 +64,9 @@ diff -rupN reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.5/s
}
_font2fnrMap = _font2fnrMapLinux2
for k, v in _font2fnrMap.items():
-diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/reportlab/rl_config.py
---- reportlab-2.5-orig/src/reportlab/rl_config.py 2010-09-30 13:27:09.000000000 +0200
-+++ reportlab-2.5/src/reportlab/rl_config.py 2011-01-06 11:01:50.266666714 +0100
+diff -rupN reportlab-2.6.orig/src/reportlab/rl_config.py reportlab-2.6/src/reportlab/rl_config.py
+--- reportlab-2.6.orig/src/reportlab/rl_config.py 2012-09-27 11:39:39.000000000 -0300
++++ reportlab-2.6/src/reportlab/rl_config.py 2012-10-18 16:05:12.683766581 -0200
@@ -49,25 +49,7 @@ ttfAsciiReadable= 1
# places to look for T1Font information
@@ -137,8 +137,8 @@ diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/repor
- 'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap',
- 'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap',
- 'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap',
-+ '/usr/share/ghostscript/8.71/Resource/CMap',
-+ '/usr/share/ghostscript/9.00/Resource/CMap',
++ '/usr/share/ghostscript/9.04/Resource/CMap',
++ '/usr/share/ghostscript/9.06/Resource/CMap',
'%(REPORTLAB_DIR)s/fonts/CMap', #special
'%(REPORTLAB_DIR)s/../fonts/CMap', #special
'%(REPORTLAB_DIR)s/../../fonts/CMap', #special
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index a360e113e..f418684b5 100644..100755
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,59 +1,48 @@
-# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $
+# $Id: PKGBUILD 166893 2012-09-20 23:56:51Z eric $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: orelien <aurelien.foret@wanadoo.fr>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+_pkgname=rp-pppoe
pkgname=rp-pppoe-libre
-pkgver=3.10
-pkgrel=7
+pkgver=3.11
+pkgrel=1
pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed."
arch=('i686' 'x86_64')
url="http://www.roaringpenguin.com/pppoe/"
license=('GPL')
depends=('ppp>=2.4.5' 'sh' 'net-tools')
+backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq
+ etc/ppp/pppoe-server-options)
options=('!makeflags')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
-source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz adsl
- $pkgname.patch)
-install=rp-pppoe.install
provides=("rp-pppoe=$pkgver")
replaces=('rp-pppoe')
conflicts=('rp-pppoe')
+install=rp-pppoe.install
+source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig}
+ adsl adsl.service $pkgname.patch)
+md5sums=('13b5900c56bd602df6cc526e5e520722'
+ '8fc724aa146dba52ef7b3fbe5b8784c6'
+ 'adace1ad441aa88dcb3db52fb7f9c97f'
+ 'af234125f956f3a356ab0d0fcaa9e8a2'
+ '3c53d550ac408608abb0b6cd6b76b6c2')
-mksource() {
- wget http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz \
- -O - | tar xzf -
-
- pushd rp-pppoe-$pkgver >/dev/null
-
- patch -Np1 -i ../rp-pppoe-libre.patch
-
- popd >/dev/null
-
- mv -v rp-pppoe-$pkgver $pkgname-$pkgver
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ ## Adding patch to remove unfree software recommendation (ServPoET)
+ patch -Np1 -i "$srcdir/rp-pppoe-libre.patch"
- tar czvf $pkgname-$pkgver.tar.gz $pkgname-$pkgver/
-}
+ cd ./src
-build() {
- cd $srcdir/$pkgname-$pkgver/src
./configure --prefix=/usr --enable-plugin
- make PLUGIN_DIR="/usr/lib/rp-pppoe"
+ make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
}
package() {
- cd $srcdir/$pkgname-$pkgver/src
- make DESTDIR=$pkgdir install
-
- #moving .so files to /usr/lib according to FS#13876
- mkdir -p ${pkgdir}/usr/lib/rp-pppoe
- mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/
- #not necessary after moving the plugin
- rm -rf ${pkgdir}/etc/ppp/plugins
- #changing config to the new path
- #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf
+ cd "$srcdir/$_pkgname-$pkgver/src"
+ make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
- install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl
+ install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
+ install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
}
-md5sums=('2c4a678fa684269ff4579bb639674198'
- 'adace1ad441aa88dcb3db52fb7f9c97f'
- '9f0d49c3a550c5ad76bb70d65c9d97b2')
diff --git a/libre/rp-pppoe-libre/adsl b/libre/rp-pppoe-libre/adsl
index 33bd91839..33bd91839 100644..100755
--- a/libre/rp-pppoe-libre/adsl
+++ b/libre/rp-pppoe-libre/adsl
diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service
new file mode 100644
index 000000000..324164943
--- /dev/null
+++ b/libre/rp-pppoe-libre/adsl.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=ADSL Deamon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pppoe-start
+ExecStop=/usr/sbin/pppoe-stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
index 4f2302496..9cf16d7d7 100644
--- a/libre/rp-pppoe-libre/rp-pppoe-libre.patch
+++ b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
@@ -1,7 +1,7 @@
-diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec
---- rp-pppoe-3.10/rp-pppoe.spec 2008-06-30 11:00:41.000000000 -0300
-+++ rp-pppoe-3.10-libre//rp-pppoe.spec 2011-06-05 21:03:06.000000000 -0300
-@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
+diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec
+--- rp-pppoe-3.11.orig/rp-pppoe.spec 2012-08-17 15:31:25.000000000 -0300
++++ rp-pppoe-3.11/rp-pppoe.spec 2012-10-05 01:42:29.964508454 -0300
+@@ -55,7 +55,7 @@
%files
%defattr(-,root,root)
@@ -10,9 +10,9 @@ diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec
%config(noreplace) /etc/ppp/pppoe.conf
%config(noreplace) /etc/ppp/pppoe-server-options
%config(noreplace) /etc/ppp/firewall-masq
-diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET
---- rp-pppoe-3.10/SERVPOET 2008-06-30 11:00:41.000000000 -0300
-+++ rp-pppoe-3.10-libre//SERVPOET 1969-12-31 21:00:00.000000000 -0300
+diff -Nur rp-pppoe-3.11.orig/SERVPOET /dev/null
+--- rp-pppoe-3.11.orig/SERVPOET 2012-08-17 15:31:25.000000000 -0300
++++ /dev/null 2012-10-05 01:27:08.580078512 -0300
@@ -1,18 +0,0 @@
-# LIC: GPL
-
@@ -32,10 +32,10 @@ diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET
-
---
-David F. Skoll <dfs@roaringpenguin.com>
-diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
---- rp-pppoe-3.10/src/Makefile.in 2008-06-30 11:00:42.000000000 -0300
-+++ rp-pppoe-3.10-libre//src/Makefile.in 2011-06-05 21:03:51.000000000 -0300
-@@ -44,9 +44,6 @@ PPPOE_RELAY=@PPPOE_RELAY@
+diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in
+--- rp-pppoe-3.11.orig/src/Makefile.in 2012-08-17 15:31:25.000000000 -0300
++++ rp-pppoe-3.11/src/Makefile.in 2012-10-05 01:46:13.121336619 -0300
+@@ -44,9 +44,6 @@
PPPOE_PATH=$(sbindir)/pppoe
PPPD_PATH=@PPPD@
@@ -45,7 +45,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
# Kernel-mode plugin gets installed here.
PLUGIN_DIR=/etc/ppp/plugins
PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so
-@@ -151,7 +148,6 @@ install: all
+@@ -152,7 +149,6 @@
$(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir)
$(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir)
$(install) -m 644 ../README $(DESTDIR)$(docdir)
@@ -53,7 +53,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
$(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir)
-mkdir -p $(DESTDIR)$(mandir)/man8
for i in $(TARGETS) ; do \
-@@ -209,25 +205,15 @@ install: all
+@@ -210,25 +206,15 @@
@echo ""
@echo "Type 'pppoe-setup' to configure the software."
@@ -80,7 +80,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \
done
mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui
-@@ -282,10 +268,6 @@ rpms: tgz
+@@ -286,10 +272,6 @@
/usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \
/usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm
@@ -89,9 +89,9 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
- cd .. && rpm -ba servpoet.spec
-
clean:
- rm -f *.o pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~
+ rm -f *.o pppoe-relay pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~
test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true
-@@ -300,15 +282,13 @@ distclean: clean
+@@ -304,15 +286,13 @@
update-version:
sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-$(VERSION).tar.gz+' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
@@ -104,7 +104,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
licensed-only:
- $(MAKE) -C licensed-only all VERSION=$(VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION)
-+ $(MAKE) -C licensed-only all VERSION=$(VERSION)
++ $(MAKE) -C licensed-only all VERSION=$(VERSION)
l2tp: libevent/libevent.a
$(MAKE) -C l2tp all
diff --git a/libre/rp-pppoe-libre/rp-pppoe.install b/libre/rp-pppoe-libre/rp-pppoe.install
index 1d4bccce2..1d4bccce2 100644..100755
--- 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 3024bd9bf..9822d5df7 100644..100755
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,46 +1,52 @@
-# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $
-#mips64el Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 166672 2012-09-15 09:39:11Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
pkgname=sdl-libre
pkgver=1.2.15
-pkgrel=1.1
+pkgrel=3
pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
arch=('i686' 'x86_64')
url="http://www.libsdl.org"
license=('LGPL')
provides=("sdl=${pkgver}")
conflicts=('sdl')
+replaces=('sdl')
depends=('glibc' 'libxext' 'libxrender' 'libx11')
makedepends=('alsa-lib' 'mesa' 'libpulse')
-replaces=('sdl')
+optdepends=('alsa-lib: ALSA audio driver'
+ 'libpulse: PulseAudio audio driver')
options=('!libtool')
source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
sdl-1.2.14-fix-mouse-clicking.patch
sdl-1.2.14-disable-mmx.patch
- riva_mmio.patch
- no-riva-accel.patch)
+ fix_joystick_misc_axes.diff
+ libsdl-1.2.15-resizing.patch
+ libre.patch)
md5sums=('9d96df8417572a2afb781a7c4c811a85'
'04d8c179f125e04bcd4c9d60e013c2d7'
'e5c16b7611f62c7cb25f0534eff68852'
- 'f5ab9ba6ba2bb8df74d0f768f9df3ea8'
- 'eb2f5899db608ad27b379faa5e0beb80')
+ '687586a108b597a2a6b73070c1d37e51'
+ '3dd50347d8856160a9cbd7f80383a1f8'
+ '5c665f72b8a2adc97a91f6db6f2da79a')
build() {
- cd ${srcdir}/SDL-${pkgver}
- patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
- patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
- patch -Np0 -i $srcdir/riva_mmio.patch
- patch -Np0 -i $srcdir/no-riva-accel.patch
- ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+ cd SDL-$pkgver
+ patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
+ patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
+ patch -Np1 -i ../fix_joystick_misc_axes.diff
+ patch -Np1 -i ../libsdl-1.2.15-resizing.patch
+ patch -Np0 -i ../libre.patch
+ ./configure --prefix=/usr --disable-nasm --enable-alsa \
--with-x --disable-rpath --disable-static
make
}
package() {
- cd ${srcdir}/SDL-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd SDL-$pkgver
+ make DESTDIR="$pkgdir" install
}
diff --git a/libre/sdl-libre/fix_joystick_misc_axes.diff b/libre/sdl-libre/fix_joystick_misc_axes.diff
new file mode 100644
index 000000000..75e3755c9
--- /dev/null
+++ b/libre/sdl-libre/fix_joystick_misc_axes.diff
@@ -0,0 +1,13 @@
+diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
+index ee43974..80e46e4 100644
+--- a/src/joystick/linux/SDL_sysjoystick.c
++++ b/src/joystick/linux/SDL_sysjoystick.c
+@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
+ ++joystick->nbuttons;
+ }
+ }
+- for ( i=0; i<ABS_MISC; ++i ) {
++ for ( i=0; i<ABS_MAX; ++i ) {
+ /* Skip hats */
+ if ( i == ABS_HAT0X ) {
+ i = ABS_HAT3Y;
diff --git a/libre/sdl-libre/libre.patch b/libre/sdl-libre/libre.patch
new file mode 100644
index 000000000..72f7da56a
--- /dev/null
+++ b/libre/sdl-libre/libre.patch
@@ -0,0 +1,578 @@
+--- src/video/fbcon/riva_mmio.h 2012-01-19 04:30:06.000000000 -0200
++++ /dev/null 2012-04-01 13:58:27.776718756 -0300
+@@ -1,449 +0,0 @@
+-/***************************************************************************\
+-|* *|
+-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *|
+-|* *|
+-|* NOTICE TO USER: The source code is copyrighted under U.S. and *|
+-|* international laws. Users and possessors of this source code are *|
+-|* hereby granted a nonexclusive, royalty-free copyright license to *|
+-|* use this code in individual and commercial software. *|
+-|* *|
+-|* Any use of this source code must include, in the user documenta- *|
+-|* tion and internal comments to the code, notices to the end user *|
+-|* as follows: *|
+-|* *|
+-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *|
+-|* *|
+-|* NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY *|
+-|* OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" *|
+-|* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- *|
+-|* ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, *|
+-|* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- *|
+-|* MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL *|
+-|* NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- *|
+-|* DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- *|
+-|* SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION *|
+-|* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *|
+-|* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. *|
+-|* *|
+-|* U.S. Government End Users. This source code is a "commercial *|
+-|* item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), *|
+-|* consisting of "commercial computer software" and "commercial *|
+-|* computer software documentation," as such terms are used in *|
+-|* 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- *|
+-|* ment only as a commercial end item. Consistent with 48 C.F.R. *|
+-|* 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), *|
+-|* all U.S. Government End Users acquire the source code with only *|
+-|* those rights set forth herein. *|
+-|* *|
+-\***************************************************************************/
+-
+-#ifndef __RIVA_HW_H__
+-#define __RIVA_HW_H__
+-#define RIVA_SW_VERSION 0x00010003
+-
+-/*
+- * Typedefs to force certain sized values.
+- */
+-typedef Uint8 U008;
+-typedef Uint16 U016;
+-typedef Uint32 U032;
+-
+-/*
+- * HW access macros.
+- */
+-#define NV_WR08(p,i,d) (((U008 *)(p))[i]=(d))
+-#define NV_RD08(p,i) (((U008 *)(p))[i])
+-#define NV_WR16(p,i,d) (((U016 *)(p))[(i)/2]=(d))
+-#define NV_RD16(p,i) (((U016 *)(p))[(i)/2])
+-#define NV_WR32(p,i,d) (((U032 *)(p))[(i)/4]=(d))
+-#define NV_RD32(p,i) (((U032 *)(p))[(i)/4])
+-#define VGA_WR08(p,i,d) NV_WR08(p,i,d)
+-#define VGA_RD08(p,i) NV_RD08(p,i)
+-
+-/*
+- * Define supported architectures.
+- */
+-#define NV_ARCH_03 0x03
+-#define NV_ARCH_04 0x04
+-#define NV_ARCH_10 0x10
+-/***************************************************************************\
+-* *
+-* FIFO registers. *
+-* *
+-\***************************************************************************/
+-
+-/*
+- * Raster OPeration. Windows style ROP3.
+- */
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop;
+- U032 reserved01[0x0BB];
+- U032 Rop3;
+-} RivaRop;
+-/*
+- * 8X8 Monochrome pattern.
+- */
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop;
+- U032 reserved01[0x0BD];
+- U032 Shape;
+- U032 reserved03[0x001];
+- U032 Color0;
+- U032 Color1;
+- U032 Monochrome[2];
+-} RivaPattern;
+-/*
+- * Scissor clip rectangle.
+- */
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop;
+- U032 reserved01[0x0BB];
+- U032 TopLeft;
+- U032 WidthHeight;
+-} RivaClip;
+-/*
+- * 2D filled rectangle.
+- */
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop[1];
+- U032 reserved01[0x0BC];
+- U032 Color;
+- U032 reserved03[0x03E];
+- U032 TopLeft;
+- U032 WidthHeight;
+-} RivaRectangle;
+-/*
+- * 2D screen-screen BLT.
+- */
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop;
+- U032 reserved01[0x0BB];
+- U032 TopLeftSrc;
+- U032 TopLeftDst;
+- U032 WidthHeight;
+-} RivaScreenBlt;
+-/*
+- * 2D pixel BLT.
+- */
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop[1];
+- U032 reserved01[0x0BC];
+- U032 TopLeft;
+- U032 WidthHeight;
+- U032 WidthHeightIn;
+- U032 reserved02[0x03C];
+- U032 Pixels;
+-} RivaPixmap;
+-/*
+- * Filled rectangle combined with monochrome expand. Useful for glyphs.
+- */
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop;
+- U032 reserved01[0x0BB];
+- U032 reserved03[(0x040)-1];
+- U032 Color1A;
+- struct
+- {
+- U032 TopLeft;
+- U032 WidthHeight;
+- } UnclippedRectangle[64];
+- U032 reserved04[(0x080)-3];
+- struct
+- {
+- U032 TopLeft;
+- U032 BottomRight;
+- } ClipB;
+- U032 Color1B;
+- struct
+- {
+- U032 TopLeft;
+- U032 BottomRight;
+- } ClippedRectangle[64];
+- U032 reserved05[(0x080)-5];
+- struct
+- {
+- U032 TopLeft;
+- U032 BottomRight;
+- } ClipC;
+- U032 Color1C;
+- U032 WidthHeightC;
+- U032 PointC;
+- U032 MonochromeData1C;
+- U032 reserved06[(0x080)+121];
+- struct
+- {
+- U032 TopLeft;
+- U032 BottomRight;
+- } ClipD;
+- U032 Color1D;
+- U032 WidthHeightInD;
+- U032 WidthHeightOutD;
+- U032 PointD;
+- U032 MonochromeData1D;
+- U032 reserved07[(0x080)+120];
+- struct
+- {
+- U032 TopLeft;
+- U032 BottomRight;
+- } ClipE;
+- U032 Color0E;
+- U032 Color1E;
+- U032 WidthHeightInE;
+- U032 WidthHeightOutE;
+- U032 PointE;
+- U032 MonochromeData01E;
+-} RivaBitmap;
+-/*
+- * 3D textured, Z buffered triangle.
+- */
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop;
+- U032 reserved01[0x0BC];
+- U032 TextureOffset;
+- U032 TextureFormat;
+- U032 TextureFilter;
+- U032 FogColor;
+-/* This is a problem on LynxOS */
+-#ifdef Control
+-#undef Control
+-#endif
+- U032 Control;
+- U032 AlphaTest;
+- U032 reserved02[0x339];
+- U032 FogAndIndex;
+- U032 Color;
+- float ScreenX;
+- float ScreenY;
+- float ScreenZ;
+- float EyeM;
+- float TextureS;
+- float TextureT;
+-} RivaTexturedTriangle03;
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop;
+- U032 reserved01[0x0BB];
+- U032 ColorKey;
+- U032 TextureOffset;
+- U032 TextureFormat;
+- U032 TextureFilter;
+- U032 Blend;
+-/* This is a problem on LynxOS */
+-#ifdef Control
+-#undef Control
+-#endif
+- U032 Control;
+- U032 FogColor;
+- U032 reserved02[0x39];
+- struct
+- {
+- float ScreenX;
+- float ScreenY;
+- float ScreenZ;
+- float EyeM;
+- U032 Color;
+- U032 Specular;
+- float TextureS;
+- float TextureT;
+- } Vertex[16];
+- U032 DrawTriangle3D;
+-} RivaTexturedTriangle05;
+-/*
+- * 2D line.
+- */
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop[1];
+- U032 reserved01[0x0BC];
+- U032 Color; /* source color 0304-0307*/
+- U032 Reserved02[0x03e];
+- struct { /* start aliased methods in array 0400- */
+- U032 point0; /* y_x S16_S16 in pixels 0- 3*/
+- U032 point1; /* y_x S16_S16 in pixels 4- 7*/
+- } Lin[16]; /* end of aliased methods in array -047f*/
+- struct { /* start aliased methods in array 0480- */
+- U032 point0X; /* in pixels, 0 at left 0- 3*/
+- U032 point0Y; /* in pixels, 0 at top 4- 7*/
+- U032 point1X; /* in pixels, 0 at left 8- b*/
+- U032 point1Y; /* in pixels, 0 at top c- f*/
+- } Lin32[8]; /* end of aliased methods in array -04ff*/
+- U032 PolyLin[32]; /* y_x S16_S16 in pixels 0500-057f*/
+- struct { /* start aliased methods in array 0580- */
+- U032 x; /* in pixels, 0 at left 0- 3*/
+- U032 y; /* in pixels, 0 at top 4- 7*/
+- } PolyLin32[16]; /* end of aliased methods in array -05ff*/
+- struct { /* start aliased methods in array 0600- */
+- U032 color; /* source color 0- 3*/
+- U032 point; /* y_x S16_S16 in pixels 4- 7*/
+- } ColorPolyLin[16]; /* end of aliased methods in array -067f*/
+-} RivaLine;
+-/*
+- * 2D/3D surfaces
+- */
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop;
+- U032 reserved01[0x0BE];
+- U032 Offset;
+-} RivaSurface;
+-typedef volatile struct
+-{
+- U032 reserved00[4];
+- U016 FifoFree;
+- U016 Nop;
+- U032 reserved01[0x0BD];
+- U032 Pitch;
+- U032 RenderBufferOffset;
+- U032 ZBufferOffset;
+-} RivaSurface3D;
+-
+-/***************************************************************************\
+-* *
+-* Virtualized RIVA H/W interface. *
+-* *
+-\***************************************************************************/
+-
+-struct _riva_hw_inst;
+-struct _riva_hw_state;
+-/*
+- * Virtialized chip interface. Makes RIVA 128 and TNT look alike.
+- */
+-typedef struct _riva_hw_inst
+-{
+- /*
+- * Chip specific settings.
+- */
+- U032 Architecture;
+- U032 Version;
+- U032 CrystalFreqKHz;
+- U032 RamAmountKBytes;
+- U032 MaxVClockFreqKHz;
+- U032 RamBandwidthKBytesPerSec;
+- U032 EnableIRQ;
+- U032 IO;
+- U032 VBlankBit;
+- U032 FifoFreeCount;
+- U032 FifoEmptyCount;
+- /*
+- * Non-FIFO registers.
+- */
+- volatile U032 *PCRTC;
+- volatile U032 *PRAMDAC;
+- volatile U032 *PFB;
+- volatile U032 *PFIFO;
+- volatile U032 *PGRAPH;
+- volatile U032 *PEXTDEV;
+- volatile U032 *PTIMER;
+- volatile U032 *PMC;
+- volatile U032 *PRAMIN;
+- volatile U032 *FIFO;
+- volatile U032 *CURSOR;
+- volatile U032 *CURSORPOS;
+- volatile U032 *VBLANKENABLE;
+- volatile U032 *VBLANK;
+- volatile U008 *PCIO;
+- volatile U008 *PVIO;
+- volatile U008 *PDIO;
+- /*
+- * Common chip functions.
+- */
+- int (*Busy)(struct _riva_hw_inst *);
+- void (*CalcStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *,int,int,int,int,int,int,int,int,int,int,int,int,int);
+- void (*LoadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *);
+- void (*UnloadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *);
+- void (*SetStartAddress)(struct _riva_hw_inst *,U032);
+- void (*SetSurfaces2D)(struct _riva_hw_inst *,U032,U032);
+- void (*SetSurfaces3D)(struct _riva_hw_inst *,U032,U032);
+- int (*ShowHideCursor)(struct _riva_hw_inst *,int);
+- void (*LockUnlock)(struct _riva_hw_inst *, int);
+- /*
+- * Current extended mode settings.
+- */
+- struct _riva_hw_state *CurrentState;
+- /*
+- * FIFO registers.
+- */
+- RivaRop *Rop;
+- RivaPattern *Patt;
+- RivaClip *Clip;
+- RivaPixmap *Pixmap;
+- RivaScreenBlt *Blt;
+- RivaBitmap *Bitmap;
+- RivaLine *Line;
+- RivaTexturedTriangle03 *Tri03;
+- RivaTexturedTriangle05 *Tri05;
+-} RIVA_HW_INST;
+-/*
+- * Extended mode state information.
+- */
+-typedef struct _riva_hw_state
+-{
+- U032 bpp;
+- U032 width;
+- U032 height;
+- U032 repaint0;
+- U032 repaint1;
+- U032 screen;
+- U032 pixel;
+- U032 horiz;
+- U032 arbitration0;
+- U032 arbitration1;
+- U032 vpll;
+- U032 pllsel;
+- U032 general;
+- U032 config;
+- U032 cursor0;
+- U032 cursor1;
+- U032 cursor2;
+- U032 offset0;
+- U032 offset1;
+- U032 offset2;
+- U032 offset3;
+- U032 pitch0;
+- U032 pitch1;
+- U032 pitch2;
+- U032 pitch3;
+-} RIVA_HW_STATE;
+-
+-/*
+- * FIFO Free Count. Should attempt to yield processor if RIVA is busy.
+- */
+-
+-#define RIVA_FIFO_FREE(hwptr,cnt) \
+-{ \
+- while (FifoFreeCount < (cnt)) \
+- FifoFreeCount = hwptr->FifoFree >> 2; \
+- FifoFreeCount -= (cnt); \
+-}
+-#endif /* __RIVA_HW_H__ */
+-
+--- src/video/fbcon/SDL_fbriva.c 2012-01-19 04:30:06.000000000 -0200
++++ src/video/fbcon/SDL_fbriva.c 2012-04-01 15:10:10.108451467 -0300
+@@ -24,12 +24,10 @@
+ #include "SDL_video.h"
+ #include "../SDL_blit.h"
+ #include "SDL_fbriva.h"
+-#include "riva_mmio.h"
+ #include "riva_regs.h"
+
+
+ static int FifoEmptyCount = 0;
+-static int FifoFreeCount = 0;
+
+ /* Wait for vertical retrace */
+ static void WaitVBL(_THIS)
+@@ -41,20 +39,6 @@
+ while ( !(*port & 0x08) )
+ ;
+ }
+-static void NV3WaitIdle(_THIS)
+-{
+- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
+- while ( (Rop->FifoFree < FifoEmptyCount) ||
+- (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) )
+- ;
+-}
+-static void NV4WaitIdle(_THIS)
+-{
+- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
+- while ( (Rop->FifoFree < FifoEmptyCount) ||
+- (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) )
+- ;
+-}
+
+ #if 0 /* Not yet implemented? */
+ /* Sets video mem colorkey and accelerated blit function */
+@@ -74,7 +58,6 @@
+ {
+ int dstX, dstY;
+ int dstW, dstH;
+- RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET);
+
+ /* Don't blit to the display surface when switched away */
+ if ( switched_away ) {
+@@ -93,13 +76,6 @@
+ dstX += rect->x;
+ dstY += rect->y;
+
+- RIVA_FIFO_FREE(Bitmap, 1);
+- Bitmap->Color1A = color;
+-
+- RIVA_FIFO_FREE(Bitmap, 2);
+- Bitmap->UnclippedRectangle[0].TopLeft = (dstX << 16) | dstY;
+- Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH;
+-
+ FB_AddBusySurface(dst);
+
+ if ( dst == this->screen ) {
+@@ -115,7 +91,6 @@
+ int srcX, srcY;
+ int dstX, dstY;
+ int dstW, dstH;
+- RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET);
+
+ /* FIXME: For now, only blit to display surface */
+ if ( dst->pitch != SDL_VideoSurface->pitch ) {
+@@ -142,11 +117,6 @@
+ dstX += dstrect->x;
+ dstY += dstrect->y;
+
+- RIVA_FIFO_FREE(Blt, 3);
+- Blt->TopLeftSrc = (srcY << 16) | srcX;
+- Blt->TopLeftDst = (dstY << 16) | dstX;
+- Blt->WidthHeight = (dstH << 16) | dstW;
+-
+ FB_AddBusySurface(src);
+ FB_AddBusySurface(dst);
+
+@@ -185,23 +155,15 @@
+
+ void FB_RivaAccel(_THIS, __u32 card)
+ {
+- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
+
+ /* We have hardware accelerated surface functions */
+ this->CheckHWBlit = CheckHWBlit;
+ wait_vbl = WaitVBL;
+ switch (card) {
+- case FB_ACCEL_NV3:
+- wait_idle = NV3WaitIdle;
+- break;
+- case FB_ACCEL_NV4:
+- wait_idle = NV4WaitIdle;
+- break;
+ default:
+ /* Hmm... FIXME */
+ break;
+ }
+- FifoEmptyCount = Rop->FifoFree;
+
+ /* The Riva has an accelerated color fill */
+ this->info.blit_fill = 1;
+--- src/video/fbcon/SDL_fbvideo.c.orig 2011-09-08 17:30:03.670583685 +0200
++++ src/video/fbcon/SDL_fbvideo.c 2011-09-08 17:30:24.230582737 +0200
+@@ -46,7 +46,6 @@
+ #include "SDL_fbevents_c.h"
+ #include "SDL_fb3dfx.h"
+ #include "SDL_fbmatrox.h"
+-#include "SDL_fbriva.h"
+
+ /*#define FBCON_DEBUG*/
+
+@@ -769,13 +768,6 @@
+ #endif
+ FB_3DfxAccel(this, finfo.accel);
+ break;
+- case FB_ACCEL_NV3:
+- case FB_ACCEL_NV4:
+-#ifdef FBACCEL_DEBUG
+- printf("NVidia hardware accelerator!\n");
+-#endif
+- FB_RivaAccel(this, finfo.accel);
+- break;
+ default:
+ #ifdef FBACCEL_DEBUG
+ printf("Unknown hardware accelerator.\n");
diff --git a/libre/sdl-libre/libsdl-1.2.15-resizing.patch b/libre/sdl-libre/libsdl-1.2.15-resizing.patch
new file mode 100644
index 000000000..0655a13e1
--- /dev/null
+++ b/libre/sdl-libre/libsdl-1.2.15-resizing.patch
@@ -0,0 +1,63 @@
+Description: Revert change that breaks window corner resizing
+ http://bugzilla.libsdl.org/show_bug.cgi?id=1430
+Author: Andrew Caudwell <acaudwell@gmail.com>
+Last-Update: 2012-04-10
+Bug-Debian: http://bugs.debian.org/665779
+
+diff -r c787fb1b5699 src/video/x11/SDL_x11events.c
+--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500
++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300
+@@ -57,12 +57,6 @@
+ static SDLKey MISC_keymap[256];
+ SDLKey X11_TranslateKeycode(Display *display, KeyCode kc);
+
+-/*
+- Pending resize target for ConfigureNotify (so outdated events don't
+- cause inappropriate resize events)
+-*/
+-int X11_PendingConfigureNotifyWidth = -1;
+-int X11_PendingConfigureNotifyHeight = -1;
+
+ #ifdef X_HAVE_UTF8_STRING
+ Uint32 Utf8ToUcs4(const Uint8 *utf8)
+@@ -825,16 +819,6 @@
+ #ifdef DEBUG_XEVENTS
+ printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height);
+ #endif
+- if ((X11_PendingConfigureNotifyWidth != -1) &&
+- (X11_PendingConfigureNotifyHeight != -1)) {
+- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) &&
+- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) {
+- /* Event is from before the resize, so ignore. */
+- break;
+- }
+- X11_PendingConfigureNotifyWidth = -1;
+- X11_PendingConfigureNotifyHeight = -1;
+- }
+ if ( SDL_VideoSurface ) {
+ if ((xevent.xconfigure.width != SDL_VideoSurface->w) ||
+ (xevent.xconfigure.height != SDL_VideoSurface->h)) {
+diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h
+--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500
++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300
+@@ -27,8 +27,3 @@
+ extern void X11_InitOSKeymap(_THIS);
+ extern void X11_PumpEvents(_THIS);
+ extern void X11_SetKeyboardState(Display *display, const char *key_vec);
+-
+-/* Variables to be exported */
+-extern int X11_PendingConfigureNotifyWidth;
+-extern int X11_PendingConfigureNotifyHeight;
+-
+diff -r c787fb1b5699 src/video/x11/SDL_x11video.c
+--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500
++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300
+@@ -1182,8 +1182,6 @@
+ current = NULL;
+ goto done;
+ }
+- X11_PendingConfigureNotifyWidth = width;
+- X11_PendingConfigureNotifyHeight = height;
+ } else {
+ if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) {
+ current = NULL;
diff --git a/libre/sdl-libre/no-riva-accel.patch b/libre/sdl-libre/no-riva-accel.patch
deleted file mode 100644
index 89f8ebeed..000000000
--- a/libre/sdl-libre/no-riva-accel.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/video/fbcon/SDL_fbvideo.c.orig 2011-09-08 17:30:03.670583685 +0200
-+++ src/video/fbcon/SDL_fbvideo.c 2011-09-08 17:30:24.230582737 +0200
-@@ -46,7 +46,6 @@
- #include "SDL_fbevents_c.h"
- #include "SDL_fb3dfx.h"
- #include "SDL_fbmatrox.h"
--#include "SDL_fbriva.h"
-
- /*#define FBCON_DEBUG*/
-
-@@ -769,13 +768,6 @@
- #endif
- FB_3DfxAccel(this, finfo.accel);
- break;
-- case FB_ACCEL_NV3:
-- case FB_ACCEL_NV4:
--#ifdef FBACCEL_DEBUG
-- printf("NVidia hardware accelerator!\n");
--#endif
-- FB_RivaAccel(this, finfo.accel);
-- break;
- default:
- #ifdef FBACCEL_DEBUG
- printf("Unknown hardware accelerator.\n");
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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/libre/seamonkey-libre/seamonkey.install
+++ b/libre/seamonkey-libre/seamonkey.install
diff --git a/libre/spectrwm-libre/LICENSE b/libre/spectrwm-libre/LICENSE
new file mode 100644
index 000000000..24c04f3a0
--- /dev/null
+++ b/libre/spectrwm-libre/LICENSE
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
+ * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+/*
+ * Much code and ideas taken from dwm under the following license:
+ * MIT/X Consortium License
+ *
+ * 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
+ * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * 2006-2007 Jukka Salmi <jukka at salmi dot ch>
+ * 2007 Premysl Hruby <dfenze at gmail dot com>
+ * 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
+ * 2007 Christof Musik <christof at sendfax dot de>
+ * 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
+ * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com>
+ * 2008 Martin Hurton <martin dot hurton at gmail dot com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD
new file mode 100644
index 000000000..4b4bccec3
--- /dev/null
+++ b/libre/spectrwm-libre/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+_pkgname=spectrwm
+pkgname=spectrwm-libre
+pkgver=2.0.1
+pkgrel=1
+pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way (without unfree profont support)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.spectrwm.org"
+_watch="https://opensource.conformal.com/snapshots/spectrwm/"
+license=('custom:ISC')
+depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor')
+replaces=('spectrwm' 'scrotwm')
+conflicts=('spectrwm')
+provides=("spectrwm=${pkgver}")
+makedepends=('libxt')
+optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font')
+backup=(etc/spectrwm.conf)
+source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \
+ LICENSE \
+ baraction.sh)
+md5sums=('ed553574e65bb364e26d359790e204f2'
+ 'a67cfe51079481e5b0eab1ad371379e3'
+ '950d663692e1da56e0ac864c6c3ed80e')
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ # it is like a patch, only less fragile
+ sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c
+ sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c
+ sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf
+ sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf
+
+ cd linux
+ make PREFIX="/usr"
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver/linux"
+ make PREFIX="/usr" DESTDIR="$pkgdir" install
+ install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop"
+ cd ..
+ install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf"
+ install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh"
+ mkdir -p "$pkgdir/etc/spectrwm"
+ cp spectrwm_*.conf "$pkgdir/etc/spectrwm/"
+ cd "$srcdir"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+ install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh"
+
+ ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0"
+ ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so"
+
+ # fix this for real in the makefile
+ rm "$pkgdir/usr/bin/scrotwm"
+ ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm"
+ mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/
+ mv "$pkgdir/usr/share/man/man1/spectrwm_es.1" "$pkgdir/usr/share/man/es/man1/"
+ mv "$pkgdir/usr/share/man/man1/spectrwm_it.1" "$pkgdir/usr/share/man/it/man1/"
+ mv "$pkgdir/usr/share/man/man1/spectrwm_pt.1" "$pkgdir/usr/share/man/pt/man1/"
+ mv "$pkgdir/usr/share/man/man1/spectrwm_ru.1" "$pkgdir/usr/share/man/ru/man1/"
+}
diff --git a/libre/spectrwm-libre/baraction.sh b/libre/spectrwm-libre/baraction.sh
new file mode 100644
index 000000000..96a8a7b1a
--- /dev/null
+++ b/libre/spectrwm-libre/baraction.sh
@@ -0,0 +1,82 @@
+#!/bin/bash
+# baraction.sh for spectrwm status bar
+# From http://wiki.archlinux.org/index.php/Scrotwm
+
+SLEEP_SEC=5
+#loops forever outputting a line every SLEEP_SEC secs
+while :; do
+
+ eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -)
+ eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -)
+
+ BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l`
+ BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l`
+ BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a"
+ BAT_PCT=`echo $BCSCRIPT | bc -l`%
+
+ case $BAT_PRESENT in
+ no)
+ POWER_STR="AC, NO BATTERY"
+ ;;
+ yes)
+
+ case $BAT_CHGSTATE in
+ charged)
+ #on ac
+ AC_STATUS="ON AC"
+ TIME_REMNG="N/A"
+ POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT"
+ ;;
+ charging)
+ #on ac
+ AC_STATUS="ON AC"
+ BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a"
+ TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l`
+ POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min"
+ ;;
+ discharging)
+ AC_STATUS="ON BATT"
+ TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l`
+ TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l`
+
+ TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l`
+ POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM
+ ;;
+ *)
+ POWER_STR=$BAT_CHGSTATE
+ ;;
+ esac
+
+ ;;
+ *)
+ POWER_STR="error"
+ ;;
+ esac
+
+ #spectrwm bar_print can't handle UTF-8 characters, such as degree symbol
+ #Core 0: +67.0°C (crit = +100.0°C)
+ eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -)
+ TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD"
+
+ WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }')
+ eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -)
+ BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a"
+ WLAN_QPCT=`echo $BCSCRIPT | bc -l`
+ WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//`
+ WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm"
+
+ CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')`
+ CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')"
+
+ eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo)
+ MUSED=$(( $MTOT - $MFREE ))
+ MUSEDPT=$(( ($MUSED * 100) / $MTOT ))
+ MEM_STR="Mem:${MUSEDPT}%"
+
+ echo -e "$POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR"
+ #alternatively if you prefer a different date format
+ #DATE_STR=`date +"%H:%M %a %d %b`
+ #echo -e "$DATE_STR $POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR"
+
+ sleep $SLEEP_SEC
+done
diff --git a/libre/sqlite3-libre/PKGBUILD b/libre/sqlite3-libre/PKGBUILD
index 569538fbf..569538fbf 100644..100755
--- a/libre/sqlite3-libre/PKGBUILD
+++ b/libre/sqlite3-libre/PKGBUILD
diff --git a/libre/sqlite3-libre/license.txt b/libre/sqlite3-libre/license.txt
index 118c5d5e6..118c5d5e6 100644..100755
--- a/libre/sqlite3-libre/license.txt
+++ b/libre/sqlite3-libre/license.txt
diff --git a/libre/sqlite3/PKGBUILD b/libre/sqlite3/PKGBUILD
index 2a939aa57..2a939aa57 100644..100755
--- a/libre/sqlite3/PKGBUILD
+++ b/libre/sqlite3/PKGBUILD
diff --git a/libre/sqlite3/license.txt b/libre/sqlite3/license.txt
index 118c5d5e6..118c5d5e6 100644..100755
--- a/libre/sqlite3/license.txt
+++ b/libre/sqlite3/license.txt
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index 1a76a6825..b4e9fa35a 100644..100755
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 165555 2012-08-23 18:27:20Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=syslinux
pkgver=4.05
-pkgrel=4.3
+pkgrel=7
arch=('i686' 'x86_64')
pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
url="http://syslinux.zytor.com/"
@@ -14,7 +14,8 @@ depends=('perl' 'glibc')
optdepends=('perl-passwd-md5: For md5pass'
'perl-digest-sha1: For sha1pass'
'mtools: For mkdiskimage and syslinux support'
- )
+ 'gptfdisk: For GPT support'
+ 'util-linux: For isohybrid')
makedepends=('nasm')
backup=('boot/syslinux/syslinux.cfg'
'boot/syslinux/splash.png')
@@ -23,14 +24,16 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
syslinux-dont-build-dos-windows-targets.patch
syslinux.cfg
syslinux-install_update
- splash.png
- fix-undefined-type-umode_t.patch)
+ avoid-using-ext2_fs.patch
+ handle-ctors-dtors-via-init_array-and-fini_array.patch
+ splash.png)
md5sums=('82299242418385da1274c9479a778cb2'
'1528c376e43f0eaccaa80d8ad1bc13b4'
'8dc2afca3739667e892faf04eb97e7b1'
'680750f73dc2e587ac567d057d485813'
- '0035b6cac6756a384b861eda8d33e4f7'
- '8674f8a0f480f26b705570d699c78a2c')
+ '2e2c674a71c0c0bf265d96cfc19ce985'
+ 'd016d03f15177b1bb534ce3753b2aa9b'
+ '0035b6cac6756a384b861eda8d33e4f7')
build() {
# Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -38,11 +41,15 @@ build() {
cd "$srcdir"/$pkgname-${pkgver}
# Do not try to build the Windows or DOS installers
patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch
- # Fix unknown type name 'umode_t' error
- patch -p1 -i "$srcdir"/fix-undefined-type-umode_t.patch
+ # fix #30084
+ patch -Np1 -i "$srcdir"/avoid-using-ext2_fs.patch
+ # fix #31065 (booting breaks with gcc 4.7)
+ patch -Np1 -i "$srcdir"/handle-ctors-dtors-via-init_array-and-fini_array.patch
# Fix FHS manpage path
sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
- make
+ make installer
+ make -C utils
+ make -C com32
}
package() {
@@ -58,4 +65,5 @@ package() {
install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update
# move extlinux binary to /usr/sbin
mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux
+ rmdir "$pkgdir"/sbin
}
diff --git a/libre/syslinux/avoid-using-ext2_fs.patch b/libre/syslinux/avoid-using-ext2_fs.patch
new file mode 100755
index 000000000..9a166eefc
--- /dev/null
+++ b/libre/syslinux/avoid-using-ext2_fs.patch
@@ -0,0 +1,965 @@
+From a1006762fa6f98750bb77d76dd992cb8ea9f9c99 Mon Sep 17 00:00:00 2001
+From: "H. Peter Anvin" <hpa@zytor.com>
+Date: Mon, 26 Mar 2012 22:51:09 -0700
+Subject: [PATCH] libinstaller: Avoid using <linux/ext2_fs.h>
+
+Don't use <linux/ext2_fs.h> if we can avoid it.
+
+The ioctl constants have been globalized and moved to <linux/fs.h>.
+Use a private copy of ext2_fs.h from e2fsprogs with the ioctl
+constants removed for the data structures.
+
+Do at least attempt backward compatibility for old kernel headers, but
+no real hope of proper operation there...
+
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+---
+ libinstaller/ext2fs/ext2_fs.h | 856 ++++++++++++++++++++++++++++++++++++++++++
+ libinstaller/linuxioctl.h | 29 +-
+ libinstaller/syslxcom.c | 12 +-
+ 3 files changed, 886 insertions(+), 11 deletions(-)
+ create mode 100644 libinstaller/ext2fs/ext2_fs.h
+
+diff -urpN syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2 syslinux-4.05/libinstaller/ext2fs/ext2_fs.h
+--- syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2 2012-08-06 09:48:43.797645032 -0400
++++ syslinux-4.05/libinstaller/ext2fs/ext2_fs.h 2012-08-06 09:48:43.797645032 -0400
+@@ -0,0 +1,856 @@
++/*
++ * linux/include/linux/ext2_fs.h
++ *
++ * Copyright (C) 1992, 1993, 1994, 1995
++ * Remy Card (card@masi.ibp.fr)
++ * Laboratoire MASI - Institut Blaise Pascal
++ * Universite Pierre et Marie Curie (Paris VI)
++ *
++ * from
++ *
++ * linux/include/linux/minix_fs.h
++ *
++ * Copyright (C) 1991, 1992 Linus Torvalds
++ */
++
++#ifndef _EXT2FS_EXT2_FS_H
++#define _EXT2FS_EXT2_FS_H
++
++#include <linux/types.h>
++
++/*
++ * The second extended filesystem constants/structures
++ */
++
++/*
++ * Define EXT2FS_DEBUG to produce debug messages
++ */
++#undef EXT2FS_DEBUG
++
++/*
++ * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files
++ */
++#define EXT2_PREALLOCATE
++#define EXT2_DEFAULT_PREALLOC_BLOCKS 8
++
++/*
++ * The second extended file system version
++ */
++#define EXT2FS_DATE "95/08/09"
++#define EXT2FS_VERSION "0.5b"
++
++/*
++ * Special inode numbers
++ */
++#define EXT2_BAD_INO 1 /* Bad blocks inode */
++#define EXT2_ROOT_INO 2 /* Root inode */
++#define EXT4_USR_QUOTA_INO 3 /* User quota inode */
++#define EXT4_GRP_QUOTA_INO 4 /* Group quota inode */
++#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */
++#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */
++#define EXT2_RESIZE_INO 7 /* Reserved group descriptors inode */
++#define EXT2_JOURNAL_INO 8 /* Journal inode */
++#define EXT2_EXCLUDE_INO 9 /* The "exclude" inode, for snapshots */
++#define EXT4_REPLICA_INO 10 /* Used by non-upstream feature */
++
++/* First non-reserved inode for old ext2 filesystems */
++#define EXT2_GOOD_OLD_FIRST_INO 11
++
++/*
++ * The second extended file system magic number
++ */
++#define EXT2_SUPER_MAGIC 0xEF53
++
++#ifdef __KERNEL__
++#define EXT2_SB(sb) (&((sb)->u.ext2_sb))
++#else
++/* Assume that user mode programs are passing in an ext2fs superblock, not
++ * a kernel struct super_block. This will allow us to call the feature-test
++ * macros from user land. */
++#define EXT2_SB(sb) (sb)
++#endif
++
++/*
++ * Maximal count of links to a file
++ */
++#define EXT2_LINK_MAX 65000
++
++/*
++ * Macro-instructions used to manage several block sizes
++ */
++#define EXT2_MIN_BLOCK_LOG_SIZE 10 /* 1024 */
++#define EXT2_MAX_BLOCK_LOG_SIZE 16 /* 65536 */
++#define EXT2_MIN_BLOCK_SIZE (1 << EXT2_MIN_BLOCK_LOG_SIZE)
++#define EXT2_MAX_BLOCK_SIZE (1 << EXT2_MAX_BLOCK_LOG_SIZE)
++#ifdef __KERNEL__
++#define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize)
++#define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits)
++#define EXT2_ADDR_PER_BLOCK_BITS(s) (EXT2_SB(s)->addr_per_block_bits)
++#define EXT2_INODE_SIZE(s) (EXT2_SB(s)->s_inode_size)
++#define EXT2_FIRST_INO(s) (EXT2_SB(s)->s_first_ino)
++#else
++#define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size)
++#define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10)
++#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
++ EXT2_GOOD_OLD_INODE_SIZE : (s)->s_inode_size)
++#define EXT2_FIRST_INO(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
++ EXT2_GOOD_OLD_FIRST_INO : (s)->s_first_ino)
++#endif
++#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof(__u32))
++
++/*
++ * Macro-instructions used to manage allocation clusters
++ */
++#define EXT2_MIN_CLUSTER_LOG_SIZE EXT2_MIN_BLOCK_LOG_SIZE
++#define EXT2_MAX_CLUSTER_LOG_SIZE 29 /* 512MB */
++#define EXT2_MIN_CLUSTER_SIZE EXT2_MIN_BLOCK_SIZE
++#define EXT2_MAX_CLUSTER_SIZE (1 << EXT2_MAX_CLUSTER_LOG_SIZE)
++#define EXT2_CLUSTER_SIZE(s) (EXT2_MIN_BLOCK_SIZE << \
++ (s)->s_log_cluster_size)
++#define EXT2_CLUSTER_SIZE_BITS(s) ((s)->s_log_cluster_size + 10)
++
++/*
++ * Macro-instructions used to manage fragments
++ *
++ * Note: for backwards compatibility only, for the dump program.
++ * Ext2/3/4 will never support fragments....
++ */
++#define EXT2_MIN_FRAG_SIZE EXT2_MIN_BLOCK_SIZE
++#define EXT2_MAX_FRAG_SIZE EXT2_MAX_BLOCK_SIZE
++#define EXT2_MIN_FRAG_LOG_SIZE EXT2_MIN_BLOCK_LOG_SIZE
++#define EXT2_FRAG_SIZE(s) EXT2_BLOCK_SIZE(s)
++#define EXT2_FRAGS_PER_BLOCK(s) 1
++
++/*
++ * ACL structures
++ */
++struct ext2_acl_header /* Header of Access Control Lists */
++{
++ __u32 aclh_size;
++ __u32 aclh_file_count;
++ __u32 aclh_acle_count;
++ __u32 aclh_first_acle;
++};
++
++struct ext2_acl_entry /* Access Control List Entry */
++{
++ __u32 acle_size;
++ __u16 acle_perms; /* Access permissions */
++ __u16 acle_type; /* Type of entry */
++ __u16 acle_tag; /* User or group identity */
++ __u16 acle_pad1;
++ __u32 acle_next; /* Pointer on next entry for the */
++ /* same inode or on next free entry */
++};
++
++/*
++ * Structure of a blocks group descriptor
++ */
++struct ext2_group_desc
++{
++ __u32 bg_block_bitmap; /* Blocks bitmap block */
++ __u32 bg_inode_bitmap; /* Inodes bitmap block */
++ __u32 bg_inode_table; /* Inodes table block */
++ __u16 bg_free_blocks_count; /* Free blocks count */
++ __u16 bg_free_inodes_count; /* Free inodes count */
++ __u16 bg_used_dirs_count; /* Directories count */
++ __u16 bg_flags;
++ __u32 bg_exclude_bitmap_lo; /* Exclude bitmap for snapshots */
++ __u16 bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
++ __u16 bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
++ __u16 bg_itable_unused; /* Unused inodes count */
++ __u16 bg_checksum; /* crc16(s_uuid+grouo_num+group_desc)*/
++};
++
++/*
++ * Structure of a blocks group descriptor
++ */
++struct ext4_group_desc
++{
++ __u32 bg_block_bitmap; /* Blocks bitmap block */
++ __u32 bg_inode_bitmap; /* Inodes bitmap block */
++ __u32 bg_inode_table; /* Inodes table block */
++ __u16 bg_free_blocks_count; /* Free blocks count */
++ __u16 bg_free_inodes_count; /* Free inodes count */
++ __u16 bg_used_dirs_count; /* Directories count */
++ __u16 bg_flags; /* EXT4_BG_flags (INODE_UNINIT, etc) */
++ __u32 bg_exclude_bitmap_lo; /* Exclude bitmap for snapshots */
++ __u16 bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
++ __u16 bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
++ __u16 bg_itable_unused; /* Unused inodes count */
++ __u16 bg_checksum; /* crc16(sb_uuid+group+desc) */
++ __u32 bg_block_bitmap_hi; /* Blocks bitmap block MSB */
++ __u32 bg_inode_bitmap_hi; /* Inodes bitmap block MSB */
++ __u32 bg_inode_table_hi; /* Inodes table block MSB */
++ __u16 bg_free_blocks_count_hi;/* Free blocks count MSB */
++ __u16 bg_free_inodes_count_hi;/* Free inodes count MSB */
++ __u16 bg_used_dirs_count_hi; /* Directories count MSB */
++ __u16 bg_itable_unused_hi; /* Unused inodes count MSB */
++ __u32 bg_exclude_bitmap_hi; /* Exclude bitmap block MSB */
++ __u16 bg_block_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */
++ __u16 bg_inode_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */
++ __u32 bg_reserved;
++};
++
++#define EXT2_BG_INODE_UNINIT 0x0001 /* Inode table/bitmap not initialized */
++#define EXT2_BG_BLOCK_UNINIT 0x0002 /* Block bitmap not initialized */
++#define EXT2_BG_INODE_ZEROED 0x0004 /* On-disk itable initialized to zero */
++
++/*
++ * Data structures used by the directory indexing feature
++ *
++ * Note: all of the multibyte integer fields are little endian.
++ */
++
++/*
++ * Note: dx_root_info is laid out so that if it should somehow get
++ * overlaid by a dirent the two low bits of the hash version will be
++ * zero. Therefore, the hash version mod 4 should never be 0.
++ * Sincerely, the paranoia department.
++ */
++struct ext2_dx_root_info {
++ __u32 reserved_zero;
++ __u8 hash_version; /* 0 now, 1 at release */
++ __u8 info_length; /* 8 */
++ __u8 indirect_levels;
++ __u8 unused_flags;
++};
++
++#define EXT2_HASH_LEGACY 0
++#define EXT2_HASH_HALF_MD4 1
++#define EXT2_HASH_TEA 2
++#define EXT2_HASH_LEGACY_UNSIGNED 3 /* reserved for userspace lib */
++#define EXT2_HASH_HALF_MD4_UNSIGNED 4 /* reserved for userspace lib */
++#define EXT2_HASH_TEA_UNSIGNED 5 /* reserved for userspace lib */
++
++#define EXT2_HASH_FLAG_INCOMPAT 0x1
++
++struct ext2_dx_entry {
++ __u32 hash;
++ __u32 block;
++};
++
++struct ext2_dx_countlimit {
++ __u16 limit;
++ __u16 count;
++};
++
++
++/*
++ * Macro-instructions used to manage group descriptors
++ */
++#define EXT2_MIN_DESC_SIZE 32
++#define EXT2_MIN_DESC_SIZE_64BIT 64
++#define EXT2_MAX_DESC_SIZE EXT2_MIN_BLOCK_SIZE
++#define EXT2_DESC_SIZE(s) \
++ ((EXT2_SB(s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) ? \
++ (s)->s_desc_size : EXT2_MIN_DESC_SIZE)
++
++#define EXT2_BLOCKS_PER_GROUP(s) (EXT2_SB(s)->s_blocks_per_group)
++#define EXT2_INODES_PER_GROUP(s) (EXT2_SB(s)->s_inodes_per_group)
++#define EXT2_CLUSTERS_PER_GROUP(s) (EXT2_SB(s)->s_clusters_per_group)
++#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s))
++/* limits imposed by 16-bit value gd_free_{blocks,inode}_count */
++#define EXT2_MAX_BLOCKS_PER_GROUP(s) ((((unsigned) 1 << 16) - 8) * \
++ (EXT2_CLUSTER_SIZE(s) / \
++ EXT2_BLOCK_SIZE(s)))
++#define EXT2_MAX_CLUSTERS_PER_GROUP(s) (((unsigned) 1 << 16) - 8)
++#define EXT2_MAX_INODES_PER_GROUP(s) (((unsigned) 1 << 16) - \
++ EXT2_INODES_PER_BLOCK(s))
++#ifdef __KERNEL__
++#define EXT2_DESC_PER_BLOCK(s) (EXT2_SB(s)->s_desc_per_block)
++#define EXT2_DESC_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_desc_per_block_bits)
++#else
++#define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_DESC_SIZE(s))
++#endif
++
++/*
++ * Constants relative to the data blocks
++ */
++#define EXT2_NDIR_BLOCKS 12
++#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS
++#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1)
++#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1)
++#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1)
++
++/*
++ * Inode flags
++ */
++#define EXT2_SECRM_FL 0x00000001 /* Secure deletion */
++#define EXT2_UNRM_FL 0x00000002 /* Undelete */
++#define EXT2_COMPR_FL 0x00000004 /* Compress file */
++#define EXT2_SYNC_FL 0x00000008 /* Synchronous updates */
++#define EXT2_IMMUTABLE_FL 0x00000010 /* Immutable file */
++#define EXT2_APPEND_FL 0x00000020 /* writes to file may only append */
++#define EXT2_NODUMP_FL 0x00000040 /* do not dump file */
++#define EXT2_NOATIME_FL 0x00000080 /* do not update atime */
++/* Reserved for compression usage... */
++#define EXT2_DIRTY_FL 0x00000100
++#define EXT2_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */
++#define EXT2_NOCOMPR_FL 0x00000400 /* Access raw compressed data */
++#define EXT2_ECOMPR_FL 0x00000800 /* Compression error */
++/* End compression flags --- maybe not all used */
++#define EXT2_BTREE_FL 0x00001000 /* btree format dir */
++#define EXT2_INDEX_FL 0x00001000 /* hash-indexed directory */
++#define EXT2_IMAGIC_FL 0x00002000
++#define EXT3_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */
++#define EXT2_NOTAIL_FL 0x00008000 /* file tail should not be merged */
++#define EXT2_DIRSYNC_FL 0x00010000 /* Synchronous directory modifications */
++#define EXT2_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
++#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */
++#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
++#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
++/* EXT4_EOFBLOCKS_FL 0x00400000 was here */
++#define EXT4_SNAPFILE_FL 0x01000000 /* Inode is a snapshot */
++#define EXT4_SNAPFILE_DELETED_FL 0x04000000 /* Snapshot is being deleted */
++#define EXT4_SNAPFILE_SHRUNK_FL 0x08000000 /* Snapshot shrink has completed */
++#define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
++
++#define EXT2_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */
++#define EXT2_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */
++
++/*
++ * ioctl commands
++ */
++
++/* Used for online resize */
++struct ext2_new_group_input {
++ __u32 group; /* Group number for this data */
++ __u32 block_bitmap; /* Absolute block number of block bitmap */
++ __u32 inode_bitmap; /* Absolute block number of inode bitmap */
++ __u32 inode_table; /* Absolute block number of inode table start */
++ __u32 blocks_count; /* Total number of blocks in this group */
++ __u16 reserved_blocks; /* Number of reserved blocks in this group */
++ __u16 unused; /* Number of reserved GDT blocks in group */
++};
++
++struct ext4_new_group_input {
++ __u32 group; /* Group number for this data */
++ __u64 block_bitmap; /* Absolute block number of block bitmap */
++ __u64 inode_bitmap; /* Absolute block number of inode bitmap */
++ __u64 inode_table; /* Absolute block number of inode table start */
++ __u32 blocks_count; /* Total number of blocks in this group */
++ __u16 reserved_blocks; /* Number of reserved blocks in this group */
++ __u16 unused;
++};
++
++#ifdef __GNU__ /* Needed for the Hurd */
++#define _IOT_ext2_new_group_input _IOT (_IOTS(__u32), 5, _IOTS(__u16), 2, 0, 0)
++#endif
++
++#define EXT2_IOC_GETFLAGS _IOR('f', 1, long)
++#define EXT2_IOC_SETFLAGS _IOW('f', 2, long)
++#define EXT2_IOC_GETVERSION _IOR('v', 1, long)
++#define EXT2_IOC_SETVERSION _IOW('v', 2, long)
++#define EXT2_IOC_GETVERSION_NEW _IOR('f', 3, long)
++#define EXT2_IOC_SETVERSION_NEW _IOW('f', 4, long)
++#define EXT2_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long)
++#define EXT2_IOC_GROUP_ADD _IOW('f', 8,struct ext2_new_group_input)
++#define EXT4_IOC_GROUP_ADD _IOW('f', 8,struct ext4_new_group_input)
++#define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64)
++
++/*
++ * Structure of an inode on the disk
++ */
++struct ext2_inode {
++ __u16 i_mode; /* File mode */
++ __u16 i_uid; /* Low 16 bits of Owner Uid */
++ __u32 i_size; /* Size in bytes */
++ __u32 i_atime; /* Access time */
++ __u32 i_ctime; /* Inode change time */
++ __u32 i_mtime; /* Modification time */
++ __u32 i_dtime; /* Deletion Time */
++ __u16 i_gid; /* Low 16 bits of Group Id */
++ __u16 i_links_count; /* Links count */
++ __u32 i_blocks; /* Blocks count */
++ __u32 i_flags; /* File flags */
++ union {
++ struct {
++ __u32 l_i_version; /* was l_i_reserved1 */
++ } linux1;
++ struct {
++ __u32 h_i_translator;
++ } hurd1;
++ } osd1; /* OS dependent 1 */
++ __u32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
++ __u32 i_generation; /* File version (for NFS) */
++ __u32 i_file_acl; /* File ACL */
++ __u32 i_size_high; /* Formerly i_dir_acl, directory ACL */
++ __u32 i_faddr; /* Fragment address */
++ union {
++ struct {
++ __u16 l_i_blocks_hi;
++ __u16 l_i_file_acl_high;
++ __u16 l_i_uid_high; /* these 2 fields */
++ __u16 l_i_gid_high; /* were reserved2[0] */
++ __u16 l_i_checksum_lo; /* crc32c(uuid+inum+inode) */
++ __u16 l_i_reserved;
++ } linux2;
++ struct {
++ __u8 h_i_frag; /* Fragment number */
++ __u8 h_i_fsize; /* Fragment size */
++ __u16 h_i_mode_high;
++ __u16 h_i_uid_high;
++ __u16 h_i_gid_high;
++ __u32 h_i_author;
++ } hurd2;
++ } osd2; /* OS dependent 2 */
++};
++
++/*
++ * Permanent part of an large inode on the disk
++ */
++struct ext2_inode_large {
++ __u16 i_mode; /* File mode */
++ __u16 i_uid; /* Low 16 bits of Owner Uid */
++ __u32 i_size; /* Size in bytes */
++ __u32 i_atime; /* Access time */
++ __u32 i_ctime; /* Inode Change time */
++ __u32 i_mtime; /* Modification time */
++ __u32 i_dtime; /* Deletion Time */
++ __u16 i_gid; /* Low 16 bits of Group Id */
++ __u16 i_links_count; /* Links count */
++ __u32 i_blocks; /* Blocks count */
++ __u32 i_flags; /* File flags */
++ union {
++ struct {
++ __u32 l_i_version; /* was l_i_reserved1 */
++ } linux1;
++ struct {
++ __u32 h_i_translator;
++ } hurd1;
++ } osd1; /* OS dependent 1 */
++ __u32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
++ __u32 i_generation; /* File version (for NFS) */
++ __u32 i_file_acl; /* File ACL */
++ __u32 i_size_high; /* Formerly i_dir_acl, directory ACL */
++ __u32 i_faddr; /* Fragment address */
++ union {
++ struct {
++ __u16 l_i_blocks_hi;
++ __u16 l_i_file_acl_high;
++ __u16 l_i_uid_high; /* these 2 fields */
++ __u16 l_i_gid_high; /* were reserved2[0] */
++ __u16 l_i_checksum_lo; /* crc32c(uuid+inum+inode) */
++ __u16 l_i_reserved;
++ } linux2;
++ struct {
++ __u8 h_i_frag; /* Fragment number */
++ __u8 h_i_fsize; /* Fragment size */
++ __u16 h_i_mode_high;
++ __u16 h_i_uid_high;
++ __u16 h_i_gid_high;
++ __u32 h_i_author;
++ } hurd2;
++ } osd2; /* OS dependent 2 */
++ __u16 i_extra_isize;
++ __u16 i_checksum_hi; /* crc32c(uuid+inum+inode) */
++ __u32 i_ctime_extra; /* extra Change time (nsec << 2 | epoch) */
++ __u32 i_mtime_extra; /* extra Modification time (nsec << 2 | epoch) */
++ __u32 i_atime_extra; /* extra Access time (nsec << 2 | epoch) */
++ __u32 i_crtime; /* File creation time */
++ __u32 i_crtime_extra; /* extra File creation time (nsec << 2 | epoch)*/
++ __u32 i_version_hi; /* high 32 bits for 64-bit version */
++};
++
++#define i_dir_acl i_size_high
++
++#if defined(__KERNEL__) || defined(__linux__)
++#define i_reserved1 osd1.linux1.l_i_reserved1
++#define i_frag osd2.linux2.l_i_frag
++#define i_fsize osd2.linux2.l_i_fsize
++#define i_uid_low i_uid
++#define i_gid_low i_gid
++#define i_uid_high osd2.linux2.l_i_uid_high
++#define i_gid_high osd2.linux2.l_i_gid_high
++#else
++#if defined(__GNU__)
++
++#define i_translator osd1.hurd1.h_i_translator
++#define i_frag osd2.hurd2.h_i_frag;
++#define i_fsize osd2.hurd2.h_i_fsize;
++#define i_uid_high osd2.hurd2.h_i_uid_high
++#define i_gid_high osd2.hurd2.h_i_gid_high
++#define i_author osd2.hurd2.h_i_author
++
++#endif /* __GNU__ */
++#endif /* defined(__KERNEL__) || defined(__linux__) */
++
++#define inode_uid(inode) ((inode).i_uid | (inode).osd2.linux2.l_i_uid_high << 16)
++#define inode_gid(inode) ((inode).i_gid | (inode).osd2.linux2.l_i_gid_high << 16)
++#define ext2fs_set_i_uid_high(inode,x) ((inode).osd2.linux2.l_i_uid_high = (x))
++#define ext2fs_set_i_gid_high(inode,x) ((inode).osd2.linux2.l_i_gid_high = (x))
++
++/*
++ * File system states
++ */
++#define EXT2_VALID_FS 0x0001 /* Unmounted cleanly */
++#define EXT2_ERROR_FS 0x0002 /* Errors detected */
++#define EXT3_ORPHAN_FS 0x0004 /* Orphans being recovered */
++
++/*
++ * Misc. filesystem flags
++ */
++#define EXT2_FLAGS_SIGNED_HASH 0x0001 /* Signed dirhash in use */
++#define EXT2_FLAGS_UNSIGNED_HASH 0x0002 /* Unsigned dirhash in use */
++#define EXT2_FLAGS_TEST_FILESYS 0x0004 /* OK for use on development code */
++#define EXT2_FLAGS_IS_SNAPSHOT 0x0010 /* This is a snapshot image */
++#define EXT2_FLAGS_FIX_SNAPSHOT 0x0020 /* Snapshot inodes corrupted */
++#define EXT2_FLAGS_FIX_EXCLUDE 0x0040 /* Exclude bitmaps corrupted */
++
++/*
++ * Mount flags
++ */
++#define EXT2_MOUNT_CHECK 0x0001 /* Do mount-time checks */
++#define EXT2_MOUNT_GRPID 0x0004 /* Create files with directory's group */
++#define EXT2_MOUNT_DEBUG 0x0008 /* Some debugging messages */
++#define EXT2_MOUNT_ERRORS_CONT 0x0010 /* Continue on errors */
++#define EXT2_MOUNT_ERRORS_RO 0x0020 /* Remount fs ro on errors */
++#define EXT2_MOUNT_ERRORS_PANIC 0x0040 /* Panic on errors */
++#define EXT2_MOUNT_MINIX_DF 0x0080 /* Mimics the Minix statfs */
++#define EXT2_MOUNT_NO_UID32 0x0200 /* Disable 32-bit UIDs */
++
++#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
++#define set_opt(o, opt) o |= EXT2_MOUNT_##opt
++#define test_opt(sb, opt) (EXT2_SB(sb)->s_mount_opt & \
++ EXT2_MOUNT_##opt)
++/*
++ * Maximal mount counts between two filesystem checks
++ */
++#define EXT2_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */
++#define EXT2_DFL_CHECKINTERVAL 0 /* Don't use interval check */
++
++/*
++ * Behaviour when detecting errors
++ */
++#define EXT2_ERRORS_CONTINUE 1 /* Continue execution */
++#define EXT2_ERRORS_RO 2 /* Remount fs read-only */
++#define EXT2_ERRORS_PANIC 3 /* Panic */
++#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE
++
++#if (__GNUC__ >= 4)
++#define ext4_offsetof(TYPE,MEMBER) __builtin_offsetof(TYPE,MEMBER)
++#else
++#define ext4_offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
++#endif
++
++/*
++ * Structure of the super block
++ */
++struct ext2_super_block {
++ __u32 s_inodes_count; /* Inodes count */
++ __u32 s_blocks_count; /* Blocks count */
++ __u32 s_r_blocks_count; /* Reserved blocks count */
++ __u32 s_free_blocks_count; /* Free blocks count */
++ __u32 s_free_inodes_count; /* Free inodes count */
++ __u32 s_first_data_block; /* First Data Block */
++ __u32 s_log_block_size; /* Block size */
++ __u32 s_log_cluster_size; /* Allocation cluster size */
++ __u32 s_blocks_per_group; /* # Blocks per group */
++ __u32 s_clusters_per_group; /* # Fragments per group */
++ __u32 s_inodes_per_group; /* # Inodes per group */
++ __u32 s_mtime; /* Mount time */
++ __u32 s_wtime; /* Write time */
++ __u16 s_mnt_count; /* Mount count */
++ __s16 s_max_mnt_count; /* Maximal mount count */
++ __u16 s_magic; /* Magic signature */
++ __u16 s_state; /* File system state */
++ __u16 s_errors; /* Behaviour when detecting errors */
++ __u16 s_minor_rev_level; /* minor revision level */
++ __u32 s_lastcheck; /* time of last check */
++ __u32 s_checkinterval; /* max. time between checks */
++ __u32 s_creator_os; /* OS */
++ __u32 s_rev_level; /* Revision level */
++ __u16 s_def_resuid; /* Default uid for reserved blocks */
++ __u16 s_def_resgid; /* Default gid for reserved blocks */
++ /*
++ * These fields are for EXT2_DYNAMIC_REV superblocks only.
++ *
++ * Note: the difference between the compatible feature set and
++ * the incompatible feature set is that if there is a bit set
++ * in the incompatible feature set that the kernel doesn't
++ * know about, it should refuse to mount the filesystem.
++ *
++ * e2fsck's requirements are more strict; if it doesn't know
++ * about a feature in either the compatible or incompatible
++ * feature set, it must abort and not try to meddle with
++ * things it doesn't understand...
++ */
++ __u32 s_first_ino; /* First non-reserved inode */
++ __u16 s_inode_size; /* size of inode structure */
++ __u16 s_block_group_nr; /* block group # of this superblock */
++ __u32 s_feature_compat; /* compatible feature set */
++ __u32 s_feature_incompat; /* incompatible feature set */
++ __u32 s_feature_ro_compat; /* readonly-compatible feature set */
++ __u8 s_uuid[16]; /* 128-bit uuid for volume */
++ char s_volume_name[16]; /* volume name */
++ char s_last_mounted[64]; /* directory where last mounted */
++ __u32 s_algorithm_usage_bitmap; /* For compression */
++ /*
++ * Performance hints. Directory preallocation should only
++ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
++ */
++ __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/
++ __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */
++ __u16 s_reserved_gdt_blocks; /* Per group table for online growth */
++ /*
++ * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
++ */
++ __u8 s_journal_uuid[16]; /* uuid of journal superblock */
++ __u32 s_journal_inum; /* inode number of journal file */
++ __u32 s_journal_dev; /* device number of journal file */
++ __u32 s_last_orphan; /* start of list of inodes to delete */
++ __u32 s_hash_seed[4]; /* HTREE hash seed */
++ __u8 s_def_hash_version; /* Default hash version to use */
++ __u8 s_jnl_backup_type; /* Default type of journal backup */
++ __u16 s_desc_size; /* Group desc. size: INCOMPAT_64BIT */
++ __u32 s_default_mount_opts;
++ __u32 s_first_meta_bg; /* First metablock group */
++ __u32 s_mkfs_time; /* When the filesystem was created */
++ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */
++ __u32 s_blocks_count_hi; /* Blocks count high 32bits */
++ __u32 s_r_blocks_count_hi; /* Reserved blocks count high 32 bits*/
++ __u32 s_free_blocks_hi; /* Free blocks count */
++ __u16 s_min_extra_isize; /* All inodes have at least # bytes */
++ __u16 s_want_extra_isize; /* New inodes should reserve # bytes */
++ __u32 s_flags; /* Miscellaneous flags */
++ __u16 s_raid_stride; /* RAID stride */
++ __u16 s_mmp_update_interval; /* # seconds to wait in MMP checking */
++ __u64 s_mmp_block; /* Block for multi-mount protection */
++ __u32 s_raid_stripe_width; /* blocks on all data disks (N*stride)*/
++ __u8 s_log_groups_per_flex; /* FLEX_BG group size */
++ __u8 s_reserved_char_pad;
++ __u16 s_reserved_pad; /* Padding to next 32bits */
++ __u64 s_kbytes_written; /* nr of lifetime kilobytes written */
++ __u32 s_snapshot_inum; /* Inode number of active snapshot */
++ __u32 s_snapshot_id; /* sequential ID of active snapshot */
++ __u64 s_snapshot_r_blocks_count; /* reserved blocks for active
++ snapshot's future use */
++ __u32 s_snapshot_list; /* inode number of the head of the on-disk snapshot list */
++#define EXT4_S_ERR_START ext4_offsetof(struct ext2_super_block, s_error_count)
++ __u32 s_error_count; /* number of fs errors */
++ __u32 s_first_error_time; /* first time an error happened */
++ __u32 s_first_error_ino; /* inode involved in first error */
++ __u64 s_first_error_block; /* block involved of first error */
++ __u8 s_first_error_func[32]; /* function where the error happened */
++ __u32 s_first_error_line; /* line number where error happened */
++ __u32 s_last_error_time; /* most recent time of an error */
++ __u32 s_last_error_ino; /* inode involved in last error */
++ __u32 s_last_error_line; /* line number where error happened */
++ __u64 s_last_error_block; /* block involved of last error */
++ __u8 s_last_error_func[32]; /* function where the error happened */
++#define EXT4_S_ERR_END ext4_offsetof(struct ext2_super_block, s_mount_opts)
++ __u8 s_mount_opts[64];
++ __u32 s_usr_quota_inum; /* inode number of user quota file */
++ __u32 s_grp_quota_inum; /* inode number of group quota file */
++ __u32 s_overhead_blocks; /* overhead blocks/clusters in fs */
++ __u32 s_reserved[108]; /* Padding to the end of the block */
++ __u32 s_checksum; /* crc32c(superblock) */
++};
++
++#define EXT4_S_ERR_LEN (EXT4_S_ERR_END - EXT4_S_ERR_START)
++
++/*
++ * Codes for operating systems
++ */
++#define EXT2_OS_LINUX 0
++#define EXT2_OS_HURD 1
++#define EXT2_OBSO_OS_MASIX 2
++#define EXT2_OS_FREEBSD 3
++#define EXT2_OS_LITES 4
++
++/*
++ * Revision levels
++ */
++#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */
++#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */
++
++#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV
++#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV
++
++#define EXT2_GOOD_OLD_INODE_SIZE 128
++
++/*
++ * Journal inode backup types
++ */
++#define EXT3_JNL_BACKUP_BLOCKS 1
++
++/*
++ * Feature set definitions
++ */
++
++#define EXT2_HAS_COMPAT_FEATURE(sb,mask) \
++ ( EXT2_SB(sb)->s_feature_compat & (mask) )
++#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \
++ ( EXT2_SB(sb)->s_feature_ro_compat & (mask) )
++#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \
++ ( EXT2_SB(sb)->s_feature_incompat & (mask) )
++
++#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001
++#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002
++#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004
++#define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008
++#define EXT2_FEATURE_COMPAT_RESIZE_INODE 0x0010
++#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020
++#define EXT2_FEATURE_COMPAT_LAZY_BG 0x0040
++/* #define EXT2_FEATURE_COMPAT_EXCLUDE_INODE 0x0080 not used, legacy */
++#define EXT2_FEATURE_COMPAT_EXCLUDE_BITMAP 0x0100
++
++
++#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
++#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
++/* #define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 not used */
++#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE 0x0008
++#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010
++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
++#define EXT4_FEATURE_RO_COMPAT_HAS_SNAPSHOT 0x0080
++#define EXT4_FEATURE_RO_COMPAT_QUOTA 0x0100
++#define EXT4_FEATURE_RO_COMPAT_BIGALLOC 0x0200
++#define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM 0x0400
++#define EXT4_FEATURE_RO_COMPAT_REPLICA 0x0800
++
++#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001
++#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002
++#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 /* Needs recovery */
++#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */
++#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010
++#define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040
++#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
++#define EXT4_FEATURE_INCOMPAT_MMP 0x0100
++#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
++#define EXT4_FEATURE_INCOMPAT_EA_INODE 0x0400
++#define EXT4_FEATURE_INCOMPAT_DIRDATA 0x1000
++
++#define EXT2_FEATURE_COMPAT_SUPP 0
++#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \
++ EXT4_FEATURE_INCOMPAT_MMP)
++#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
++ EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
++ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
++ EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
++
++/*
++ * Default values for user and/or group using reserved blocks
++ */
++#define EXT2_DEF_RESUID 0
++#define EXT2_DEF_RESGID 0
++
++/*
++ * Default mount options
++ */
++#define EXT2_DEFM_DEBUG 0x0001
++#define EXT2_DEFM_BSDGROUPS 0x0002
++#define EXT2_DEFM_XATTR_USER 0x0004
++#define EXT2_DEFM_ACL 0x0008
++#define EXT2_DEFM_UID16 0x0010
++#define EXT3_DEFM_JMODE 0x0060
++#define EXT3_DEFM_JMODE_DATA 0x0020
++#define EXT3_DEFM_JMODE_ORDERED 0x0040
++#define EXT3_DEFM_JMODE_WBACK 0x0060
++#define EXT4_DEFM_NOBARRIER 0x0100
++#define EXT4_DEFM_BLOCK_VALIDITY 0x0200
++#define EXT4_DEFM_DISCARD 0x0400
++#define EXT4_DEFM_NODELALLOC 0x0800
++
++/*
++ * Structure of a directory entry
++ */
++#define EXT2_NAME_LEN 255
++
++struct ext2_dir_entry {
++ __u32 inode; /* Inode number */
++ __u16 rec_len; /* Directory entry length */
++ __u16 name_len; /* Name length */
++ char name[EXT2_NAME_LEN]; /* File name */
++};
++
++/*
++ * The new version of the directory entry. Since EXT2 structures are
++ * stored in intel byte order, and the name_len field could never be
++ * bigger than 255 chars, it's safe to reclaim the extra byte for the
++ * file_type field.
++ */
++struct ext2_dir_entry_2 {
++ __u32 inode; /* Inode number */
++ __u16 rec_len; /* Directory entry length */
++ __u8 name_len; /* Name length */
++ __u8 file_type;
++ char name[EXT2_NAME_LEN]; /* File name */
++};
++
++/*
++ * Ext2 directory file types. Only the low 3 bits are used. The
++ * other bits are reserved for now.
++ */
++#define EXT2_FT_UNKNOWN 0
++#define EXT2_FT_REG_FILE 1
++#define EXT2_FT_DIR 2
++#define EXT2_FT_CHRDEV 3
++#define EXT2_FT_BLKDEV 4
++#define EXT2_FT_FIFO 5
++#define EXT2_FT_SOCK 6
++#define EXT2_FT_SYMLINK 7
++
++#define EXT2_FT_MAX 8
++
++/*
++ * EXT2_DIR_PAD defines the directory entries boundaries
++ *
++ * NOTE: It must be a multiple of 4
++ */
++#define EXT2_DIR_PAD 4
++#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1)
++#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \
++ ~EXT2_DIR_ROUND)
++
++/*
++ * This structure is used for multiple mount protection. It is written
++ * into the block number saved in the s_mmp_block field in the superblock.
++ * Programs that check MMP should assume that if SEQ_FSCK (or any unknown
++ * code above SEQ_MAX) is present then it is NOT safe to use the filesystem,
++ * regardless of how old the timestamp is.
++ *
++ * The timestamp in the MMP structure will be updated by e2fsck at some
++ * arbitary intervals (start of passes, after every few groups of inodes
++ * in pass1 and pass1b). There is no guarantee that e2fsck is updating
++ * the MMP block in a timely manner, and the updates it does are purely
++ * for the convenience of the sysadmin and not for automatic validation.
++ *
++ * Note: Only the mmp_seq value is used to determine whether the MMP block
++ * is being updated. The mmp_time, mmp_nodename, and mmp_bdevname
++ * fields are only for informational purposes for the administrator,
++ * due to clock skew between nodes and hostname HA service takeover.
++ */
++#define EXT4_MMP_MAGIC 0x004D4D50U /* ASCII for MMP */
++#define EXT4_MMP_SEQ_CLEAN 0xFF4D4D50U /* mmp_seq value for clean unmount */
++#define EXT4_MMP_SEQ_FSCK 0xE24D4D50U /* mmp_seq value when being fscked */
++#define EXT4_MMP_SEQ_MAX 0xE24D4D4FU /* maximum valid mmp_seq value */
++
++struct mmp_struct {
++ __u32 mmp_magic; /* Magic number for MMP */
++ __u32 mmp_seq; /* Sequence no. updated periodically */
++ __u64 mmp_time; /* Time last updated */
++ char mmp_nodename[64]; /* Node which last updated MMP block */
++ char mmp_bdevname[32]; /* Bdev which last updated MMP block */
++ __u16 mmp_check_interval; /* Changed mmp_check_interval */
++ __u16 mmp_pad1;
++ __u32 mmp_pad2[227];
++};
++
++/*
++ * Default interval for MMP update in seconds.
++ */
++#define EXT4_MMP_UPDATE_INTERVAL 5
++
++/*
++ * Maximum interval for MMP update in seconds.
++ */
++#define EXT4_MMP_MAX_UPDATE_INTERVAL 300
++
++/*
++ * Minimum interval for MMP checking in seconds.
++ */
++#define EXT4_MMP_MIN_CHECK_INTERVAL 5
++
++#endif /* _EXT2FS_EXT2_FS_H */
+diff -urpN syslinux-4.05/libinstaller/linuxioctl.h.ext2 syslinux-4.05/libinstaller/linuxioctl.h
+--- syslinux-4.05/libinstaller/linuxioctl.h.ext2 2011-12-09 13:28:17.000000000 -0500
++++ syslinux-4.05/libinstaller/linuxioctl.h 2012-08-06 09:52:42.653335110 -0400
+@@ -9,17 +9,33 @@
+
+ #include <sys/ioctl.h>
+
++#ifdef __linux__
++
+ #define statfs _kernel_statfs /* HACK to deal with broken 2.4 distros */
+
+ #include <linux/fd.h> /* Floppy geometry */
+ #include <linux/hdreg.h> /* Hard disk geometry */
+
+-#include <linux/fs.h> /* FIGETBSZ, FIBMAP, FS_IOC_FIEMAP */
++#include <linux/fs.h> /* FIGETBSZ, FIBMAP, FS_IOC_* */
+ #include <linux/msdos_fs.h> /* FAT_IOCTL_SET_ATTRIBUTES */
+
+ #undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */
+ #undef SECTOR_BITS
+-#include <linux/ext2_fs.h> /* EXT2_IOC_* */
++
++#ifndef FS_IOC_GETFLAGS
++/* Old kernel headers, these were once ext2-specific... */
++# include <linux/ext2_fs.h> /* EXT2_IOC_* */
++
++# define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS
++# define FS_IOC_SETFLAGS EXT2_IOC_SETFLAGS
++
++# define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
++
++#else
++
++# include <ext2fs/ext2_fs.h>
++
++#endif
+
+ #ifndef FAT_IOCTL_GET_ATTRIBUTES
+ # define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32)
+@@ -37,11 +53,13 @@
+
+ #undef statfs
+
+-#if defined(__linux__) && !defined(BLKGETSIZE64)
++#ifndef BLKGETSIZE64
+ /* This takes a u64, but the size field says size_t. Someone screwed big. */
+ # define BLKGETSIZE64 _IOR(0x12,114,size_t)
+ #endif
+
+ #include <linux/loop.h>
+
++#endif /* __linux__ */
++
+ #endif /* LIBINSTALLER_LINUXIOCTL_H */
+diff -urpN syslinux-4.05/libinstaller/syslxcom.c.ext2 syslinux-4.05/libinstaller/syslxcom.c
+--- syslinux-4.05/libinstaller/syslxcom.c.ext2 2011-12-09 13:28:17.000000000 -0500
++++ syslinux-4.05/libinstaller/syslxcom.c 2012-08-06 09:48:43.797645032 -0400
+@@ -121,9 +121,9 @@ void clear_attributes(int fd)
+ {
+ int flags;
+
+- if (!ioctl(fd, EXT2_IOC_GETFLAGS, &flags)) {
+- flags &= ~EXT2_IMMUTABLE_FL;
+- ioctl(fd, EXT2_IOC_SETFLAGS, &flags);
++ if (!ioctl(fd, FS_IOC_GETFLAGS, &flags)) {
++ flags &= ~FS_IMMUTABLE_FL;
++ ioctl(fd, FS_IOC_SETFLAGS, &flags);
+ }
+ break;
+ }
+@@ -151,9 +151,9 @@ void set_attributes(int fd)
+ {
+ int flags;
+
+- if (st.st_uid == 0 && !ioctl(fd, EXT2_IOC_GETFLAGS, &flags)) {
+- flags |= EXT2_IMMUTABLE_FL;
+- ioctl(fd, EXT2_IOC_SETFLAGS, &flags);
++ if (st.st_uid == 0 && !ioctl(fd, FS_IOC_GETFLAGS, &flags)) {
++ flags |= FS_IMMUTABLE_FL;
++ ioctl(fd, FS_IOC_SETFLAGS, &flags);
+ }
+ break;
+ }
diff --git a/libre/syslinux/fix-undefined-type-umode_t.patch b/libre/syslinux/fix-undefined-type-umode_t.patch
index 33ac6d323..33ac6d323 100644..100755
--- 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
new file mode 100755
index 000000000..aa513312b
--- /dev/null
+++ b/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch
@@ -0,0 +1,67 @@
+From b6be466444740a34bacd140dccbe57f6629b15bc Mon Sep 17 00:00:00 2001
+From: "H. Peter Anvin" <hpa@zytor.com>
+Date: Mon, 28 May 2012 21:28:52 -0700
+Subject: [PATCH 1/1] com32.ld: handle .init_array and .fini_array
+
+Handle constructors/destructors via .init_array and .fini_array, as
+generated by newer gccs.
+
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+---
+ com32/lib/com32.ld | 33 ++++++++++-----------------------
+ 1 files changed, 10 insertions(+), 23 deletions(-)
+
+diff --git a/com32/lib/com32.ld b/com32/lib/com32.ld
+index 37ee46c..008e4ce 100644
+--- a/com32/lib/com32.ld
++++ b/com32/lib/com32.ld
+@@ -36,36 +36,23 @@ SECTIONS
+ .rodata1 : { *(.rodata1) }
+ __rodata_end = .;
+
+- /* Ensure the __preinit_array_start label is properly aligned. We
+- could instead move the label definition inside the section, but
+- the linker would then create the section even if it turns out to
+- be empty, which isn't pretty. */
++ /*
++ * The difference betwee .ctors/.dtors and .init_array/.fini_array
++ * is the ordering, but we don't use prioritization for libcom32, so
++ * just lump them all together and hope that's okay.
++ */
+ . = ALIGN(4);
+- .preinit_array : {
+- PROVIDE (__preinit_array_start = .);
+- *(.preinit_array)
+- PROVIDE (__preinit_array_end = .);
+- }
+- .init_array : {
+- PROVIDE (__init_array_start = .);
+- *(.init_array)
+- PROVIDE (__init_array_end = .);
+- }
+- .fini_array : {
+- PROVIDE (__fini_array_start = .);
+- *(.fini_array)
+- PROVIDE (__fini_array_end = .);
+- }
+ .ctors : {
+ PROVIDE (__ctors_start = .);
+- KEEP (*(SORT(.ctors.*)))
+- KEEP (*(.ctors))
++ KEEP (*(SORT(.preinit_array*)))
++ KEEP (*(SORT(.init_array*)))
++ KEEP (*(SORT(.ctors*)))
+ PROVIDE (__ctors_end = .);
+ }
+ .dtors : {
+ PROVIDE (__dtors_start = .);
+- KEEP (*(SORT(.dtors.*)))
+- KEEP (*(.dtors))
++ KEEP (*(SORT(.fini_array*)))
++ KEEP (*(SORT(.dtors*)))
+ PROVIDE (__dtors_end = .);
+ }
+
+--
+1.7.6.5
+
diff --git a/libre/syslinux/rePKGBUILD b/libre/syslinux/rePKGBUILD
index a8eb152d5..33a96d1a1 100644..100755
--- a/libre/syslinux/rePKGBUILD
+++ b/libre/syslinux/rePKGBUILD
@@ -3,23 +3,23 @@
# NOTE: Please fill out the license field for your package! If it is unknown,
# then please put 'unknown'.
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
source PKGBUILD
unset build package md5sums source check
_repo=core
pkgname='syslinux'
options=(!strip)
source=(PKGBUILD
-# http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
- http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-4-${CARCH}${PKGEXT}
+ http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+# http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-4-${CARCH}${PKGEXT}
# files for pkg modifications
syslinux.cfg
splash.png)
build() {
cd "${srcdir}/"
-# rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-$pkgrel-$CARCH$PKGEXT || true
- rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-4-$CARCH$PKGEXT || true
+ rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-$pkgrel-$CARCH$PKGEXT || true
+# rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-4-$CARCH$PKGEXT || true
# put actions for package modifications below this line
rm -v boot/syslinux/syslinux.cfg
@@ -27,13 +27,8 @@ build() {
package_syslinux() {
pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
- install=syslinux.install
backup=('boot/syslinux/syslinux.cfg'
'boot/syslinux/splash.png')
- optdepends=('perl-passwd-md5: For md5pass'
- 'perl-digest-sha1: For sha1pass'
- 'mtools: For mkdiskimage and syslinux support'
- )
# Install the default configuration
install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
# Install Parabola splash
diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png
index 43d4692ab..43d4692ab 100644..100755
--- a/libre/syslinux/splash.png
+++ b/libre/syslinux/splash.png
Binary files differ
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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/libre/syslinux/syslinux.install
+++ b/libre/syslinux/syslinux.install
diff --git a/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch b/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
index 06fc30944..06fc30944 100644..100755
--- a/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
+++ b/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
diff --git a/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch b/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
index 692d93356..692d93356 100644..100755
--- a/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
+++ b/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
diff --git a/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
index 9bf84dda6..9bf84dda6 100644..100755
--- a/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
+++ b/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index d4f08f7d5..d4f08f7d5 100644..100755
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
diff --git a/libre/systemd/os-release b/libre/systemd/os-release
index 65253e9c3..65253e9c3 100644..100755
--- a/libre/systemd/os-release
+++ b/libre/systemd/os-release
diff --git a/libre/systemd/rePKGBUILD b/libre/systemd/rePKGBUILD
index f825ee579..f825ee579 100644..100755
--- a/libre/systemd/rePKGBUILD
+++ b/libre/systemd/rePKGBUILD
diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install
index 0c3e9abee..0c3e9abee 100644..100755
--- a/libre/systemd/systemd.install
+++ b/libre/systemd/systemd.install
diff --git a/libre/texlive-bin-libre/09-texlive-fonts.conf b/libre/texlive-bin-libre/09-texlive-fonts.conf
index f870fbd7a..f870fbd7a 100644..100755
--- 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 31b440c9d..14ed8bdb1 100644..100755
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 159191 2012-05-17 14:36:30Z remy $
+# $Id: PKGBUILD 169309 2012-10-19 08:03:07Z eric $
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Contributor: francois <francois.archlinux.org>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=texlive-bin-libre
-pkgver=2011.3
-_luatex_ver=0.70.1
-pkgrel=7
+pkgver=2012.0
+pkgrel=5
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
-depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib')
+depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2')
makedepends=('perl' 'clisp' 'ffcall')
optdepends=('ed: for texconfig')
provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
@@ -23,33 +22,31 @@ install="texlive.install"
source=('texmf.cnf'
'fix-fontforge-encoding.patch'
'09-texlive-fonts.conf'
- 'luatex-poppler-0.20.patch'
- 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20111210.tar.xz'
- 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20111210.tar.xz'
- # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2"
- 'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz'
+ 'poppler-0.20.patch'
+ 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz'
+ 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz'
+ 'luatex-r4449-radical-rule-thickness.patch'
)
backup=(etc/texmf/web2c/texmf.cnf \
- etc/texmf/chktex/chktexrc \
- etc/texmf/web2c/mktex.cnf \
- etc/texmf/web2c/updmap.cfg \
- etc/texmf/web2c/fmtutil.cnf \
+ etc/texmf/chktex/chktexrc \
+ etc/texmf/dvipdfm/config/config \
+ etc/texmf/dvipdfmx/dvipdfmx.cfg \
+ etc/texmf/dvips/config/config.ps \
etc/texmf/tex/generic/config/language.dat \
etc/texmf/tex/generic/config/language.def \
etc/texmf/tex/generic/config/pdftexconfig.tex \
etc/texmf/ttf2pk/ttf2pk.cfg \
- etc/texmf/dvips/config/config.ps \
- etc/texmf/dvipdfmx/dvipdfmx.cfg \
- etc/texmf/dvipdfm/config/config \
+ etc/texmf/web2c/fmtutil.cnf \
+ etc/texmf/web2c/mktex.cnf \
etc/texmf/xdvi/XDvi)
md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
'bfb9716aa00c86c08cd31e5b32edeb98'
'393a4bf67adc7ca5df2b386759d1a637'
- '52ce57c02e30a25036b6a3175c566b78'
- 'c7bb38c0ab30c2b64cf4cf83a736b35c'
- '5d8f06a3683ce88a3c33e15f5ba6a858'
- 'e7f0197559ef865d8c01683dab3b8526')
+ 'e3a664d5a7f0923f35060fe9d25d2573'
+ 'ac2c3c3aa765581f8504e21a5edbfb9f'
+ 'f315a860158cfc952c82a6d759961024'
+ '5190f3295eb9a604c5f17f5bd607299b')
build() {
if [ "${CARCH}" != "i686" ]; then
@@ -57,50 +54,14 @@ build() {
export CXXFLAGS="${CXXFLAGS} -fPIC"
fi
- cd "$srcdir"
- # Building LuaTeX
- # cd luatex-beta-${_luatex_ver}
- cd luatex
- patch -p0 -i ../fix-fontforge-encoding.patch
- patch -Np0 -i ../luatex-poppler-0.20.patch
- (cd source && ./texk/web2c/luatexdir/getluatexsvnversion.sh)
- mkdir build
- cd build
- ../source/configure --prefix=/usr -C \
- --disable-native-texlive-build \
- --with-banner-add="/Parabola GNU/Linux-libre" \
- --enable-cxx-runtime-hack \
- --disable-all-pkgs \
- --disable-dump-share \
- --disable-ptex \
- --enable-luatex \
- --without-system-ptexenc \
- --without-system-graphite \
- --without-system-icu \
- --without-system-kpathsea \
- --with-system-freetype2 \
- --with-system-poppler \
- --with-freetype2-libdir=/usr/lib \
- --with-freetype2-include=/usr/include/freetype2 \
- --with-system-gd \
- --with-system-libpng \
- --without-system-teckit \
- --with-system-zlib \
- --with-system-zziplib \
- --with-system-t1lib \
- --disable-shared \
- --disable-largefile \
- --disable-ipc \
- --without-mf-x-toolkit \
- --without-x
- make
- make -C libs/obsdcompat
- make -C texk/kpathsea
- make -C texk/web2c luatex
-
- cd "$srcdir"
+ cd "$srcdir"
# this patch removes spurious error message with locale "xx_YY.utf8"
- patch -p0 -i fix-fontforge-encoding.patch
+ patch -Np0 -i fix-fontforge-encoding.patch
+ # fix build with poppler >= 0.20
+ patch -Np0 -i poppler-0.20.patch
+ # fix radical rule thickness regression in Luatex
+ # http://tex.stackexchange.com/q/61952/729
+ patch -Np0 -i luatex-r4449-radical-rule-thickness.patch
# t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
#############################################################
@@ -127,22 +88,22 @@ build() {
--disable-t1utils \
--disable-bibtexu \
--disable-xz \
- --without-system-zlib \
- --without-system-zziplib \
- --without-system-pnglib \
+ --with-system-zlib \
+ --with-system-zziplib \
+ --with-system-pnglib \
--with-system-ncurses \
--with-system-t1lib \
- --without-system-gd \
- --without-system-poppler \
- --without-system-xpdf \
- --without-system-freetype2 \
+ --with-system-gd \
+ --with-system-poppler \
+ --with-system-xpdf \
+ --with-system-freetype2 \
--without-system-graphite \
--with-freetype2-libdir=/usr/lib \
--with-freetype2-include=/usr/include/freetype2 \
--with-xdvi-x-toolkit=xaw \
--disable-dump-share \
--disable-aleph \
- --disable-luatex \
+ --enable-luatex \
--with-clisp-runtime=default \
--enable-xindy --disable-xindy-rules --disable-xindy-docs
#############################################################
@@ -238,13 +199,6 @@ package() {
## remove aleph from fmtutil.cnf
sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf
- ## install luatex binary
- #install -m755 "$srcdir"/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex "$pkgdir"/usr/bin/
- install -m755 "$srcdir"/luatex/build/texk/web2c/luatex "$pkgdir"/usr/bin/
- cd "$pkgdir"/usr/bin
- /bin/ln -s luatex texlua
- /bin/ln -s luatex texluac
-
## install Perl libraries
mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive
@@ -256,6 +210,7 @@ package() {
# remove dangling symlinks
_bibtexextra_scripts="
bibexport
+listbib
urlbst
"
_core_scripts="
@@ -263,6 +218,7 @@ afm2afm
arlatex
autoinst
bundledoc
+checkcites
cmap2enc
ctanify
ctanupload
@@ -277,6 +233,7 @@ installfont-tl
latex2man
latexdiff
latexdiff-vc
+latexfileversion
latexmk
latexrevise
listings-ext.sh
@@ -315,31 +272,35 @@ texdiff
texdirflatten
texliveonfly
texloganalyser
+typeoutfileinfo
thumbpdf
vpl2ovp
vpl2vpl
"
_htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
+ _langcjk_scripts="convbkmk updmap-setup-kanji"
_langextra_scripts="ebong"
_langgreek_scripts="mkgrkindex"
- _latexextra_scripts="authorindex \
-makeglossaries \
-pdfannotextractor \
-pdfthumb \
-perltex \
-ppower4 \
-ps4pdf \
-splitindex \
-svn-multi \
+ _latexextra_scripts="
+authorindex
+exceltex
+makeglossaries
+pdfannotextractor
+perltex
+ppower4
+ps4pdf
+splitindex
+svn-multi
vpe"
- _music_scripts="musixtex musixflx"
+ _music_scripts="m-tx musixtex musixflx pmx2pdf"
_pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
- _pstricks_scripts="pst2pdf"
+ _pstricks_scripts="pedigree pst2pdf"
_science_scripts="ulqda"
for s in \
${_bibtexextra_scripts} \
${_core_scripts} \
${_htmlxml_scripts} \
+ ${_langcjk_scripts} \
${_langextra_scripts} \
${_langgreek_scripts} \
${_latexextra_scripts} \
diff --git a/libre/texlive-bin-libre/fix-fontforge-encoding.patch b/libre/texlive-bin-libre/fix-fontforge-encoding.patch
index 8104b3289..8104b3289 100644..100755
--- 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 100644..100755
--- 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
new file mode 100755
index 000000000..f925a1a93
--- /dev/null
+++ b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
@@ -0,0 +1,23 @@
+Index: source/texk/web2c/luatexdir/tex/mlist.w
+===================================================================
+--- source/texk/web2c/luatexdir/tex/mlist.w (revision 4448)
++++ source/texk/web2c/luatexdir/tex/mlist.w (revision 4449)
+@@ -1798,7 +1798,17 @@
+ theta = fraction_rule(cur_style);
+ y = var_delimiter(left_delimiter(q), cur_size,
+ height(x) + depth(x) + clr + theta, NULL, cur_style);
+- theta = height(y);
++ /* If |y| is a composite then set |theta| to the height of its top
++ character, else set it to the height of |y|. */
++ if (list_ptr(y) != null
++ && type(list_ptr(y)) == hlist_node
++ && list_ptr(list_ptr(y)) != null
++ && type(list_ptr(list_ptr(y))) == glyph_node) { /* and it should be */
++ theta = char_height(font(list_ptr(list_ptr(y))),
++ character(list_ptr(list_ptr(y))));
++ } else {
++ theta = height(y);
++ }
+ } else {
+ y = var_delimiter(left_delimiter(q), cur_size,
+ height(x) + depth(x) + clr + theta, NULL, cur_style);
diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin-libre/poppler-0.20.patch
new file mode 100755
index 000000000..3bd8183ab
--- /dev/null
+++ b/libre/texlive-bin-libre/poppler-0.20.patch
@@ -0,0 +1,22 @@
+--- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig 2011-10-06 06:14:20.000000000 +0000
++++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-17 11:30:26.327236883 +0000
+@@ -1433,7 +1433,7 @@
+
+ static int m_Object_getTypeName(lua_State * L)
+ {
+- char *s;
++ const char *s;
+ udstruct *uin;
+ uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
+ if (uin->pd != NULL && uin->pd->pc != uin->pc)
+--- source/texk/web2c/pdftexdir/pdftosrc.cc.orig 2012-06-24 17:12:34.376329435 +0200
++++ source/texk/web2c/pdftexdir/pdftosrc.cc 2012-06-24 17:12:25.490003152 +0200
+@@ -134,7 +134,7 @@
+ exit(1);
+ }
+ if (extract_xref_table) {
+- int size = xref->getSize();
++ int size = xref->getNumObjects();
+ int i;
+ for (i = 0; i < size; i++) {
+ if (xref->getEntry(i)->offset == 0xffffffff)
diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install
index b85850123..06a40a3b3 100644..100755
--- a/libre/texlive-bin-libre/texlive.install
+++ b/libre/texlive-bin-libre/texlive.install
@@ -16,13 +16,19 @@ post_install() {
}
post_upgrade() {
+ local corename corever _pacout
echo ">>> texlive: updating the filename database..."
usr/bin/mktexlsr
- echo -n "recreating all formats..."
- usr/bin/fmtutil-sys --all 1>/dev/null
- echo " done."
- echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-
+ _pacout=$(pacman -Q texlive-core 2>/dev/null)
+ read corename corever <<< ${_pacout}
+ if [[ ${corever} == 2012* ]]; then
+ echo -n "recreating all formats..."
+ usr/bin/fmtutil-sys --all 1>/dev/null
+ echo " done."
+ echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
+ else
+ echo "WARNING: not recreating formats since texlive-core has version '$corever'"
+ fi
[[ -x usr/bin/install-info ]] || return 0
for file in "${filelist[@]}"; do
install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
diff --git a/libre/texlive-bin-libre/texmf.cnf b/libre/texlive-bin-libre/texmf.cnf
index 76975ee5c..76975ee5c 100644..100755
--- 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 be42680ad..41021cf24 100644..100755
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -1,11 +1,12 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=texlive-core-libre
_pkgname=texlive-core
-pkgver=2011.24722
-_revnr=${pkgver#2011.}
-pkgrel=1
+pkgver=2012.26892
+_revnr=${pkgver#2012.}
+pkgrel=2
pkgdesc="TeX Live core distribution"
license=('GPL')
arch=(any)
@@ -21,38 +22,30 @@ optdepends=(
)
groups=('texlive-most')
conflicts=('tetex' 'texlive-latex3' 'texlive-core')
-provides=('tetex' 'texlive-latex3' 'texlive-core')
+provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
replaces=('tetex' 'texlive-latex3' 'texlive-core')
url='http://tug.org/texlive/'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
- "${_pkgname}.maps")
+source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
+ "$_pkgname.maps")
options=(!strip)
install=texlive.install
#backup=(etc/texmf/tex/context/config/cont-usr.tex)
-md5sums=('3cf22c52c9b2719d23ad1479e0ae3b3a'
- '490872c9981c40d20721de1e2fccccb8')
-
-mksource() {
- [ -f texlive-core-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/texlive-core-$pkgver-src.zip
- mkdir ${pkgname}-${pkgver}
- pushd ${pkgname}-${pkgver}
- bsdtar xf ../texlive-core-$pkgver-src.zip
- # remove nonfree packages
- # MeX licensed packages.
- rm {cc-pl,cs,ec,mex,pl}.tar.xz
- # Public domain, will be relicensed.
- rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz
- # No specific free license.
- rm euro-ce.tar.xz
- # Remove them from package list.
- sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS
- popd
- tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}
- rm -rf ${pkgname}-${pkgver}
-}
+md5sums=('c913b3c01bdcf81da80e4833cd4cc691'
+ '82c03f7226e1df4440f30c89c05ee653')
build() {
- cd "$srcdir/${pkgname}-${pkgver}"
+ cd "$srcdir"
+
+ # remove nonfree packages
+ # MeX licensed packages.
+ rm {cc-pl,cs,ec,mex,pl}.tar.xz
+ # Public domain, will be relicensed.
+ rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz
+ # No specific free license.
+ rm euro-ce.tar.xz
+ # Remove them from package list.
+ sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS
+
echo -n " --> extracting all packages... "
for p in *.tar.xz; do
bsdtar -xf $p
@@ -62,11 +55,10 @@ build() {
}
package() {
- cd "$srcdir/${pkgname}-${pkgver}"
install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
sed -i '/^#/d' CONTENTS
install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
- install -m644 ${srcdir}/${_pkgname}.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
+ install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
install -m755 -d $pkgdir/usr/share
wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
for dir in $wanteddirs; do
@@ -87,8 +79,13 @@ package() {
# $pkgdir/etc/texmf/tex/context/config/cont-usr.tex
# remove obsolete stuff (we don't provide the omega and aleph binaries anyway)
- #rm -rf $pkgdir/usr/share/texmf-dist/omega
rm -f $pkgdir/usr/share/texmf-dist/tex/plain/config/{omega,aleph}.ini
+ #sed -i '/cherokee\.map/d; /oinuit\.map/d; /omega\.map/d' \
+ # "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+ # remove upstream updmap.cfg: it contains too many maps.
+ rm "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg"
+
# more cleanup
rm -rf $pkgdir/usr/share/texmf-dist/scripts/context/stubs/mswin/
@@ -100,6 +97,7 @@ accfonts/vpl2vpl
bundledoc/arlatex
bundledoc/bundledoc
context/perl/mptopdf.pl
+checkcites/checkcites.lua
ctanify/ctanify
ctanupload/ctanupload.pl
de-macro/de-macro
@@ -108,17 +106,14 @@ epstopdf/epstopdf.pl
findhyph/findhyph
fontools/afm2afm
fontools/autoinst
-fontools/cmap2enc
-fontools/font2afm
fontools/ot2kpx
-fontools/pfm2kpx
-fontools/showglyphs
fragmaster/fragmaster.pl
installfont/installfont-tl
latex2man/latex2man
latexdiff/latexdiff-vc.pl
latexdiff/latexdiff.pl
latexdiff/latexrevise.pl
+latexfileversion/latexfileversion
latexmk/latexmk.pl
luaotfload/mkluatexfontdb.lua
match_parens/match_parens
@@ -148,6 +143,7 @@ texdiff/texdiff
texdirflatten/texdirflatten
texloganalyser/texloganalyser
thumbpdf/thumbpdf.pl
+typeoutfileinfo/typeoutfileinfo.sh
texliveonfly/texliveonfly.py
"
install -m755 -d $pkgdir/usr/bin
diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps
index 553d07b72..013f15e94 100644..100755
--- a/libre/texlive-core-libre/texlive-core.maps
+++ b/libre/texlive-core-libre/texlive-core.maps
@@ -4,6 +4,7 @@ Map fpls.map
Map l7x-urwvn.map
Map lm.map
Map marvosym.map
+Map mathpple.map
Map original-context-symbol.map
Map pazo.map
Map pxfonts.map
@@ -19,6 +20,7 @@ Map tabvar.map
Map troff-updmap.map
Map txfonts.map
Map utopia.map
+MixedMap ccpl.map
MixedMap cm-super-t1.map
MixedMap cm-super-t2a.map
MixedMap cm-super-t2b.map
@@ -28,10 +30,14 @@ MixedMap cm-super-x2.map
MixedMap cm.map
MixedMap cmextra.map
MixedMap cmtext-bsr-interpolated.map
+MixedMap csother.map
+MixedMap cstext.map
MixedMap cyrillic.map
MixedMap eurosym.map
MixedMap latxfont.map
MixedMap mflogo.map
+MixedMap plother.map
+MixedMap pltext.map
MixedMap rsfs.map
MixedMap stmaryrd.map
MixedMap symbols.map
diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install
index a758c084d..601c4af19 100644..100755
--- a/libre/texlive-core-libre/texlive.install
+++ b/libre/texlive-core-libre/texlive.install
@@ -23,8 +23,8 @@ post_install() {
usr/bin/fmtutil-sys --all 1>/dev/null
echo " done."
echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-# echo "NB: To setup ConTeXt and the lua(la)tex font db,"
-# echo " see http://wiki.archlinux.org/index.php/TeX_Live"
+ echo "NB: To setup ConTeXt and the lua(la)tex font db,"
+ echo " see http://wiki.archlinux.org/index.php/TeX_Live"
}
post_upgrade() {
@@ -45,8 +45,8 @@ post_upgrade() {
usr/bin/fmtutil-sys --all 1>/dev/null
echo " done."
echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-# echo "NB: To setup ConTeXt and the lua(la)tex font db,"
-# echo " see http://wiki.archlinux.org/index.php/TeX_Live"
+ echo "NB: To setup ConTeXt and the lua(la)tex font db,"
+ echo " see http://wiki.archlinux.org/index.php/TeX_Live"
if [[ "$2" == 200* ]]; then
echo "Important note. Some directories have moved:"
echo " \$TEXMFSYSVAR is now /var/lib/texmf (previously /usr/share/texmf-var)"
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index 5565b19b5..cabf58619 100644..100755
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -1,10 +1,11 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
# Maintainer: Rémy Oudompheng <remy.archlinux.org>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=texlive-fontsextra-libre
_pkgname=texlive-fontsextra
-pkgver=2011.24706
-_revnr=${pkgver#2011.}
+pkgver=2012.26866
+_revnr=${pkgver#2012.}
pkgrel=1
pkgdesc="TeX Live - all sorts of extra fonts"
license=('GPL')
@@ -15,31 +16,20 @@ replaces=('texlive-fontsextra')
conflicts=('texlive-fontsextra')
provides=('texlive-fontsextra')
url='http://tug.org/texlive/'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
- "${_pkgname}.maps")
+source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
options=('!emptydirs')
options=(!strip)
install=texlive.install
-md5sums=('d4bd3dbc8c422d049b082d0e8c70d088'
- '6e84e4a8ee6a25adec39cd6310d9bef2')
-
-mksource() {
- [ -f ${_pkgname}-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/${_pkgname}-$pkgver-src.zip
- mkdir ${pkgname}-${pkgver}
- pushd ${pkgname}-${pkgver}
- bsdtar xf ../${_pkgname}-$pkgver-src.zip
- # remove nonfree packages
- # No specific free license.
- rm ogham.tar.xz
- # Remove them from package list.
- sed -ri '/^ogham /d' CONTENTS
- popd
- tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}
- rm -rf ${pkgname}-${pkgver}
-}
+md5sums=('f75e552c4573ce73d3eee03fffee723f'
+ '4a2f2b3b4527655fb47ab0d59b01bfea')
build() {
- cd "$srcdir/${pkgname}-${pkgver}"
+ cd "$srcdir"
+ # remove nonfree packages
+ # No specific free license.
+ rm ogham.tar.xz
+ # Remove them from package list.
+ sed -ri '/^ogham /d' CONTENTS
for p in *.tar.xz; do
bsdtar -xf $p
done
@@ -47,11 +37,11 @@ build() {
}
package() {
- cd "$srcdir/${pkgname}-${pkgver}"
+ cd "$srcdir"
install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
sed -i '/^#/d' CONTENTS
install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
- install -m644 $srcdir/${_pkgname}.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
+ install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
install -m755 -d $pkgdir/usr/share
wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
for dir in $wanteddirs; do
diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
index 4ef977ffa..fbced973a 100644..100755
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
@@ -5,6 +5,7 @@ Map ArtNouv.map
Map ArtNouvc.map
Map BulletsADF.map
Map Carrickc.map
+Map CountriesOfEurope.map
Map ESSTIX.map
Map Eichenla.map
Map Eileen.map
@@ -31,6 +32,7 @@ Map ap.map
Map archaicprw.map
Map arev.map
Map ascii.map
+Map aspectratio.map
Map augie.map
Map auncial.map
Map aurical.map
@@ -77,7 +79,9 @@ Map linearA.map
Map mathabx.map
Map mdbch.map
Map mdput.map
+Map mdsymbol.map
Map mdugm.map
+Map ntx.map
Map ocrb.map
Map opensans.map
Map paratype-type1.map
@@ -87,6 +91,7 @@ Map prodint.map
Map pxtx.map
Map recycle.map
Map rsfso.map
+Map sansmathaccent.map
Map sqrcaps.map
Map starfont.map
Map tfrupee.map
diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install
index c2c5e8165..c2c5e8165 100644..100755
--- 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 2093836c9..d806b73fd 100644..100755
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -1,11 +1,12 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
# Maintainer: Firmicus <firmicus āt gmx dōt net>
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=texlive-latexextra-libre
_pkgname=texlive-latexextra
-pkgver=2011.24718
-_revnr=${pkgver#2011.}
+pkgver=2012.26807
+_revnr=${pkgver#2012.}
pkgrel=1
pkgdesc="TeX Live - Large collection of add-on packages for LaTeX"
license=('GPL')
@@ -20,44 +21,29 @@ replaces=('texlive-latexextra')
conflicts=('texlive-latexextra')
groups=('texlive-most')
url='http://tug.org/texlive/'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
- "${_pkgname}.maps")
+source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
options=('!emptydirs')
options=(!strip)
install=texlive.install
-md5sums=('adab55bb38506c25f3176af64cf30f27'
+md5sums=('868dc1824391768e120fdd71ba28e520'
'9e4825f47dac663dd62c4bfa67899e84')
-mksource() {
- [ -f ${_pkgname}-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/${_pkgname}-$pkgver-src.zip
- mkdir ${pkgname}-${pkgver}
- pushd ${pkgname}-${pkgver}
- bsdtar xf ../${_pkgname}-$pkgver-src.zip
- # remove nonfree packages
- # No specific free license.
- rm {authoraftertitle,clock,fltpage,fnpara}.tar.xz
- # No explicit modification permission.
- rm cmdtrack.tar.xz
- # Remove them from package list.
- sed -ri '/^(authoraftertitle|clock+fltpage|fnpara|cmdtrack) /d' CONTENTS
- popd
- tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}
- rm -rf ${pkgname}-${pkgver}
-}
-
build() {
- cd "$srcdir/${pkgname}-${pkgver}"
+ # remove nonfree packages
+ # No specific free license.
+ rm {authoraftertitle,clock,fnpara}.tar.xz
+ # Remove them from package list.
+ sed -ri '/^(authoraftertitle|fnpara) /d' CONTENTS
for p in *.tar.xz; do
bsdtar -xf $p
done
rm -rf {tlpkg,doc,source} || true
}
package() {
- cd "$srcdir/${pkgname}-${pkgver}"
install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
sed -i '/^#/d' CONTENTS
install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
- install -m644 $srcdir/${_pkgname}.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
+ install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
install -m755 -d $pkgdir/usr/share
wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
for dir in $wanteddirs; do
@@ -74,11 +60,11 @@ package() {
#add symlinks that were in texlive-bin:
install -m755 -d $pkgdir/usr/bin
ln -s /usr/share/texmf-dist/scripts/authorindex/authorindex $pkgdir/usr/bin/authorindex
+ ln -s /usr/share/texmf-dist/scripts/exceltex/exceltex $pkgdir/usr/bin/exceltex
ln -s /usr/share/texmf-dist/scripts/glossaries/makeglossaries $pkgdir/usr/bin/makeglossaries
ln -s /usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl $pkgdir/usr/bin/pdfannotextractor
ln -s /usr/share/texmf-dist/scripts/ppower4/pdfthumb.tlu $pkgdir/usr/bin/pdfthumb
ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl $pkgdir/usr/bin/perltex
- #ln -s /usr/share/texmf-dist/scripts/ppower4/ppower4.tlu $pkgdir/usr/bin/ppower4
ln -s /usr/share/texmf-dist/scripts/pst-pdf/ps4pdf $pkgdir/usr/bin/ps4pdf
ln -s /usr/share/texmf-dist/scripts/splitindex/perl/splitindex.pl $pkgdir/usr/bin/splitindex
ln -s /usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl $pkgdir/usr/bin/svn-multi
diff --git a/libre/texlive-latexextra-libre/texlive-latexextra.maps b/libre/texlive-latexextra-libre/texlive-latexextra.maps
index b97f37fdd..b97f37fdd 100644..100755
--- 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 e8878db08..e8878db08 100644..100755
--- a/libre/texlive-latexextra-libre/texlive.install
+++ b/libre/texlive-latexextra-libre/texlive.install
diff --git a/libre/thunderbird-libre/.directory b/libre/thunderbird-libre/.directory
index 6ec9fb1ce..6ec9fb1ce 100644..100755
--- a/libre/thunderbird-libre/.directory
+++ b/libre/thunderbird-libre/.directory
diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index 134f0efd0..134f0efd0 100644..100755
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
diff --git a/libre/thunderbird-libre/channel-prefs.js b/libre/thunderbird-libre/channel-prefs.js
index 13b1ba388..13b1ba388 100644..100755
--- a/libre/thunderbird-libre/channel-prefs.js
+++ b/libre/thunderbird-libre/channel-prefs.js
diff --git a/libre/thunderbird-libre/clrf.patch b/libre/thunderbird-libre/clrf.patch
index 5a77f2b01..5a77f2b01 100644..100755
--- a/libre/thunderbird-libre/clrf.patch
+++ b/libre/thunderbird-libre/clrf.patch
diff --git a/libre/thunderbird-libre/gcc47.patch b/libre/thunderbird-libre/gcc47.patch
index 080502c23..080502c23 100644..100755
--- a/libre/thunderbird-libre/gcc47.patch
+++ b/libre/thunderbird-libre/gcc47.patch
diff --git a/libre/thunderbird-libre/mozconfig b/libre/thunderbird-libre/mozconfig
index 8950db703..8950db703 100644..100755
--- a/libre/thunderbird-libre/mozconfig
+++ b/libre/thunderbird-libre/mozconfig
diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD
index 6a0c46222..6a0c46222 100644..100755
--- a/libre/thunderbird-libre/rePKGBUILD
+++ b/libre/thunderbird-libre/rePKGBUILD
diff --git a/libre/thunderbird-libre/searchplugins-libre.patch b/libre/thunderbird-libre/searchplugins-libre.patch
index e466a9eb3..e466a9eb3 100644..100755
--- a/libre/thunderbird-libre/searchplugins-libre.patch
+++ b/libre/thunderbird-libre/searchplugins-libre.patch
diff --git a/libre/thunderbird-libre/thunderbird-install-dir.patch b/libre/thunderbird-libre/thunderbird-install-dir.patch
index 74e692bf2..74e692bf2 100644..100755
--- a/libre/thunderbird-libre/thunderbird-install-dir.patch
+++ b/libre/thunderbird-libre/thunderbird-install-dir.patch
diff --git a/libre/thunderbird-libre/thunderbird.desktop b/libre/thunderbird-libre/thunderbird.desktop
index a626e52ba..a626e52ba 100644..100755
--- a/libre/thunderbird-libre/thunderbird.desktop
+++ b/libre/thunderbird-libre/thunderbird.desktop
diff --git a/libre/thunderbird-libre/thunderbird.install b/libre/thunderbird-libre/thunderbird.install
index 4d4a283db..4d4a283db 100644..100755
--- a/libre/thunderbird-libre/thunderbird.install
+++ b/libre/thunderbird-libre/thunderbird.install
diff --git a/libre/thunderbird-libre/vendor.js b/libre/thunderbird-libre/vendor.js
index 170b505a8..170b505a8 100644..100755
--- a/libre/thunderbird-libre/vendor.js
+++ b/libre/thunderbird-libre/vendor.js
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
new file mode 100644
index 000000000..01502f813
--- /dev/null
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: xduugu
+# Contributor: nh2
+# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
+# Contributor: Nick B <Shirakawasuna ð gmail đ com>
+# Contributor: Christof Musik <christof ð senfdax đ de>
+# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
+# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+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')
+url='https://github.com/evgeni/tp_smapi'
+license=('GPL')
+depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
+makedepends=('linux-libre-lts-headers>=3.0' 'linux-libre-lts-headers<3.1')
+replaces=('tp_smapi-lts')
+conflicts=('tp_smapi-lts')
+provides=("tp_smapi-lts=${pkgver}")
+install='tp_smapi-lts.install'
+source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
+md5sums=('63c683415c764568f6bf17c7eabe4752')
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ _kernver=$(< "${_extramodules}/version")
+
+ sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \
+ -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile
+
+ make HDAPS=1
+}
+
+package() {
+ _kernver=$(< "${_extramodules}/version")
+
+ make -C "${_extramodules%/*}/${_kernver}/build" \
+ INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \
+ M="${srcdir}/${_pkgname}-${pkgver}" modules_install
+
+ cd "${pkgdir}/${_extramodules%/*}"
+ mv "${_kernver}/extra" "${_extramodules##*/}"
+ rmdir "${_kernver}"
+
+ # compress kernel modules
+ find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
+
+ # load module on startup
+ echo tp_smapi > "${srcdir}/tp_smapi-lts.conf"
+ install -Dm644 "${srcdir}/tp_smapi-lts.conf" "${pkgdir}/usr/lib/modules-load.d/tp_smapi-lts.conf"
+
+ # update kernel version in install file
+ sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/tp_smapi-lts.install"
+}
diff --git a/libre/tp_smapi-libre-lts/tp_smapi-lts.install b/libre/tp_smapi-libre-lts/tp_smapi-lts.install
new file mode 100644
index 000000000..2723fead7
--- /dev/null
+++ b/libre/tp_smapi-libre-lts/tp_smapi-lts.install
@@ -0,0 +1,13 @@
+extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
+
+post_install() {
+ depmod -v $(< "$extramodules/version") &>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
new file mode 100644
index 000000000..27e9ce6ea
--- /dev/null
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -0,0 +1,63 @@
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: xduugu
+# Contributor: nh2
+# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
+# Contributor: Nick B <Shirakawasuna ð gmail đ com>
+# Contributor: Christof Musik <christof ð senfdax đ de>
+# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
+# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=tp_smapi
+pkgname=tp_smapi-libre
+pkgver=0.41
+pkgrel=11
+pkgdesc="Modules for ThinkPad's SMAPI functionality"
+arch=('i686' 'x86_64')
+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')
+replaces=("${_pkgname}")
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
+install="${_pkgname}.install"
+source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
+md5sums=('63c683415c764568f6bf17c7eabe4752')
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ _kernver=${_kernver:-$(uname -r)}
+ _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true)
+ _kernver=$(< "${_extramodules}/version")
+
+ sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \
+ -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile
+
+ make HDAPS=1
+}
+
+package() {
+ _kernver=${_kernver:-$(uname -r)}
+ _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true)
+ _kernver=$(< "${_extramodules}/version")
+
+ make -C "${_extramodules%/*}/${_kernver}/build" \
+ INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \
+ M="${srcdir}/${_pkgname}-${pkgver}" modules_install
+
+ cd "${pkgdir}/${_extramodules%/*}"
+ mv "${_kernver}/extra" "${_extramodules##*/}"
+ rmdir "${_kernver}"
+
+ # compress kernel libre modules
+ find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
+
+ # load module on startup
+ echo tp_smapi > "${srcdir}/${_pkgname}.conf"
+ install -Dm644 "${srcdir}/${_pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${_pkgname}.conf"
+
+ # update kernel libre version in install file
+ sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${_pkgname}.install"
+}
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
new file mode 100644
index 000000000..3662e7f34
--- /dev/null
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -0,0 +1,13 @@
+extramodules=/usr/lib/modules/extramodules-3.6-ARCH
+
+post_install() {
+ depmod -v $(< "$extramodules/version") &>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/ttf-thai-libre/PKGBUILD b/libre/ttf-thai-libre/PKGBUILD
index 3d1d4ec3d..3d1d4ec3d 100644..100755
--- 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 100644..100755
--- a/libre/ttf-thai-libre/ttf.install
+++ b/libre/ttf-thai-libre/ttf.install
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
index a76fd4679..9921c6d9d 100644..100755
--- a/libre/unarchiver/PKGBUILD
+++ b/libre/unarchiver/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: N30N <archlinux@alunamation.com>
pkgname=unarchiver
-pkgver=3.1
-pkgrel=2
+pkgver=3.2
+pkgrel=1
pkgdesc="An Objective-C application for uncompressing archive files"
arch=('x86_64' 'i686')
url="http://unarchiver.c3.cx/"
@@ -13,9 +13,9 @@ makedepends=('gcc-objc')
source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip"
"native_obj_exceptions.patch"
"libz.patch")
-sha1sums=('a8a28e3372a8811689c39871f5de86c64c8c466c'
- 'b8024026607dc2de758479b73d8b01ca6f692b59'
- '003d114a0ba9a919af602881ef5e04cdba2e4c50')
+md5sums=('a23d7fbfe1f66b0950a359f206df5c8d'
+ '4fa4ecc6e4ba14d3b6952d064e728511'
+ '665d01bf93191cc6f57dc80d8c1d3d5a')
build() {
cd "$srcdir/The Unarchiver"
diff --git a/libre/unarchiver/libz.patch b/libre/unarchiver/libz.patch
index acba51463..acba51463 100644..100755
--- a/libre/unarchiver/libz.patch
+++ b/libre/unarchiver/libz.patch
diff --git a/libre/unarchiver/native_obj_exceptions.patch b/libre/unarchiver/native_obj_exceptions.patch
index 9c84918b2..9c84918b2 100644..100755
--- a/libre/unarchiver/native_obj_exceptions.patch
+++ b/libre/unarchiver/native_obj_exceptions.patch
diff --git a/libre/unrar-libre/PKGBUILD b/libre/unrar-libre/PKGBUILD
index e08e90220..e08e90220 100644..100755
--- a/libre/unrar-libre/PKGBUILD
+++ b/libre/unrar-libre/PKGBUILD
diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD
index 2e5aa615c..2e5aa615c 100644..100755
--- a/libre/ununrar/PKGBUILD
+++ b/libre/ununrar/PKGBUILD
diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD
index 20c3885f9..20c3885f9 100644..100755
--- a/libre/unzip-libre/PKGBUILD
+++ b/libre/unzip-libre/PKGBUILD
diff --git a/libre/unzip-libre/SRCBUILD b/libre/unzip-libre/SRCBUILD
index a9ada936b..a9ada936b 100644..100755
--- a/libre/unzip-libre/SRCBUILD
+++ b/libre/unzip-libre/SRCBUILD
diff --git a/libre/unzip-libre/match.patch b/libre/unzip-libre/match.patch
index 6ba65fee0..6ba65fee0 100644..100755
--- 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
new file mode 100755
index 000000000..e4de1dca7
--- /dev/null
+++ b/libre/vhba-module-libre/60-vhba.rules
@@ -0,0 +1,13 @@
+ACTION=="remove", GOTO="vhba_end"
+KERNEL!="vhba_ctl", GOTO="vhba_end"
+
+NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
+
+TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess"
+TAG+="udev-acl"
+GOTO="vhba_end"
+
+LABEL="vhba_uaccess"
+TAG+="uaccess"
+
+LABEL="vhba_end"
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
new file mode 100755
index 000000000..febefacfa
--- /dev/null
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+# Contributor: Charles Lindsay <charles@chaoslizard.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_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')
+url="http://cdemu.sourceforge.net/"
+license=('GPL')
+depends=('linux-libre>=3.6' 'linux-libre<3.7')
+makedepends=('linux-libre-headers')
+options=(!makeflags)
+install=$_pkgname.install
+replaces=('vhba-module')
+conflicts=('vhba-module')
+provides=("vhba-module=$pkgver")
+source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
+ '60-vhba.rules')
+md5sums=('d97372da1d270d1605742b2995fb6678'
+ 'b5e82d0160e7a181219b67c1794d5c27')
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
+
+ make KDIR=/usr/lib/modules/$_kernver/build
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ install -Dm644 vhba.ko \
+ "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
+
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \
+ "$startdir/vhba-module.install"
+
+ install -Dm644 "$srcdir/60-vhba.rules" \
+ "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
new file mode 100755
index 000000000..8bd740943
--- /dev/null
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -0,0 +1,21 @@
+_updatemod() {
+ echo " > Updating module dependencies..."
+ EXTRAMODULES='extramodules-3.6-LIBRE'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+ post_upgrade
+}
+
+post_upgrade() {
+ getent group cdemu &>/dev/null || groupadd -r cdemu
+ _updatemod
+}
+
+post_remove() {
+ _updatemod
+ groupdel cdemu
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
new file mode 100644
index 000000000..d836a3a37
--- /dev/null
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgbase=virtualbox-libre-modules-lts
+pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
+pkgver=4.2.4
+pkgrel=1.1
+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')
+
+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
+ # build host modules
+ msg2 'Host modules'
+ dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
+ # build guest modules
+ msg2 'Guest modules'
+ dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
+}
+
+package_virtualbox-libre-host-modules-lts(){
+ pkgdesc='Host kernel libre modules for VirtualBox'
+ 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"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules-lts.install"
+}
+
+package_virtualbox-libre-guest-modules-lts(){
+ pkgdesc='Guest kernel libre modules for VirtualBox'
+ license=('GPL')
+ 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"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules-lts.install"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules-lts/build.sh b/libre/virtualbox-libre-modules-lts/build.sh
new file mode 100755
index 000000000..4c3c29e30
--- /dev/null
+++ b/libre/virtualbox-libre-modules-lts/build.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if (( $# != 1 )); then
+ echo "usage: $0 extra"
+ echo " $0 testing"
+ 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 -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 -r /var/lib/archbuild/$1-x86_64
+
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install b/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install
index 80d966a9d..54a052390 100644
--- a/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install
+++ b/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install
@@ -4,13 +4,13 @@ post_install() {
cat << EOF
===> You may want to load vboxguest, vboxsf and vboxvideo
EOF
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_remove() {
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-modules-lts/virtualbox-modules-lts.install b/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install
index 014fa0b88..4503996e8 100644
--- a/libre/virtualbox-modules-lts/virtualbox-modules-lts.install
+++ b/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install
@@ -1,18 +1,18 @@
EXTRAMODULES='extramodules-3.0-LIBRE-LTS'
post_install() {
-/bin/cat << EOF
+cat << EOF
===> You must load vboxdrv module before starting VirtualBox:
===> # modprobe vboxdrv
EOF
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
echo 'In order to use the new version, reload all virtualbox modules manually.'
}
post_remove() {
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-libre-modules/.directory b/libre/virtualbox-libre-modules/.directory
new file mode 100755
index 000000000..9f6471595
--- /dev/null
+++ b/libre/virtualbox-libre-modules/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2012,8,16,6,34,39
+Version=3
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
new file mode 100755
index 000000000..1ecee7b2c
--- /dev/null
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgbase=virtualbox-libre-modules
+pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
+pkgver=4.2.4
+pkgrel=2
+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')
+
+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
+ # build host modules
+ msg2 'Host modules'
+ dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
+ # build guest modules
+ msg2 'Guest modules'
+ dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
+}
+
+package_virtualbox-libre-host-modules(){
+ pkgdesc='Host kernel libre modules for VirtualBox'
+ depends=('linux-libre>=3.6' 'linux-libre<3.7')
+ 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"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules.install"
+}
+
+package_virtualbox-libre-guest-modules(){
+ pkgdesc='Guest kernel libre modules for VirtualBox'
+ license=('GPL')
+ depends=('linux-libre>=3.6' 'linux-libre<3.7')
+ 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"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+ 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
new file mode 100755
index 000000000..f798a615d
--- /dev/null
+++ b/libre/virtualbox-libre-modules/build.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if (( $# != 1 )); then
+ echo "usage: $0 extra"
+ echo " $0 testing"
+ 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 -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 -r /var/lib/archbuild/$1-x86_64
+
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
new file mode 100755
index 000000000..caf59aa13
--- /dev/null
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -0,0 +1,17 @@
+post_install() {
+cat << EOF
+===> You may want to load vboxguest, vboxsf and vboxvideo
+EOF
+ EXTRAMODULES='extramodules-3.6-LIBRE'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.6-LIBRE'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.6-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
new file mode 100755
index 000000000..8605cf20a
--- /dev/null
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
@@ -0,0 +1,19 @@
+post_install() {
+cat << EOF
+===> You must load vboxdrv module before starting VirtualBox:
+===> # modprobe vboxdrv
+EOF
+ EXTRAMODULES='extramodules-3.5-LIBRE'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.5-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'
+ 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
new file mode 100644
index 000000000..51fd6361c
--- /dev/null
+++ b/libre/virtualbox-libre/001-vboxdrv-reference.patch
@@ -0,0 +1,112 @@
+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 "
+ "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
+- "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 "
++ "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."
+ );
+
+ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
+- "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/> "
++ " <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
+ 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
+- 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
+
+- sudo /etc/init.d/vboxdrv setup
++ sudo dkms autoinstall
+
+ You will not be able to start VMs until this problem is fixed.
+ EOF
+ elif [ ! -c /dev/vboxdrv ]; then
+ cat << EOF
+-WARNING: The character device /dev/vboxdrv does not exist. Try
++WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
+
+- sudo /etc/init.d/vboxdrv restart
++ sudo modprobe vboxdrv
+
+ 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/change_default_driver_dir.patch b/libre/virtualbox-libre/002-change_default_driver_dir.patch
index d8531499d..d8531499d 100644..100755
--- a/libre/virtualbox-libre/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 100644..100755
--- a/libre/virtualbox-libre/10-vboxdrv.rules
+++ b/libre/virtualbox-libre/10-vboxdrv.rules
diff --git a/libre/virtualbox-modules-lts/60-vboxguest.rules b/libre/virtualbox-libre/60-vboxguest.rules
index 6285f7249..6285f7249 100644
--- a/libre/virtualbox-modules-lts/60-vboxguest.rules
+++ b/libre/virtualbox-libre/60-vboxguest.rules
diff --git a/libre/virtualbox-libre/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk
index d42cd3e1f..6eca06d9b 100644..100755
--- a/libre/virtualbox-libre/LocalConfig.kmk
+++ b/libre/virtualbox-libre/LocalConfig.kmk
@@ -10,6 +10,7 @@ VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
VBOX_PATH_APP_DOCS := /usr/share/virtualbox
+VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
VBOX_WITH_REGISTRATION_REQUEST =
VBOX_WITH_UPDATE_REQUEST =
VBOX_WITH_VNC := 1
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 402d1c7fd..54978ea3c 100644..100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,80 +1,203 @@
# $Id$
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
-# Changes:
-# * Adapt to linux-libre
-# * virtualbox-{archlinux,parabola}-*
-# * Removed unfree user manual
-# * Package with --pkg "virtualbox-parabola-additions virtualbox-parabola-modules"
-# Based on
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
pkgbase=virtualbox-libre
-pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.16
+pkgname=('virtualbox-libre'
+ 'virtualbox-libre-sdk'
+ 'virtualbox-libre-host-source'
+ 'virtualbox-libre-guest-utils'
+ 'virtualbox-libre-guest-source')
+pkgver=4.2.4
pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2')
-#'xorg-server-devel' 'xf86driproto' 'libxcomposite')
+makedepends=('alsa-lib'
+ 'bin86'
+ 'cdrkit-libre'
+ 'curl'
+ 'dev86'
+ 'gsoap'
+ 'iasl'
+ 'jdk7-openjdk'
+ 'libidl2'
+ 'libpulse'
+ 'libstdc++5'
+ 'libvncserver'
+ 'libxcursor'
+ 'libxinerama'
+ 'libxml2'
+ 'libxmu'
+ 'libxrandr'
+ 'libxslt'
+ 'libxtst'
+ 'linux-libre-headers'
+ 'mesa'
+ 'glu'
+ 'python2'
+ 'qt'
+ 'sdl-libre'
+ 'sdl_ttf'
+ 'vde2'
+ 'xalan-c')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
- 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
- change_default_driver_dir.patch vbox-service.conf vbox-service.rc
- vboxweb.conf vboxweb.rc)
-
-_extramodules=extramodules-3.4-LIBRE
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
+source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
+ '10-vboxdrv.rules'
+ '60-vboxguest.rules'
+ 'LocalConfig.kmk'
+ 'vboxservice.conf'
+ 'vboxservice.rc'
+ 'vboxservice.service'
+ 'vboxweb.conf'
+ 'vboxweb.rc'
+ 'vboxweb.service'
+ '001-vboxdrv-reference.patch'
+ '002-change_default_driver_dir.patch'
+ 'os_blag_64.png'
+ 'os_blag.png'
+ 'os_dragora_64.png'
+ 'os_dragora.png'
+ 'os_dynebolic.png'
+ 'os_gnewsense_64.png'
+ 'os_gnewsense.png'
+ 'os_gnu_64.png'
+ 'os_gnu.png'
+ 'os_musix_64.png'
+ 'os_musix.png'
+ 'os_parabola_64.png'
+ 'os_parabola.png'
+ 'os_trisquel_64.png'
+ 'os_trisquel.png'
+ 'os_ututo_64.png'
+ 'os_ututo.png'
+ 'os_venenux.png'
+ 'libre.patch'
+ 'free-distros.patch')
+md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
+ '5f85710e0b8606de967716ded7b2d351'
+ 'ed1341881437455d9735875ddf455fbe'
+ '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
+ '3c08ad30b89add47d3f45121200a5360'
+ '7d9823507206de9b8528a72af2f18d74'
+ '07c5f6d86c4b7839d719c8ee0c53653b'
+ '7e9483b1069a54f181546083ac7e5469'
+ 'c159d683ba1947290fc2ad2c64194150'
+ 'bc9efed88e0469cd7fc460d5a5cd7b4b'
+ '4f1692638d6740df4c4ad9766ba4e179'
+ '97e193f050574dd272a38e5ee5ebe62b'
+ '8538dba8686d7449cb481c9bae9d722a'
+ '545c925b46f2ac95e5f8ae407fad101a'
+ 'f6416f509c2e5460e4dc624e0a57f3c1'
+ 'bbfb59dd517c020a23701b480187a355'
+ 'efacfdb61918286ea9bc89866b8fd239'
+ '7c3eb09995e8bafeef414374e44ad4ce'
+ 'a49ed3ab6bd0fb084de0ab3dd97ae93e'
+ '6b432b3305ed446125eef052c38355a6'
+ 'a70022a468bd3e9daf01818d2d74ac3c'
+ '380eb2ab6cad3da198094585853c129c'
+ 'a60bb9a98abcc3c34156f9051d00df9a'
+ '3a908ef6952bcf987e63ef2fe4e98d24'
+ '02e87c39c353634cecacf98f1707fa15'
+ '0cf41a41e7a415d404d5584e047fd450'
+ '449cde3b58390284b59c5d663de3edc9'
+ 'c7951fe6888d939f3a7d0dafe477e82b'
+ '4da8eeb2ece7e475fc7a0d1003da26c6'
+ '5e4187af59726d71c5be48d0cd816c34'
+ '85141ccd2621a8e004b8f55c9a1f83eb'
+ 'c7b29fbf4c24a00e8646ca6dd73f38a1')
build() {
- cd "$srcdir/VirtualBox-${pkgver}"
+ cd "VirtualBox-$pkgver"
- patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
- patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+ # Apply patches
+ for _p in "$srcdir"/*.patch; do
+ [[ -e $_p ]] || continue
+ msg2 "Apply patch ${_p##*/}"
+ patch -Np1 -i "$_p"
+ done
+
+ ## Removing Nonfree directories and Nonfree files
+ rm -rv "./include/VBox/ExtPack"
+ rm -rv "./src/VBox/ExtPacks"
+ rm -rv "./src/VBox/Main/src-helper-apps"
+ rm -rv "./src/VBox/Main/include/ExtPackManagerImpl.h"
+ rm -rv "./src/VBox/Main/include/ExtPackUtil.h"
+ rm -rv "./src/VBox/Main/src-all/ExtPackManagerImpl.cpp"
+ rm -rv "./src/VBox/Main/src-all/ExtPackUtil.cpp"
+
+ ## Removing Oracle VM VirtualBox Extension Pack icons
+ rm -v "./src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns"
+ rm -v "./src/VBox/Resources/other/virtualbox-vbox-extpack-"{16px,20px,24px,32px,40px,48px,64px,72px,80px,96px,128px,256px,512px}.png
+ rm -v "./src/VBox/Resources/win/OSE/virtualbox-vbox-extpack.ico"
+ rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png
+
+ ## Adding free distros icons
+ for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
+ cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
+ done
cp "$srcdir/LocalConfig.kmk" .
+ # fake makeself binary to compile without nofatal
+ ln -s /bin/echo makeself
+ export PATH="$CWD:$PATH"
+
./configure --disable-docs \
--enable-webservice \
--enable-vde \
--enable-vnc \
- --nofatal \
- --with-linux=/usr/src/linux-${_kernver}
+ --disable-kmods
+# --with-linux=/usr/src/linux-${_kernver}
source ./env.sh
kmk all
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
+ cp "$srcdir/LocalConfig.kmk" .
+ kmk all
}
package_virtualbox-libre() {
- pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
- depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
- optdepends=('qt: for VirtualBox GUI'
+ 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'
+ 'virtualbox-libre-host-modules')
+ optdepends=('qt: VirtualBox GUI support'
'vde2: Virtual Distributed Ethernet support'
- 'virtualbox-sdk: developer kit'
- 'virtualbox-source: host kernel source modules for non-stock kernels'
- 'net-tools: for host-only or bridged networking')
-
- backup=('etc/vbox/vbox.cfg')
+ 'virtualbox-libre-sdk: Developer kit'
+ 'virtualbox-libre-host-source: Host kernel libre 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')
conflicts=('virtualbox' 'virtualbox-ose')
provides=("virtualbox=$pkgver")
- install=virtualbox.install
+ install=virtualbox-libre.install
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
-
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
- mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls}
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+ install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
#Binaries and Wrapper with Launchers
install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
- for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do
+ for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do
ln -sf VBox "$pkgdir/usr/bin/$i"
+ ln -sf VBox "$pkgdir/usr/bin/${i,,}"
done
install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
+ install -m 0755 rdesktop-vrdp "$pkgdir/usr/bin"
#components
install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
@@ -86,11 +209,14 @@ package_virtualbox-libre() {
#setuid root binaries
install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
#other binaries
- install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
+ install -m 0755 VBoxManage VBoxSVC VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
#language
install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
+ #rdesktop keymaps
+ install -m 0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
+
#useless scripts
install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
@@ -120,87 +246,103 @@ package_virtualbox-libre() {
# install rc.d script
install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb"
+ # install systemd service
+ install -D -m644 "$srcdir/vboxweb.service" \
+ "$pkgdir/usr/lib/systemd/system/vboxweb.service"
# install sample config
install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb"
}
-package_virtualbox-source() {
- pkgdesc="VirtualBox kernel modules source"
- depends=(gcc make)
- provides=(virtualbox-modules)
- optdepends=('linux-libre-headers'
- 'linux-libre-lts-headers')
- install=virtualbox-source.install
-
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
- mkdir -p $pkgdir/usr/lib/virtualbox
-
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
- #sources for modules
- cp -r src ${pkgdir}/usr/lib/virtualbox
- #install compilation script
- install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild"
-}
-
-package_virtualbox-sdk() {
- pkgdesc="VirtualBox Software Developer Kit (SDK)"
+package_virtualbox-libre-sdk() {
+ pkgdesc='VirtualBox Software Developer Kit (SDK)'
depends=('python2')
+ replaces=('virtualbox-sdk')
+ conflicts=('virtualbox-sdk')
+ provides=("virtualbox-sdk=$pkgver")
- mkdir -p "$pkgdir/usr/lib/virtualbox"
+ install -dm755 "$pkgdir/usr/lib/virtualbox"
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
#python sdk
pushd sdk/installer
- VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}"
+ VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir"
popd
rm -rf sdk/installer
mv sdk "$pkgdir/usr/lib/virtualbox"
}
-package_virtualbox-parabola-additions(){
- pkgdesc="Additions only for Parabola guests (userspace tools)"
- depends=("virtualbox-parabola-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
- replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
- conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
- provides=("virtualbox-archlinux-additions=${pkgver}")
+package_virtualbox-libre-host-source() {
+ pkgdesc='VirtualBox Host kernel libre modules source (DKMS)'
+ 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')
+ optdepends=('linux-libre-headers'
+ 'linux-libre-lts-headers')
+ install=virtualbox-libre-host-source.install
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
+ install -dm755 "$pkgdir/usr/src"
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+ cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
+}
+
+package_virtualbox-libre-guest-source() {
+ pkgdesc='VirtualBox Guest kernel libre modules source (DKMS)'
+ 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')
+ optdepends=('linux-libre-headers'
+ 'linux-libre-lts-headers')
+ install=virtualbox-libre-guest-source.install
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+ install -dm755 "$pkgdir/usr/src"
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+ cp -r src "$pkgdir/usr/src/vboxguest-$pkgver"
+}
+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')
+ 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')
+ backup=('etc/conf.d/vboxservice')
+ install=virtualbox-libre-guest-utils.install
+
+ source "VirtualBox-$pkgver/env.sh"
+ pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
install -d "$pkgdir"/{usr/bin,sbin}
install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
install -m755 mount.vboxsf "$pkgdir/sbin"
-
- install -m755 -D "$srcdir"/VirtualBox-${pkgver}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+ install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
"$pkgdir"/usr/bin/VBoxClient-all
- install -m755 -D "$srcdir"/VirtualBox-${pkgver}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
+ install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
"$pkgdir"/etc/xdg/autostart/vboxclient.desktop
- install -D vboxvideo_drv_112.so \
+ install -D vboxvideo_drv_113.so \
"$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
install -d "$pkgdir/usr/lib/xorg/modules/dri"
install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
-
+ popd
+ # install udev rules
+ install -D -m 0644 60-vboxguest.rules \
+ "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
# install rc.d script
- install -D -m755 "$srcdir/vbox-service.rc" "$pkgdir/etc/rc.d/vbox-service"
-
+ install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice"
# install sample config
- install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service"
+ install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice"
+ # install systemd service file
+ install -D -m644 vboxservice.service \
+ "$pkgdir/usr/lib/systemd/system/vboxservice.service"
}
-md5sums=('eacfb802ecdd6d3435228eb3d3488719'
- '5f85710e0b8606de967716ded7b2d351'
- '755ab0dd9bcacf2c00d2275b1ca69547'
- 'a1ff1d1b4423556887e48a32978226a6'
- '3c96faa76894c182c1bb56bb30d9a17e'
- '97e193f050574dd272a38e5ee5ebe62b'
- '3c08ad30b89add47d3f45121200a5360'
- '208cf5f842eb2e3a5b6dcfc59080d26c'
- '3ac185709bfe688bb753c46e170d0546'
- 'c159d683ba1947290fc2ad2c64194150')
+
+# vim:set ts=4 sw=4 et:
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
new file mode 100644
index 000000000..fcdb3c631
--- /dev/null
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -0,0 +1,998 @@
+--- 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 @@
+ VBOXOSTYPE_Unknown, VBOXOSHINT_NONE,
+ 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Windows", "Microsoft Windows", "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 },
+- { "Linux", "Linux", "Linux22", "Linux 2.2",
++ { "GNU", "GNU", "GNU", "GNU",
++ VBOXOSTYPE_GNU, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "GNU", "GNU", "GNU_64", "GNU (64 bit)",
++ VBOXOSTYPE_GNU_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "GNU-Hurd", "GNU-Hurd", "GNUHurd", "GNU-Hurd",
++ VBOXOSTYPE_GNUHurd, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "GNU/Linux", "GNU/Linux", "Linux22", "GNU/Linux with kernel v2.2",
+ VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC,
+ 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", "Linux24", "Linux 2.4",
++ { "GNU/Linux", "GNU/Linux", "Linux24", "GNU/Linux with kernel v2.4",
+ VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC,
+ 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", "Linux24_64", "Linux 2.4 (64 bit)",
++ { "GNU/Linux", "GNU/Linux", "Linux24_64", "GNU/Linux with kernel v2.4 (64 bit)",
+ VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+ 128, 4, 4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", "Linux26", "Linux 2.6",
++ { "GNU/Linux", "GNU/Linux", "Linux26", "GNU/Linux with kernel v2.6",
+ VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", "Linux26_64", "Linux 2.6 (64 bit)",
++ { "GNU/Linux", "GNU/Linux", "Linux26_64", "GNU/Linux with kernel v2.6 (64 bit)",
+ VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", "ArchLinux", "Arch Linux",
++ { "GNU/Linux", "GNU/Linux", "Linux", "Other GNU/Linux",
++ VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "Free Distros", "Free GNU/Linux Distros", "Parabola", "Parabola GNU/Linux-libre",
++ VBOXOSTYPE_Parabola, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "Free Distros", "Free GNU/Linux Distros", "Parabola_64", "Parabola GNU/Linux-libre (64 bit)",
++ VBOXOSTYPE_Parabola_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 },
++ { "Free Distros", "Free GNU/Linux Distros", "gNewSense", "gNewSense",
++ VBOXOSTYPE_gNewSense, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "Free Distros", "Free GNU/Linux Distros", "gNewSense_64", "gNewSense (64 bit)",
++ VBOXOSTYPE_gNewSense_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},
++ { "Free Distros", "Free GNU/Linux Distros", "Blag", "Blag Linux and GNU",
++ VBOXOSTYPE_Blag, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "Free Distros", "Free GNU/Linux Distros", "Blag_64", "Blag Linux and GNU (64 bit)",
++ VBOXOSTYPE_Blag_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 },
++ { "Free Distros", "Free GNU/Linux Distros", "Dragora", "Dragora",
++ VBOXOSTYPE_Dragora, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "Free Distros", "Free GNU/Linux Distros", "Dragora_64", "Dragora (64 bit)",
++ VBOXOSTYPE_Dragora_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 },
++ { "Free Distros", "Free GNU/Linux Distros", "Ututo", "Ututo XS",
++ VBOXOSTYPE_Ututo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "Free Distros", "Free GNU/Linux Distros", "Ututo_64", "Ututo XS (64 bit)",
++ VBOXOSTYPE_Ututo_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 },
++ { "Free Distros", "Free GNU/Linux Distros", "Musix", "Musix",
++ VBOXOSTYPE_Musix, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "Free Distros", "Free GNU/Linux Distros", "Musix_64", "Musix (64 bit)",
++ VBOXOSTYPE_Musix_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},
++ { "Free Distros", "Free GNU/Linux Distros", "Trisquel", "Trisquel",
++ VBOXOSTYPE_Trisquel, 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 },
++ { "Free Distros", "Free GNU/Linux Distros", "Trisquel_64", "Trisquel (64 bit)",
++ VBOXOSTYPE_Trisquel_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 },
++ { "Free Distros", "Free GNU/Linux Distros", "Dynebolic", "Dyne:bolic",
++ VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "Free Distros", "Free GNU/Linux Distros", "Venenux", "Venenux",
++ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
++ 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",
++ 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",
++ 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",
++ 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",
++ 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",
++ 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",
++ 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)",
++ 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",
++ 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)",
++ 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",
++ 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)",
++ 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",
++ 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)",
++ 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",
++ 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)",
++ 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",
++ 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)",
++ 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)",
++ 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",
++ 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",
+ 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)",
+ 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",
+ 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)",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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)",
+ 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",
+ 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",
+ 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",
+ 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",
+ 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",
+ 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",
+ 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)",
+ 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",
+ 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",
+ 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",
+ 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",
+ 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",
+ 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 @@
+
+ static const osTypePattern gs_OSTypePattern[] =
+ {
+- /* DOS: */
+- { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
+-
+- /* Windows: */
+- { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
+- { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
+- { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
+- { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
+- { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
+- { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
+- { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
+- { 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.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
+- { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
+- { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
+- { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
+- { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
+- { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
+- { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
+- { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
+- { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
+-
+- /* Solaris: */
+- { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
+- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
+- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
+- { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
+- { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
+-
+- /* OS/2: */
+- { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
+- { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
+- { 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 free GNU/Linux distributions */
++ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
++ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
++ { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" },
++ { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" },
++ { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" },
++ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
++
++ /* Regular names of free GNU/Linux distributions */
++ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
++ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
++ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
++ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
++ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
++ { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
++ { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
++ { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
++ { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },
++ { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" },
++ { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" },
++ { QRegExp("Mus", Qt::CaseInsensitive), "Musix" },
++ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
++ { 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 @@
+ { 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" },
+
+- /* Regular names of Linux distributions: */
++ /* Regular names of non-free GNU/Linux distributions: */
+ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
+ { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
+ { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
+@@ -115,15 +103,50 @@
+ { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
+ { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
+ { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
+- { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+- { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
+- { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
+- { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
+- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
+- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
+- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
+
+- /* Other: */
++ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
++ { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
++ { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
++ { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
++ { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" },
++ { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" },
++ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
++
++ /* Regular names of non-free operating systems: */
++ { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
++ { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
++ { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
++ { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
++ { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
++ { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
++ { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
++ { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
++ { 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.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
++ { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
++ { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
++ { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
++ { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
++ { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
++ { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
++ { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
++ { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
++ { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
++ { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
++ { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
++ { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
++ { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
++ { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
++ { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
++ { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
++ { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
++ { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
+ { 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 @@
+ { 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 @@
+ { "netware", "Netware" },
+ { "solaris", "Solaris" },
+ { "opensolaris", "OpenSolaris" },
+- { "l4", "L4" }
++ { "l4", "L4" },
++ { "gnu", "GNU" },
++ { "gnuhurd", "GNUHurd" },
++ { "parabola", "Parabola" },
++ { "gnewsense", "gNewSense" },
++ { "blag", "Blag" },
++ { "dragora", "Dragora" },
++ { "ututo", "Ututo" },
++ { "musix", "Musix" },
++ { "trisquel", "Trisquel" },
++ { "dynebolic", "Dynebolic" },
++ { "venenux", "Venenux" }
+ };
+
+ 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 @@
+ <xsl:when test="@OSType='solaris'">Solaris</xsl:when>
+ <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when>
+ <xsl:when test="@OSType='l4'">L4</xsl:when>
++ <xsl:when test="@OSType='gnu'">GNU</xsl:when>
++ <xsl:when test="@OSType='gnuhurd'">GNUHurd</xsl:when>
++ <xsl:when test="@OSType='parabola'">Parabola</xsl:when>
++ <xsl:when test="@OSType='gnewsense'">gNewSense</xsl:when>
++ <xsl:when test="@OSType='blag'">Blag</xsl:when>
++ <xsl:when test="@OSType='dragora'">Dragora</xsl:when>
++ <xsl:when test="@OSType='ututo'">Ututo</xsl:when>
++ <xsl:when test="@OSType='musix'">Musix</xsl:when>
++ <xsl:when test="@OSType='trisquel'">Trisquel</xsl:when>
++ <xsl:when test="@OSType='dynebolic'">Dynebolic</xsl:when>
++ <xsl:when test="@OSType='venenux'">Venenux</xsl:when>
+ </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 @@
+ <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>
++ <file alias="os_parabola.png">images/os_parabola.png</file>
++ <file alias="os_parabola_64.png">images/os_parabola_64.png</file>
++ <file alias="os_gnewsense.png">images/os_gnewsense.png</file>
++ <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file>
++ <file alias="os_blag.png">images/os_blag.png</file>
++ <file alias="os_blag_64.png">images/os_blag_64.png</file>
++ <file alias="os_ututo.png">images/os_ututo.png</file>
++ <file alias="os_ututo_64.png">images/os_ututo_64.png</file>
++ <file alias="os_gnu.png">images/os_gnu.png</file>
++ <file alias="os_gnu_64.png">images/os_gnu_64.png</file>
++ <file alias="os_musix.png">images/os_musix.png</file>
++ <file alias="os_musix_64.png">images/os_musix_64.png</file>
++ <file alias="os_dragora.png">images/os_dragora.png</file>
++ <file alias="os_dragora_64.png">images/os_dragora_64.png</file>
++ <file alias="os_dynebolic.png">images/os_dynebolic.png</file>
++ <file alias="os_venenux.png">images/os_venenux.png</file>
++ <file alias="os_trisquel.png">images/os_trisquel.png</file>
++ <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file>
+ <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 @@
+ {"OS2Warp45", ":/os_os2warp45.png"},
+ {"OS2eCS", ":/os_os2ecs.png"},
+ {"OS2", ":/os_os2_other.png"},
+- {"Linux22", ":/os_linux22.png"},
+- {"Linux24", ":/os_linux24.png"},
+- {"Linux24_64", ":/os_linux24_64.png"},
+- {"Linux26", ":/os_linux26.png"},
+- {"Linux26_64", ":/os_linux26_64.png"},
++ {"Linux22", ":/os_gnu.png"},
++ {"Linux24", ":/os_gnu.png"},
++ {"Linux24_64", ":/os_gnu_64.png"},
++ {"Linux26", ":/os_gnu.png"},
++ {"Linux26_64", ":/os_gnu_64.png"},
+ {"ArchLinux", ":/os_archlinux.png"},
+ {"ArchLinux_64", ":/os_archlinux_64.png"},
+ {"Debian", ":/os_debian.png"},
+@@ -4337,7 +4337,7 @@
+ {"Xandros_64", ":/os_xandros_64.png"},
+ {"Oracle", ":/os_oracle.png"},
+ {"Oracle_64", ":/os_oracle_64.png"},
+- {"Linux", ":/os_linux_other.png"},
++ {"Linux", ":/os_gnu.png"},
+ {"FreeBSD", ":/os_freebsd.png"},
+ {"FreeBSD_64", ":/os_freebsd_64.png"},
+ {"OpenBSD", ":/os_openbsd.png"},
+@@ -4353,6 +4353,25 @@
+ {"MacOS", ":/os_macosx.png"},
+ {"MacOS_64", ":/os_macosx_64.png"},
+ {"JRockitVE", ":/os_jrockitve.png"},
++ {"GNU", ":/os_gnu.png"},
++ {"GNU_64", ":/os_gnu_64.png"},
++ {"GNUHurd", ":/os_gnu.png"},
++ {"Parabola", ":/os_parabola.png"},
++ {"Parabola_64", ":/os_parabola_64.png"},
++ {"gNewSense", ":/os_gnewsense.png"},
++ {"gNewSense_64", ":/os_gnewsense_64.png"},
++ {"Blag", ":/os_blag.png"},
++ {"Blag_64", ":/os_blag_64.png"},
++ {"Dragora", ":/os_dragora.png"},
++ {"Dragora_64", ":/os_dragora_64.png"},
++ {"Ututo", ":/os_ututo.png"},
++ {"Ututo_64", ":/os_ututo_64.png"},
++ {"Musix", ":/os_musix.png"},
++ {"Musix_64", ":/os_musix_64.png"},
++ {"Trisquel", ":/os_trisquel.png"},
++ {"Trisquel_64", ":/os_trisquel_64.png"},
++ {"Dynebolic", ":/os_dynebolic.png"},
++ {"Venenux", ":/os_venenux.png"},
+ };
+ 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 @@
+ VBOXOSTYPE_MacOS = 0xB0000,
+ VBOXOSTYPE_MacOS_x64 = 0xB0100,
+ VBOXOSTYPE_JRockitVE = 0xC0000,
++ VBOXOSTYPE_GNU = 0xD0000,
++ VBOXOSTYPE_GNU_x64 = 0xD0100,
++ VBOXOSTYPE_GNUHurd = 0xE0000,
++ VBOXOSTYPE_Parabola = 0xF0000,
++ VBOXOSTYPE_Parabola_x64 = 0xF0100,
++ VBOXOSTYPE_gNewSense = 0xF1000,
++ VBOXOSTYPE_gNewSense_x64 = 0xF1100,
++ VBOXOSTYPE_Blag = 0xF2000,
++ VBOXOSTYPE_Blag_x64 = 0xF2100,
++ VBOXOSTYPE_Dragora = 0xF3000,
++ VBOXOSTYPE_Dragora_x64 = 0xF3100,
++ VBOXOSTYPE_Ututo = 0xF4000,
++ VBOXOSTYPE_Ututo_x64 = 0xF4100,
++ VBOXOSTYPE_Musix = 0xF5000,
++ VBOXOSTYPE_Musix_x64 = 0xF5100,
++ VBOXOSTYPE_Trisquel = 0xF6000,
++ VBOXOSTYPE_Trisquel_x64 = 0xF6100,
++ VBOXOSTYPE_Dynebolic = 0xF7000,
++ VBOXOSTYPE_Venenux = 0xF8000,
+ /** 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 @@
+ { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS },
+ { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this
+
+- // Linuxes
++ // Custom GNU and GNU-Hurd OS
++ { ovf::CIMOSType_CIMOS_GNU, VBOXOSTYPE_GNU },
++ { ovf::CIMOSType_CIMOS_GNU_64, VBOXOSTYPE_GNU_x64 },
++ { ovf::CIMOSType_CIMOS_GNUHurd, VBOXOSTYPE_GNUHurd },
++
++ // Free GNU/Linux distros
++ { ovf::CIMOSType_CIMOS_gNewSense, VBOXOSTYPE_gNewSense },
++ { ovf::CIMOSType_CIMOS_gNewSense_64, VBOXOSTYPE_gNewSense_x64 },
++ { ovf::CIMOSType_CIMOS_Dragora, VBOXOSTYPE_Dragora },
++ { ovf::CIMOSType_CIMOS_Dragora_64, VBOXOSTYPE_Dragora_x64 },
++ { ovf::CIMOSType_CIMOS_Musix, VBOXOSTYPE_Musix },
++ { ovf::CIMOSType_CIMOS_Musix_64, VBOXOSTYPE_Musix_x64 },
++ { ovf::CIMOSType_CIMOS_Trisquel, VBOXOSTYPE_Trisquel },
++ { ovf::CIMOSType_CIMOS_Trisquel_64, VBOXOSTYPE_Trisquel_x64 },
++ { ovf::CIMOSType_CIMOS_Dynebolic, VBOXOSTYPE_Dynebolic },
++ { ovf::CIMOSType_CIMOS_Venenux, VBOXOSTYPE_Venenux },
++
++ // Free GNU/Linux distros that we have support for but CIM doesn't
++ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Parabola },
++ { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Parabola_x64 },
++ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Blag },
++ { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Blag_x64 },
++ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Ututo },
++ { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Ututo_x64 },
++
++ // Non-free GNU/Linux distros
+ { 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 @@
+ { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 },
+ { ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 },
+
+- // types that we have support for but CIM doesn't
++ // Non-free GNU/Linux distros and non-free operating systems types that we have support for but CIM doesn't
+ { 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 @@
+ /* These are the 32-Bit ones. They are sorted by priority. */
+ static const osTypePattern g_osTypesPattern[] =
+ {
+- {"Windows NT", VBOXOSTYPE_WinNT4},
+- {"Windows XP", VBOXOSTYPE_WinXP},
+- {"Windows 2000", VBOXOSTYPE_Win2k},
+- {"Windows 2003", VBOXOSTYPE_Win2k3},
+- {"Windows Vista", VBOXOSTYPE_WinVista},
+- {"Windows 2008", VBOXOSTYPE_Win2k8},
+- {"SUSE", VBOXOSTYPE_OpenSUSE},
+- {"Novell", VBOXOSTYPE_OpenSUSE},
+- {"Red Hat", VBOXOSTYPE_RedHat},
+- {"Mandriva", VBOXOSTYPE_Mandriva},
+- {"Ubuntu", VBOXOSTYPE_Ubuntu},
+- {"Debian", VBOXOSTYPE_Debian},
+- {"QNX", VBOXOSTYPE_QNX},
+- {"Linux 2.4", VBOXOSTYPE_Linux24},
+- {"Linux 2.6", VBOXOSTYPE_Linux26},
+- {"Linux", VBOXOSTYPE_Linux},
+- {"OpenSolaris", VBOXOSTYPE_OpenSolaris},
+- {"Solaris", VBOXOSTYPE_OpenSolaris},
+- {"FreeBSD", VBOXOSTYPE_FreeBSD},
+- {"NetBSD", VBOXOSTYPE_NetBSD},
+- {"Windows 95", VBOXOSTYPE_Win95},
+- {"Windows 98", VBOXOSTYPE_Win98},
+- {"Windows Me", VBOXOSTYPE_WinMe},
+- {"Windows 3.", VBOXOSTYPE_Win31},
+- {"DOS", VBOXOSTYPE_DOS},
+- {"OS2", VBOXOSTYPE_OS2}
++ {"Windows NT", VBOXOSTYPE_WinNT4},
++ {"Windows XP", VBOXOSTYPE_WinXP},
++ {"Windows 2000", VBOXOSTYPE_Win2k},
++ {"Windows 2003", VBOXOSTYPE_Win2k3},
++ {"Windows Vista", VBOXOSTYPE_WinVista},
++ {"Windows 2008", VBOXOSTYPE_Win2k8},
++ {"SUSE", VBOXOSTYPE_OpenSUSE},
++ {"Novell", VBOXOSTYPE_OpenSUSE},
++ {"Red Hat", VBOXOSTYPE_RedHat},
++ {"Mandriva", VBOXOSTYPE_Mandriva},
++ {"Ubuntu", VBOXOSTYPE_Ubuntu},
++ {"Debian", VBOXOSTYPE_Debian},
++ {"QNX", VBOXOSTYPE_QNX},
++ {"GNU/Linux 2.4", VBOXOSTYPE_Linux24},
++ {"GNU/Linux 2.6", VBOXOSTYPE_Linux26},
++ {"GNU/Linux", VBOXOSTYPE_Linux},
++ {"OpenSolaris", VBOXOSTYPE_OpenSolaris},
++ {"Solaris", VBOXOSTYPE_OpenSolaris},
++ {"FreeBSD", VBOXOSTYPE_FreeBSD},
++ {"NetBSD", VBOXOSTYPE_NetBSD},
++ {"Windows 95", VBOXOSTYPE_Win95},
++ {"Windows 98", VBOXOSTYPE_Win98},
++ {"Windows Me", VBOXOSTYPE_WinMe},
++ {"Windows 3.", VBOXOSTYPE_Win31},
++ {"DOS", VBOXOSTYPE_DOS},
++ {"OS2", VBOXOSTYPE_OS2},
++ {"Parabola", VBOXOSTYPE_Parabola},
++ {"gNewSense", VBOXOSTYPE_gNewSense},
++ {"Blag", VBOXOSTYPE_Blag},
++ {"Dragora", VBOXOSTYPE_Dragora},
++ {"Ututo XS", VBOXOSTYPE_Ututo},
++ {"Musix", VBOXOSTYPE_Musix},
++ {"Trisquel", VBOXOSTYPE_Trisquel},
++ {"Dyne:bolic", VBOXOSTYPE_Dynebolic},
++ {"Venenux", VBOXOSTYPE_Venenux},
++ {"GNU", VBOXOSTYPE_GNU},
++ {"GNU-Hurd", VBOXOSTYPE_GNUHurd},
+ };
+
+ /* These are the 64-Bit ones. They are sorted by priority. */
+ static const osTypePattern g_osTypesPattern64[] =
+ {
+- {"Windows XP", VBOXOSTYPE_WinXP_x64},
+- {"Windows 2003", VBOXOSTYPE_Win2k3_x64},
+- {"Windows Vista", VBOXOSTYPE_WinVista_x64},
+- {"Windows 2008", VBOXOSTYPE_Win2k8_x64},
+- {"SUSE", VBOXOSTYPE_OpenSUSE_x64},
+- {"Novell", VBOXOSTYPE_OpenSUSE_x64},
+- {"Red Hat", VBOXOSTYPE_RedHat_x64},
+- {"Mandriva", VBOXOSTYPE_Mandriva_x64},
+- {"Ubuntu", VBOXOSTYPE_Ubuntu_x64},
+- {"Debian", VBOXOSTYPE_Debian_x64},
+- {"Linux 2.4", VBOXOSTYPE_Linux24_x64},
+- {"Linux 2.6", VBOXOSTYPE_Linux26_x64},
+- {"Linux", VBOXOSTYPE_Linux26_x64},
+- {"OpenSolaris", VBOXOSTYPE_OpenSolaris_x64},
+- {"Solaris", VBOXOSTYPE_OpenSolaris_x64},
+- {"FreeBSD", VBOXOSTYPE_FreeBSD_x64},
++ {"Windows XP", VBOXOSTYPE_WinXP_x64},
++ {"Windows 2003", VBOXOSTYPE_Win2k3_x64},
++ {"Windows Vista", VBOXOSTYPE_WinVista_x64},
++ {"Windows 2008", VBOXOSTYPE_Win2k8_x64},
++ {"SUSE", VBOXOSTYPE_OpenSUSE_x64},
++ {"Novell", VBOXOSTYPE_OpenSUSE_x64},
++ {"Red Hat", VBOXOSTYPE_RedHat_x64},
++ {"Mandriva", VBOXOSTYPE_Mandriva_x64},
++ {"Ubuntu", VBOXOSTYPE_Ubuntu_x64},
++ {"Debian", VBOXOSTYPE_Debian_x64},
++ {"GNU/Linux 2.4", VBOXOSTYPE_Linux24_x64},
++ {"GNU/Linux 2.6", VBOXOSTYPE_Linux26_x64},
++ {"GNU/Linux", VBOXOSTYPE_Linux26_x64},
++ {"OpenSolaris", VBOXOSTYPE_OpenSolaris_x64},
++ {"Solaris", VBOXOSTYPE_OpenSolaris_x64},
++ {"FreeBSD", VBOXOSTYPE_FreeBSD_x64},
++ {"Parabola", VBOXOSTYPE_Parabola_x64},
++ {"gNewSense", VBOXOSTYPE_gNewSense_x64},
++ {"Blag", VBOXOSTYPE_Blag_x64},
++ {"Dragora", VBOXOSTYPE_Dragora_x64},
++ {"Ututo XS", VBOXOSTYPE_Ututo_x64},
++ {"Musix", VBOXOSTYPE_Musix_x64},
++ {"Trisquel", VBOXOSTYPE_Trisquel_x64},
++ {"GNU", VBOXOSTYPE_GNU_x64},
+ };
+
+ /**
+--- 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 @@
+ CIMOSType_CIMOS_CentOS_64 = 107,
+ CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
+ CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
+- CIMOSType_CIMOS_eComStation = 110
++ CIMOSType_CIMOS_eComStation = 110,
+ // no new types added with CIM 2.26.0
++ CIMOSType_CIMOS_gNewSense = 111,
++ CIMOSType_CIMOS_gNewSense_64 = 112,
++ CIMOSType_CIMOS_Dragora = 113,
++ CIMOSType_CIMOS_Dragora_64 = 114,
++ CIMOSType_CIMOS_Musix = 115,
++ CIMOSType_CIMOS_Musix_64 = 116,
++ CIMOSType_CIMOS_Trisquel = 117,
++ CIMOSType_CIMOS_Trisquel_64 = 118,
++ CIMOSType_CIMOS_Dynebolic = 119,
++ CIMOSType_CIMOS_Venenux = 120,
++ CIMOSType_CIMOS_GNU = 121,
++ CIMOSType_CIMOS_GNU_64 = 122
+ };
+
+
+--- 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 @@
+ #ifdef VBOX_WITH_VIDEOHWACCEL
+ /* Check if 2D video acceleration supported by the guest OS type: */
+ QString strguestOSTypeFamily = m_guestOSType.GetFamilyId();
+- m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows";
++ m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Non-free OSs";
+ #endif /* VBOX_WITH_VIDEOHWACCEL */
+ #ifdef VBOX_WITH_CRHGSMI
+ /* Check if WDDM mode supported by the guest OS type: */
diff --git a/libre/virtualbox-libre/gsoap.patch b/libre/virtualbox-libre/gsoap.patch
deleted file mode 100644
index c49caa720..000000000
--- a/libre/virtualbox-libre/gsoap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2012-03-14 08:40:02.447527213 +0000
-+++ configure 2012-03-14 09:05:01.535432453 +0000
-@@ -1959,7 +1959,7 @@
- else
- cnf_append "VBOX_GSOAP_CXX_SOURCES" ""
- fi
-- cnf_append "VBOX_GSOAP_CXX_LIBS" "libgsoap++"
-+ cnf_append "VBOX_GSOAP_CXX_LIBS" "libgsoapssl++ libz"
- log_success "found"
- else
- log_failure "stlvector.h not found -- disabling webservice"
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
new file mode 100755
index 000000000..138bbd612
--- /dev/null
+++ b/libre/virtualbox-libre/libre.patch
@@ -0,0 +1,860 @@
+--- 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
+@@ -56,9 +56,6 @@
+ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES
+ PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES
+
+-# Misc names used bye the install paths below.
+-VBOX_PUEL_MANGLED_NAME := Oracle_VM_VirtualBox_Extension_Pack
+-
+ # Install paths
+ ## @todo This will change after 4.1 is branched off!
+ # What is now 'bin' and 'lib' will be moved down under 'staged/', except on
+@@ -129,9 +126,6 @@
+ endif
+
+ INST_DOC = doc/
+-INST_EXTPACK = $(INST_BIN)ExtensionPacks/
+-INST_EXTPACK_CERTS = $(INST_BIN)ExtPackCertificates/
+-INST_EXTPACK_PUEL = $(INST_EXTPACK)$(VBOX_PUEL_MANGLED_NAME)/
+ INST_PACKAGES = packages/
+
+ VBOX_PATH_SDK = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK))
+@@ -140,7 +134,6 @@
+ VBOX_PATH_ADDITIONS = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
+ VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
+ VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB))
+-VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL))
+ VBOX_PATH_PACKAGES = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES))
+
+
+@@ -215,7 +208,6 @@
+ export VBOX_ADDITIONS_SH_MODE = release
+ export VBOX_DOCUMENTATION_SH_MODE = release
+ export VBOX_EFI_SH_MODE = release
+- export VBOX_EXTPACKS_SH_MODE = release
+ endif
+
+ # Some info on the vendor
+@@ -368,8 +360,6 @@
+ VBOX_WITH_USB = 1
+ # Enable the USB 1.1 controller plus virtual USB HID devices.
+ VBOX_WITH_VUSB = 1
+-# Enable the USB 2.0 controller.
+-VBOX_WITH_EHCI = 1
+ # Enable the ISCSI feature.
+ VBOX_WITH_ISCSI = 1
+ # Enable INIP support in the ISCSI feature.
+@@ -439,9 +429,6 @@
+ ifdef VBOX_WITH_USB
+ VBOX_WITH_VUSB = 1
+ endif
+-ifdef VBOX_WITH_EHCI
+- VBOX_WITH_EHCI_IMPL = 1
+-endif
+ ifdef VBOX_WITH_PCI_PASSTHROUGH
+ VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
+ endif
+@@ -609,17 +596,6 @@
+ endif
+ ## @}
+
+-
+-## @name Extension pack
+-## @{
+-# Enables the extension pack feature.
+-VBOX_WITH_EXTPACK = 1
+-# Enables separating code into the Oracle VM VirtualBox Extension Pack, dubbed PUEL.
+-VBOX_WITH_EXTPACK_PUEL = 1
+-# Enables building+packing the Oracle VM VirtualBox Extension Pack, includes VBOX_WITH_EXTPACK_PUEL
+-VBOX_WITH_EXTPACK_PUEL_BUILD = 1
+-## @}
+-
+ ## @name Misc
+ ## @{
+ # Enable Seamless mode
+@@ -810,14 +786,6 @@
+ # Skip stuff.
+ #
+
+-ifdef VBOX_ONLY_EXTPACKS
+- # Clear some VBOX_WITH_XXX variables instead of adding ifdefs all over the place.
+- VBOX_WITH_DEBUGGER =
+- VBOX_WITH_ADDITIONS =
+- VBOX_WITH_VBOXDRV =
+- VBOX_WITH_TESTCASES =
+-endif
+-
+ # 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 @@
+ VBOX_WITH_TESTSUITE=
+ VBOX_WITH_QTGUI=
+ VBOX_WITH_USB=
+- VBOX_WITH_EHCI=
+ VBOX_WITH_DOCS=
+ VBOX_WITH_PDM_ASYNC_COMPLETION=
+ VBOX_WITH_KCHMVIEWER=
+@@ -894,7 +861,6 @@
+ VBOX_WITH_CROGL=
+ VBOX_WITH_DEBUGGER=
+ VBOX_WITH_DOCS=
+- VBOX_WITH_EHCI=
+ VBOX_WITH_HARDENING=
+ VBOX_WITH_HEADLESS=
+ VBOX_WITH_HGCM=
+@@ -985,9 +951,6 @@
+ #
+ ifdef VBOX_OSE
+ VBOX_WITH_VRDP=
+- VBOX_WITH_EHCI_IMPL=
+- VBOX_WITH_EXTPACK_PUEL=
+- VBOX_WITH_EXTPACK_PUEL_BUILD=
+ VBOX_WITH_PCI_PASSTHROUGH_IMPL=
+ VBOX_WITH_OS2_ADDITIONS_BIN=
+ VBOX_WITH_SECURELABEL=
+@@ -1118,10 +1081,6 @@
+ VBOX_WITH_KCHMVIEWER=
+ endif
+
+-ifdef VBOX_WITH_EXTPACK_PUEL_BUILD
+- VBOX_WITH_EXTPACK_PUEL = 1
+-endif
+-
+ #
+ # Mark OSE builds clearly, helps figuring out limitations more easily.
+ #
+@@ -1744,9 +1703,6 @@
+ # bin2c (convert binary files into C arrays)
+ VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
+
+-# RTManifest (extension pack manifest utility)
+-VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE)
+-
+ # VBoxCmp (simple /bin/cmp with more sensible output)
+ VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
+
+@@ -2638,13 +2594,6 @@
+ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
+ endif
+
+-SDK_VBoxOpenSslExtPack = Internal use only.
+-SDK_VBoxOpenSslExtPack_INCS = $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
+-SDK_VBoxOpenSslExtPack_ORDERDEPS = $(crypto-headers_1_TARGET)
+-SDK_VBoxOpenSslExtPack_LIBS = \
+- $(PATH_STAGE_LIB)/VBoxExtPack-libssl$(VBOX_SUFF_LIB) \
+- $(PATH_STAGE_LIB)/VBoxExtPack-libcrypto$(VBOX_SUFF_LIB)
+-
+ SDK_VBOX_BLD_OPENSSL = .
+ SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
+ SDK_VBOX_BLD_OPENSSL_LIBS ?= \
+@@ -4100,99 +4049,6 @@
+ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
+
+
+-
+-#
+-# Templates used for building the extension packs.
+-#
+-ifdef VBOX_WITH_EXTPACK
+- # Base templates (native or portable).
+- TEMPLATE_VBoxR3ExtPack = For the ring-3 context extension pack modules.
+- if 1 # Native for now.
+- TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXR3DLLNOXCPT
+- TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXR3DLLNOXCPT_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3
+- else
+- TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXNOCRTGCC
+- TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXNOCRTGCC_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3 IPRT_NO_CRT IN_RING3
+- TEMPLATE_VBoxR3ExtPack_INCS = $(PATH_ROOT)/include/iprt/nocrt $(TEMPLATE_VBOXR3DLLNOXCPT_INCS)
+- endif
+- ifneq ($(KBUILD_TARGET),win)
+- TEMPLATE_VBoxR3ExtPack_CXXFLAGS = $(TEMPLATE_VBOXR3DLLNOXCPT_CXXFLAGS) -fno-rtti
+- endif
+- TEMPLATE_VBoxR3ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+- ifeq ($(KBUILD_TARGET),linux)
+- TEMPLATE_VBoxR3ExtPack_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
+- else
+- if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
+- TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
+- endif
+- endif
+- ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+- if1of ($(KBUILD_TARGET), win os2)
+- TEMPLATE_VBoxR3ExtPack_LIBS = \
+- $(TEMPLATE_LIBS_VBOXR3) \
+- $(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \
+- $(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_LIB)
+- else
+- TEMPLATE_VBoxR3ExtPack_LIBS = \
+- $(TEMPLATE_LIBS_VBOXR3) \
+- $(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_DLL) \
+- $(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_DLL)
+- endif
+- else
+- TEMPLATE_VBoxR3ExtPack_LIBS = \
+- $(TEMPLATE_LIBS_VBOXR3) \
+- $(LIB_RUNTIME) \
+- $(LIB_VMM)
+- endif
+-
+- TEMPLATE_VBoxR0ExtPack = For the ring-0 context extension pack modules.
+- TEMPLATE_VBoxR0ExtPack_EXTENDS = VBoxR0
+- TEMPLATE_VBoxR0ExtPack_EXTENDS_BY = appending
+- TEMPLATE_VBoxR0ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+- TEMPLATE_VBoxR0ExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R0
+- if1of ($(VBOX_LDR_FMT), pe lx)
+- TEMPLATE_VBoxR0ExtPack_LIBS = \
+- $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
+- $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
+- endif
+-
+- TEMPLATE_VBoxRcExtPack = For the raw-mode context extension pack modules.
+- TEMPLATE_VBoxRcExtPack_EXTENDS = VBoxRc
+- TEMPLATE_VBoxRcExtPack_EXTENDS_BY = appending
+- TEMPLATE_VBoxRcExtPack_SYSSUFF = .rc
+- TEMPLATE_VBoxRcExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+- TEMPLATE_VBoxRcExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_RC
+- if1of ($(VBOX_LDR_FMT32), pe lx)
+- TEMPLATE_VBoxRcExtPack_LIBS = \
+- $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
+- $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
+- endif
+-
+- TEMPLATE_VBoxInsExtPack = For the install targets of an extension pack.
+- TEMPLATE_VBoxInsExtPack_MODE = 0644
+- TEMPLATE_VBoxInsExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+-
+- # For each individual extension pack
+- ifdef VBOX_WITH_EXTPACK_PUEL
+- TEMPLATE_VBoxR3ExtPackPuel = For the ring-3 context modules in the PUEL extension pack.
+- TEMPLATE_VBoxR3ExtPackPuel_EXTENDS = VBoxR3ExtPack
+- TEMPLATE_VBoxR3ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+-
+- TEMPLATE_VBoxR0ExtPackPuel = For the ring-0 context modules in the PUEL extension pack.
+- TEMPLATE_VBoxR0ExtPackPuel_EXTENDS = VBoxR0ExtPack
+- TEMPLATE_VBoxR0ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+-
+- TEMPLATE_VBoxRcExtPackPuel = For the raw-mode context modules in the PUEL extension pack.
+- TEMPLATE_VBoxRcExtPackPuel_EXTENDS = VBoxRcExtPack
+- TEMPLATE_VBoxRcExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+-
+- TEMPLATE_VBoxInsExtPackPuel = For the install targets of an extension pack.
+- TEMPLATE_VBoxInsExtPackPuel_EXTENDS = VBoxR0ExtPack
+- TEMPLATE_VBoxInsExtPackPuel_INST = $(INST_EXTPACK_PUEL)
+-endif
+-endif # VBOX_WITH_EXTPACK
+-
+-
+ #
+ # Qt 4
+ # Qt 4
+--- 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 @@
+ include/VBox \
+ include/VBox/vmm \
+ include/VBox/com \
+- include/VBox/ExtPack \
+ include/VBox/HostServices \
+ include/VBox/GuestHost \
+ include/VBox/HGSMI \
+@@ -990,200 +989,6 @@
+
+
+ #
+-# Build the extension packs, all of them.
+-#
+-# This is tailored (hardcoded) for the extension pack build box.
+-#
+-# The fetching must be done in serial fashion, while the building should be
+-# more flexible wrt to -jN.
+-#
+-extpacks-fetch:
+- + $(KMK) -C tools fetch VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=darwin BUILD_TARGET_ARCH=x86 BUILD_TARGET=darwin VBOX_ONLY_EXTPACKS=1
+-# + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd VBOX_ONLY_EXTPACKS=1
+-# + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86 BUILD_TARGET=freebsd VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=linux BUILD_TARGET_ARCH=x86 BUILD_TARGET=linux VBOX_ONLY_EXTPACKS=1
+-# + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=os2 BUILD_TARGET_ARCH=x86 BUILD_TARGET=os2 VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=x86 BUILD_TARGET=solaris VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win BUILD_TARGET_ARCH=amd64 BUILD_TARGET=win VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=win BUILD_TARGET_ARCH=x86 BUILD_TARGET=win VBOX_ONLY_EXTPACKS=1
+-
+-
+-extpacks-build: \
+- extpacks-build-win.amd64 \
+- extpacks-build-win.x86 \
+- extpacks-build-solaris.amd64 \
+- extpacks-build-solaris.x86 \
+- extpacks-build-os2.x86 \
+- extpacks-build-linux.amd64 \
+- extpacks-build-linux.x86 \
+- extpacks-build-darwin.amd64 \
+- extpacks-build-darwin.x86 \
+- extpacks-build-freebsd.amd64 \
+- extpacks-build-freebsd.x86
+-
+-VBOX_EXTPACKS_BUILD.amd64 = VBOX_ONLY_EXTPACKS=1 \
+- KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
+- KBUILD_TARGET_ARCH=amd64 BUILD_TARGET_ARCH=amd64 \
+- VBOX_SVN_REV=$(VBOX_SVN_REV)
+-
+-VBOX_EXTPACKS_BUILD.x86 = VBOX_ONLY_EXTPACKS=1 \
+- KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
+- KBUILD_TARGET_ARCH=x86 BUILD_TARGET_ARCH=x86 \
+- VBOX_SVN_REV=$(VBOX_SVN_REV)
+-
+-# Automatically determine the extpack build subdir name. Used for figuring out
+-# directory names inside the extension pack building VMs.
+-VBOX_EXTPACKS_BUILD_SUBDIRNAME := $(lastword $(subst /, ,$(PATH_ROOT)))
+-
+-# When building in parallel on a Windows host, make sure we finish the host
+-# bit before kicking off any UNIX guest or we'll run into file sharing issues.
+-ifeq ($(KBUILD_TARGET),win)
+-VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST = extpacks-build-win.x86 extpacks-build-win.amd64
+-else
+-VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST =
+-endif
+-
+-extpacks-build-win.amd64:
+-ifeq ($(KBUILD_TARGET),win)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 extension packs)
+-endif
+-
+-extpacks-build-win.x86:
+-ifeq ($(KBUILD_TARGET),win)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs)
+-endif
+-
+-ifeq ($(KBUILD_TARGET),solaris)
+-extpacks-build-solaris.amd64:
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-
+-extpacks-build-solaris.x86: extpacks-build-solaris.amd64
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-
+-else
+-# Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
+-extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+-
+-extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
+- $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs)
+- $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 extension packs)
+-
+-extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
+- $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
+- $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
+-
+-.NOTPARALLEL: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm
+-.PHONY: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
+-
+-extpacks-build-solaris.amd64: extpacks-build-solaris.rsync-out-of-vm
+-extpacks-build-solaris.x86: extpacks-build-solaris.rsync-out-of-vm
+-endif
+-
+-extpacks-build-os2.x86:
+-#ifeq ($(KBUILD_TARGET),os2)
+-# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-#else
+-# $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_OS2_IP) " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
+-#endif
+-
+-extpacks-build-linux.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
+-endif
+-
+-extpacks-build-linux.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
+-endif
+-
+-extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
+-# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-#else
+-# $(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/amd64 extension packs)
+-# $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-# $(call VBOX_BLD_VM_MSG_END__,FreeBSD/amd64 extension packs)
+-#endif
+-
+-extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
+-# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-#else
+-# $(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/x86 extension packs)
+-# $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-# $(call VBOX_BLD_VM_MSG_END__,FreeBSD/x86 extension packs)
+-#endif
+-
+-extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 extension packs)
+- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
+- $(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 extension packs)
+-endif
+-
+-extpacks-build-darwin.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 extension packs)
+- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
+- $(call VBOX_BLD_VM_MSG_END__,Darwin/x86 extension packs)
+-endif
+-
+-
+-extpacks-packing:
+- + $(KMK) VBOX_ONLY_EXTPACKS=1 \
+- VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 darwin.x86 linux.amd64 linux.x86 solaris.amd64 solaris.x86 win.amd64 win.x86" \
+- packing
+-# +++ freebsd.amd64 freebsd.x86 os2.x86 ^^^
+-
+-.PHONY: \
+- extpacks-build-win.x86 \
+- extpacks-build-win.amd64 \
+- extpacks-build-solaris.amd64 \
+- extpacks-build-solaris.x86 \
+- extpacks-build-os2.x86 \
+- extpacks-build-linux.amd64 \
+- extpacks-build-linux.x86 \
+- extpacks-build-freebsd.amd64 \
+- extpacks-build-freebsd.x86 \
+- extpacks-build-darwin.amd64 \
+- extpacks-build-darwin.x86 \
+- extpacks-packing
+-
+-
+-#
+ # Build the test suite, all of it.
+ #
+ # This is currently tailored (hardcoded) for the additions build box just like
+--- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.cpp 2012-06-20 10:15:51.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.cpp 2012-07-24 16:18:03.964493454 -0300
+@@ -132,11 +132,6 @@
+ if (RT_FAILURE(rc))
+ return rc;
+ #endif
+-#ifdef VBOX_WITH_EHCI_IMPL
+- rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEHCI);
+- if (RT_FAILURE(rc))
+- return rc;
+-#endif
+ #ifdef VBOX_ACPI
+ rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceACPI);
+ if (RT_FAILURE(rc))
+--- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.h 2012-06-20 10:15:51.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.h 2012-07-24 16:20:35.939205389 -0300
+@@ -62,7 +62,6 @@
+ extern const PDMDEVREG g_DeviceICH6_HDA;
+ extern const PDMDEVREG g_DeviceAudioSniffer;
+ extern const PDMDEVREG g_DeviceOHCI;
+-extern const PDMDEVREG g_DeviceEHCI;
+ extern const PDMDEVREG g_DeviceACPI;
+ extern const PDMDEVREG g_DeviceDMA;
+ extern const PDMDEVREG g_DeviceFloppyController;
+--- VirtualBox-4.1.18.orig/include/Makefile.kmk 2012-06-20 10:07:49.000000000 -0300
++++ VirtualBox-4.1.18/include/Makefile.kmk 2012-07-24 21:11:57.007068865 -0300
+@@ -51,7 +51,6 @@
+ VBox/vd-cache-plugin.h \
+ VBox/vmm/uvm.h \
+ VBox/vscsi.h \
+- $(wildcard VBox/ExtPack/*.h ) \
+ iprt/alloca.h \
+ iprt/tcp.h \
+ iprt/localipc.h \
+--- VirtualBox-4.2.0.orig/src/Makefile.kmk 2012-08-03 09:28:25.000000000 -0300
++++ VirtualBox-4.2.0/src/Makefile.kmk 2012-09-19 03:01:57.588337894 -0300
+@@ -23,10 +23,8 @@
+ if !defined(VBOX_ONLY_ADDITIONS)
+ include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
+ endif
+-if defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && defined(VBOX_WITH_REM)
+- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
+
+-else if !defined(VBOX_ONLY_BUILD)
++if !defined(VBOX_ONLY_BUILD)
+ # Normal build.
+ if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
+ ifdef VBOX_WITH_REM
+--- VirtualBox-4.2.0.orig/src/VBox/Makefile.kmk 2012-05-30 07:39:32.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Makefile.kmk 2012-09-19 00:03:08.577726965 -0300
+@@ -33,19 +33,6 @@
+ include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/Frontends/Makefile.kmk
+
+-else ifdef VBOX_ONLY_EXTPACKS
+- include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk
+- include $(PATH_SUB_CURRENT)/Devices/Makefile.kmk
+- include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
+- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
+- ifdef VBOX_WITH_VRDP
+- include $(PATH_SUB_CURRENT)/RDP/Makefile.kmk
+- endif
+- include $(PATH_SUB_CURRENT)/VMM/Makefile.kmk
+- ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+- include $(PATH_SUB_CURRENT)/Disassembler/Makefile.kmk
+- endif
+-
+ else ifdef VBOX_ONLY_SDK
+ include $(PATH_SUB_CURRENT)/Main/Makefile.kmk
+ ifdef VBOX_WITH_VRDP
+@@ -92,7 +79,6 @@
+ if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
+ include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk
+ endif
+- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
+ ifdef VBOX_WITH_INSTALLER
+ include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk # Keep this last.
+ endif
+--- VirtualBox-4.1.18.orig/src/libs/Makefile.kmk 2012-07-24 21:23:26.938013023 -0300
++++ VirtualBox-4.1.18/src/libs/Makefile.kmk 2012-07-24 21:43:42.557911752 -0300
+@@ -48,13 +48,6 @@
+ include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk
+ endif
+
+-# OpenSSL.
+-if !defined(VBOX_ONLY_SDK) \
+- && ( "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
+- || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
+- include $(PATH_SUB_CURRENT)/openssl-0.9.8t/Makefile.kmk
+-endif
+-
+ # libjpeg for VRDP video redirection
+ if defined(VBOX_WITH_VRDP) && defined(VBOX_WITH_VRDP_VIDEO_CHANNEL)
+ include $(PATH_SUB_CURRENT)/jpeg-8a/Makefile.kmk
+--- VirtualBox-4.2.0.orig/src/VBox/Devices/Makefile.kmk 2012-08-03 09:28:25.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Devices/Makefile.kmk 2012-09-19 02:54:35.912748288 -0300
+@@ -25,9 +25,7 @@
+
+ # Include sub-makefiles.
+ include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
+-if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS)
+- include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk
+-else if defined(VBOX_WITH_PXE_ROM)
++if defined(VBOX_WITH_PXE_ROM)
+ if !defined(VBOX_WITHOUT_ETHERBOOT)
+ include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
+ endif
+@@ -71,9 +69,6 @@
+ ifdef VBOX_WITH_USB
+ VBoxDDU_DEFS += VBOX_WITH_USB IN_USBLIB
+ VBoxDDU_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
+- if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+- VBoxDDU_DEFS += VBOX_WITH_EHCI_IMPL
+- endif
+ ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
+ VBoxDDU_DEFS.darwin += VBOX_WITH_NEW_USB_CODE_ON_DARWIN
+ endif
+@@ -326,15 +321,7 @@
+ Storage/UsbMsd.cpp
+ endif
+
+- if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+- VBoxDD_DEFS += VBOX_WITH_EHCI_IMPL
+- endif
+ VBoxDD_DEFS += VBOX_WITH_USB
+- if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+- VBoxDD_DEFS += VBOX_WITH_EHCI_IMPL
+- VBoxDD_SOURCES += \
+- USB/DevEHCI.cpp
+- endif
+
+ endif # VBOX_WITH_USB
+
+@@ -869,11 +856,6 @@
+
+ ifdef VBOX_WITH_USB
+ VBoxDDGC_DEFS += VBOX_WITH_USB
+- if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+- VBoxDDGC_DEFS += VBOX_WITH_EHCI_IMPL
+- VBoxDDGC_SOURCES += \
+- USB/DevEHCI.cpp
+- endif
+ endif
+
+ ifdef VBOX_WITH_VIDEOHWACCEL
+@@ -1020,11 +1002,6 @@
+ endif
+ ifdef VBOX_WITH_USB
+ VBoxDDR0_DEFS += VBOX_WITH_USB
+- if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+- VBoxDDR0_DEFS += VBOX_WITH_EHCI_IMPL
+- VBoxDDR0_SOURCES += \
+- USB/DevEHCI.cpp
+- endif
+ endif
+
+ if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+@@ -1163,50 +1140,5 @@
+ endif # !VBOX_ONLY_EXTPACKS
+
+
+-if defined(VBOX_WITH_EXTPACK_PUEL) && defined(VBOX_WITH_EXTPACK_PUEL_BUILD)
+- #
+- # The EHCI (USB 2.0) Extension Pack Modules.
+- #
+- if defined(VBOX_WITH_USB)
+- DLLS += VBoxEhciR3
+- VBoxEhciR3_TEMPLATE = VBoxR3ExtPackPuel
+- VBoxEhciR3_SOURCES = USB/DevEHCI.cpp
+-
+- SYSMODS += VBoxEhciR0
+- VBoxEhciR0_TEMPLATE = VBoxR0ExtPackPuel
+- VBoxEhciR0_SOURCES = USB/DevEHCI.cpp
+-
+- ifdef VBOX_WITH_RAW_MODE
+- SYSMODS += VBoxEhciRC
+- VBoxEhciRC_TEMPLATE = VBoxRcExtPackPuel
+- VBoxEhciRC_SOURCES = USB/DevEHCI.cpp
+- endif
+- endif
+-
+- if defined(VBOX_WITH_PCI_PASSTHROUGH)
+- DLLS += VBoxPciRawR3
+- VBoxPciRawR3_TEMPLATE = VBoxR3ExtPackPuel
+- VBoxPciRawR3_SOURCES = Bus/DevPciRaw.cpp
+-
+- DLLS += VBoxPciRawDrv
+- VBoxPciRawDrv_TEMPLATE = VBoxR3ExtPackPuel
+- VBoxPciRawDrv_SOURCES = Bus/DrvPciRaw.cpp
+-
+- SYSMODS += VBoxPciRawR0
+- VBoxPciRawR0_TEMPLATE = VBoxR0ExtPackPuel
+- VBoxPciRawR0_SOURCES = Bus/DevPciRaw.cpp
+-
+- Bus/DevPciRaw.cpp_INCS = Bus
+- endif
+-
+-
+- #
+- # The Intel PXE rom.
+- #
+- INSTALLS += VBoxExtPackPuelInsRoms
+- VBoxExtPackPuelInsRoms_TEMPLATE = VBoxInsExtPackPuel
+- VBoxExtPackPuelInsRoms_SOURCES = PC/PXE/PXE-Intel.rom=>PXE-Intel.rom
+-endif # VBOX_WITH_EXTPACK_PUEL
+-
+ include $(FILE_KBUILD_SUB_FOOTER)
+
+--- VirtualBox-4.2.0.orig/src/VBox/Main/Makefile.kmk 2012-09-04 09:48:44.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Main/Makefile.kmk 2012-09-19 00:46:39.251763337 -0300
+@@ -233,14 +233,12 @@
+ $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
+ $(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \
+ $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
+- $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
+ $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
+ $(if $(VBOX_WITH_S3),VBOX_WITH_S3,) \
+ $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,)
+ ifdef VBOX_WITH_USB
+ VBoxSVC_DEFS += \
+ VBOX_WITH_USB \
+- $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,) \
+ $(if $(VBOX_WITH_NEW_USB_CODE_ON_DARWIN),VBOX_WITH_NEW_USB_CODE_ON_DARWIN,)
+ endif
+ VBoxSVC_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
+@@ -293,7 +291,6 @@
+ src-all/SharedFolderImpl.cpp \
+ src-all/VirtualBoxBase.cpp \
+ src-all/VirtualBoxErrorInfoImpl.cpp \
+- $(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
+ src-server/ApplianceImpl.cpp \
+ src-server/ApplianceImplExport.cpp \
+ src-server/ApplianceImplImport.cpp \
+@@ -538,8 +535,6 @@
+ $(if $(VBOX_WITH_DRAG_AND_DROP),VBOX_WITH_DRAG_AND_DROP,) \
+ $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) \
+ $(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
+- $(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \
+- $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
+ $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
+ $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,)
+
+@@ -605,7 +600,6 @@
+ src-all/SharedFolderImpl.cpp \
+ src-all/VirtualBoxBase.cpp \
+ src-all/VirtualBoxErrorInfoImpl.cpp \
+- $(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
+ $(if $(VBOX_WITH_USB_VIDEO),src-client/UsbWebcamInterface.cpp,) \
+ $(if $(VBOX_WITH_USB_CARDREADER),src-client/UsbCardReader.cpp,) \
+ src-client/Nvram.cpp \
+@@ -733,22 +727,6 @@
+ $(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
+
+
+-#
+-# The VBoxExtPackHelperApp.
+-#
+-ifdef VBOX_WITH_EXTPACK
+- PROGRAMS += VBoxExtPackHelperApp
+- VBoxExtPackHelperApp_TEMPLATE = VBoxR3SetUidToRoot
+- VBoxExtPackHelperApp_LDFLAGS.darwin = -framework Security
+- VBoxExtPackHelperApp_LDFLAGS.win = /SUBSYSTEM:windows
+- VBoxExtPackHelperApp_SOURCES = \
+- src-helper-apps/VBoxExtPackHelperApp.cpp \
+- src-all/ExtPackUtil.cpp
+- VBoxExtPackHelperApp_LIBS = \
+- $(LIB_RUNTIME)
+-endif # VBOX_WITH_EXTPACK
+-
+-
+ endif # !VBOX_ONLY_SDK (the ifndef is far above)
+
+
+--- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk 2012-07-24 23:25:04.575825175 -0300
++++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/Makefile.kmk 2012-07-24 23:25:04.619156084 -0300
+@@ -888,7 +888,6 @@
+ $(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
+ $(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
+ $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox.icns=>Resources/virtualbox-vbox.icns \
+- $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns=>Resources/virtualbox-vbox-extpack.icns \
+ $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \
+ $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \
+ $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vdi.icns=>Resources/virtualbox-vdi.icns \
+--- 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-09-19 00:51:25.413310527 -0300
+@@ -169,18 +169,6 @@
+ <file alias="status_check_32px.png">images/status_check_32px.png</file>
+ <file alias="status_error_16px.png">images/status_error_16px.png</file>
+ <file alias="status_error_32px.png">images/status_error_32px.png</file>
+- <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file>
+- <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file>
+- <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file>
+- <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file>
+- <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file>
+- <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file>
+- <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file>
+- <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file>
+- <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file>
+- <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file>
+- <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file>
+- <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file>
+ <file alias="proxy_16px.png">images/proxy_16px.png</file>
+ <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file>
+ <file alias="proxy_32px.png">images/proxy_32px.png</file>
+--- VirtualBox-4.1.18.orig/src/VBox/Installer/linux/Makefile.kmk 2012-07-25 00:32:00.780012664 -0300
++++ VirtualBox-4.1.18/src/VBox/Installer/linux/Makefile.kmk 2012-07-25 00:32:00.806677728 -0300
+@@ -170,11 +170,6 @@
+ VBox.sh \
+ VBox.png
+
+-ifdef VBOX_WITH_EXTPACK
+- VBOX_LNX_STRIP_BIN += \
+- VBoxExtPackHelperApp
+-endif
+-
+ # Qt4 GUI
+ ifdef VBOX_WITH_QTGUI
+ include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
+@@ -286,7 +281,7 @@
+
+ VBOX_MIME_ICONS = \
+ $(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
+- $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
++ $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
+ $(foreach s,16 20 24 32 48 64 72 96 128 256,\
+ virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png)))
+
+--- VirtualBox-4.1.18.orig/src/VBox/Installer/win/Makefile.kmk 2012-07-25 00:34:52.253398525 -0300
++++ VirtualBox-4.1.18/src/VBox/Installer/win/Makefile.kmk 2012-07-25 00:34:52.300062531 -0300
+@@ -435,7 +435,6 @@
+ -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
+ -E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \
+ -E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
+- -E 'VBOX_WITH_EXTPACK=$(if $(VBOX_WITH_EXTPACK),yes,no)' \
+ -E 'VBOX_WITH_GUEST_CONTROL=$(if $(VBOX_WITH_GUEST_CONTROL),yes,no)' \
+ -E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \
+ -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
+--- VirtualBox-4.2.0.orig/src/VBox/Installer/darwin/Makefile.kmk 2012-09-08 06:36:03.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Installer/darwin/Makefile.kmk 2012-09-19 00:55:08.991167973 -0300
+@@ -497,7 +497,6 @@
+ MacOS/VirtualBoxVM \
+ MacOS/VBoxNetAdpCtl \
+ MacOS/VBoxNetDHCP \
+- MacOS/VBoxExtPackHelperApp \
+ MacOS/VBoxBalloonCtrl \
+ MacOS/VBoxAutostart
+ ifdef VBOX_WITH_WEBSERVICES
+@@ -522,7 +521,6 @@
+ Resources/virtualbox.icns \
+ Resources/virtualbox.png \
+ Resources/virtualbox-vbox.icns \
+- Resources/virtualbox-vbox-extpack.icns \
+ Resources/virtualbox-ovf.icns \
+ Resources/virtualbox-ova.icns \
+ Resources/virtualbox-vdi.icns \
+--- VirtualBox-4.1.18/src/VBox/Installer/solaris/Makefile.kmk.orig 2012-07-25 00:38:48.476398293 -0300
++++ VirtualBox-4.1.18/src/VBox/Installer/solaris/Makefile.kmk 2012-07-25 00:38:48.516396159 -0300
+@@ -185,12 +185,12 @@
+
+ VBOX_MIME_ICONS = \
+ $(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
+- $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
++ $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
+ $(foreach s,16 20 24 32 48 64 72 96 128 256,\
+ virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)))
+
+ SOLARIS_COMMON_ICONS = \
+- $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
++ $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
+ $(foreach s,16 20 24 32 48 64 72 96 128 256,\
+ $(s)x$(s)/mimetypes/virtualbox-$(f).png))
+
+@@ -210,7 +210,6 @@
+ $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
+ $(if $(VBOX_WITH_NETADP),VBoxNetAdpCtl,) \
+ VBoxNetDHCP \
+- $(if $(VBOX_WITH_EXTPACK),VBoxExtPackHelperApp,) \
+ VBoxSVC \
+ $(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \
+ VBoxXPCOMIPCD \
+--- VirtualBox-4.1.18.orig/src/VBox/Runtime/Makefile.kmk 2012-07-25 00:40:58.745522450 -0300
++++ VirtualBox-4.1.18/src/VBox/Runtime/Makefile.kmk 2012-07-25 00:40:58.782186960 -0300
+@@ -53,15 +53,6 @@
+ #
+ LIBRARIES += RuntimeR3 RuntimeBldProg
+
+-else ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+- #
+- # Build docs only - need just regular R3 runtime.
+- #
+- LIBRARIES += RuntimeBldProg
+- LIBRARIES.solaris += RuntimeR0Stub
+- LIBRARIES.win += RuntimeR0Stub RuntimeRCStub
+- include $(PATH_SUB_CURRENT)/tools/Makefile.kmk
+-
+ else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS
+
+ #
diff --git a/libre/virtualbox-libre/os_blag.png b/libre/virtualbox-libre/os_blag.png
new file mode 100755
index 000000000..61995ca10
--- /dev/null
+++ b/libre/virtualbox-libre/os_blag.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_blag_64.png b/libre/virtualbox-libre/os_blag_64.png
new file mode 100755
index 000000000..aa4463a97
--- /dev/null
+++ b/libre/virtualbox-libre/os_blag_64.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_dragora.png b/libre/virtualbox-libre/os_dragora.png
new file mode 100755
index 000000000..d1df45880
--- /dev/null
+++ b/libre/virtualbox-libre/os_dragora.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_dragora_64.png b/libre/virtualbox-libre/os_dragora_64.png
new file mode 100755
index 000000000..64bcecf20
--- /dev/null
+++ b/libre/virtualbox-libre/os_dragora_64.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_dynebolic.png b/libre/virtualbox-libre/os_dynebolic.png
new file mode 100755
index 000000000..67b07d4c0
--- /dev/null
+++ b/libre/virtualbox-libre/os_dynebolic.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_gnewsense.png b/libre/virtualbox-libre/os_gnewsense.png
new file mode 100755
index 000000000..76d9e38b3
--- /dev/null
+++ b/libre/virtualbox-libre/os_gnewsense.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_gnewsense_64.png b/libre/virtualbox-libre/os_gnewsense_64.png
new file mode 100755
index 000000000..8859c34e8
--- /dev/null
+++ b/libre/virtualbox-libre/os_gnewsense_64.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_gnu.png b/libre/virtualbox-libre/os_gnu.png
new file mode 100755
index 000000000..26c4550f9
--- /dev/null
+++ b/libre/virtualbox-libre/os_gnu.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_gnu_64.png b/libre/virtualbox-libre/os_gnu_64.png
new file mode 100755
index 000000000..4161634e9
--- /dev/null
+++ b/libre/virtualbox-libre/os_gnu_64.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_gnuhurd.png b/libre/virtualbox-libre/os_gnuhurd.png
new file mode 100755
index 000000000..26c4550f9
--- /dev/null
+++ b/libre/virtualbox-libre/os_gnuhurd.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_gnulinux.png b/libre/virtualbox-libre/os_gnulinux.png
new file mode 100755
index 000000000..26c4550f9
--- /dev/null
+++ b/libre/virtualbox-libre/os_gnulinux.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_gnulinux_64.png b/libre/virtualbox-libre/os_gnulinux_64.png
new file mode 100755
index 000000000..4161634e9
--- /dev/null
+++ b/libre/virtualbox-libre/os_gnulinux_64.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_musix.png b/libre/virtualbox-libre/os_musix.png
new file mode 100755
index 000000000..fb7b94577
--- /dev/null
+++ b/libre/virtualbox-libre/os_musix.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_musix_64.png b/libre/virtualbox-libre/os_musix_64.png
new file mode 100755
index 000000000..a1bbbbf3a
--- /dev/null
+++ b/libre/virtualbox-libre/os_musix_64.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_os64base.png b/libre/virtualbox-libre/os_os64base.png
new file mode 100755
index 000000000..7aec20314
--- /dev/null
+++ b/libre/virtualbox-libre/os_os64base.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_os64base.xcf b/libre/virtualbox-libre/os_os64base.xcf
new file mode 100755
index 000000000..d8e28e35e
--- /dev/null
+++ b/libre/virtualbox-libre/os_os64base.xcf
Binary files differ
diff --git a/libre/virtualbox-libre/os_osbase.png b/libre/virtualbox-libre/os_osbase.png
new file mode 100755
index 000000000..00f197fca
--- /dev/null
+++ b/libre/virtualbox-libre/os_osbase.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_osbase.xcf b/libre/virtualbox-libre/os_osbase.xcf
new file mode 100755
index 000000000..c4463c857
--- /dev/null
+++ b/libre/virtualbox-libre/os_osbase.xcf
Binary files differ
diff --git a/libre/virtualbox-libre/os_parabola.png b/libre/virtualbox-libre/os_parabola.png
new file mode 100755
index 000000000..757abc484
--- /dev/null
+++ b/libre/virtualbox-libre/os_parabola.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_parabola_64.png b/libre/virtualbox-libre/os_parabola_64.png
new file mode 100755
index 000000000..5ac7c2767
--- /dev/null
+++ b/libre/virtualbox-libre/os_parabola_64.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_trisquel.png b/libre/virtualbox-libre/os_trisquel.png
new file mode 100755
index 000000000..c6f0d3d7a
--- /dev/null
+++ b/libre/virtualbox-libre/os_trisquel.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_trisquel_64.png b/libre/virtualbox-libre/os_trisquel_64.png
new file mode 100755
index 000000000..ebca3dd43
--- /dev/null
+++ b/libre/virtualbox-libre/os_trisquel_64.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_ututo.png b/libre/virtualbox-libre/os_ututo.png
new file mode 100755
index 000000000..e1dffb575
--- /dev/null
+++ b/libre/virtualbox-libre/os_ututo.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_ututo_64.png b/libre/virtualbox-libre/os_ututo_64.png
new file mode 100755
index 000000000..158468e0a
--- /dev/null
+++ b/libre/virtualbox-libre/os_ututo_64.png
Binary files differ
diff --git a/libre/virtualbox-libre/os_venenux.png b/libre/virtualbox-libre/os_venenux.png
new file mode 100755
index 000000000..5e0c1585d
--- /dev/null
+++ b/libre/virtualbox-libre/os_venenux.png
Binary files differ
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild
deleted file mode 100644
index 4bc8e0c9d..000000000
--- a/libre/virtualbox-libre/vboxbuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/vbox/vbox.cfg
-
-MODLIST=()
-LOG="/var/log/vbox-install.log"
->| "$LOG"
-
-if [[ $INSTALL_DIR ]]; then
- VBOXMANAGE=$INSTALL_DIR/VBoxManage
- BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp
- BUILDVBOXNETFLT=$INSTALL_DIR/src/vboxnetflt/build_in_tmp
- BUILDVBOXNETADP=$INSTALL_DIR/src/vboxnetadp/build_in_tmp
- BUILDVBOXPCI=$INSTALL_DIR/src/vboxpci/build_in_tmp
-else
- echo "error: missing vbox.cfg"
- exit 1
-fi
-
-if [[ -f /proc/modules ]]; then
- IFS=$'\n' read -r -d '' -a MODLIST < \
- <(grep -oE '^vbox(pci|netflt|netadp|drv)' /proc/modules)
-fi
-
-if (( ${#MODLIST[*]} )); then
- stat_busy "Unloading VirtualBox kernel modules"
- modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
-fi
-
-for kdir in /lib/modules/[2-3]*; do
- if [[ ! -d $kdir/kernel ]]; then
- # found a stale kernel
- mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*)
- if (( ${#mods[@]} )); then
- stat_busy "Removing all old VirtualBox kernel modules"
- if rm -f "${mods[@]}" &&
- rmdir -p --ignore-fail-on-non-empty "$kdir/extramodules" 2>/dev/null; then
- stat_done
- else
- stat_fail
- fi
- fi
- fi
-done
-
-# default to the currently running kernel
-if (( ! $# )); then
- set -- $(uname -r)
-fi
-
-for kernver; do
- export KERN_DIR=/lib/modules/$kernver/build
- export MODULE_DIR=/lib/modules/$kernver/extramodules
- if [[ ! -d $KERN_DIR ]]; then
- printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
- "$KERN_DIR"
- continue
- fi
-
- stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
- if ! $BUILDVBOXDRV \
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
- --no-print-directory install >> $LOG 2>&1; then
- echo "Look at $LOG to find out what went wrong"
- stat_fail
- fi
- for build in BUILDVBOX{NETFLT,NETADP,PCI}; do
- if ! ${!build} \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
- --no-print-directory install >> $LOG 2>&1; then
- echo "Look at $LOG to find out what went wrong"
- stat_fail
- fi
- done
- gzip -f9 "$MODULE_DIR"/*.ko
- depmod "$kernver"
- stat_done
-done
-
-if (( ${#MODLIST[*]} )); then
- stat_busy "Reloading VirtualBox kernel modules"
- modprobe -a "${MODLIST[@]}" && stat_done || stat_fail
-fi
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
deleted file mode 100644
index 682175798..000000000
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
-@@ -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/>"
-- " <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."
-+ " <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>"
-+ "as root. If you don't use our stock kernel, install virtualbox-source and"
-+ "execute /usr/bin/vboxbuild ."
- );
-
- QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
-@@ -90,11 +89,8 @@
-
- QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
- "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."
-+ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
-+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
- );
-
- QString g_QStrHintOtherNoDriver = QApplication::tr(
-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
-@@ -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
-- load. Please recompile the kernel module and install it by
-+ load. Please reinstall the kernel module virtualbox-modules or
-+ if you don't use our stock kernel compile the modules with
-
-- sudo /etc/init.d/vboxdrv setup
-+ sudo /usr/bin/vboxbuild
-
- You will not be able to start VMs until this problem is fixed.
- EOF
- elif [ ! -c /dev/vboxdrv ]; then
- cat << EOF
--WARNING: The character device /dev/vboxdrv does not exist. Try
-+WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
-
-- sudo /etc/init.d/vboxdrv restart
-+ sudo modprobe vboxdrv
-
- and if that is not successful, try to re-install the package.
-
diff --git a/libre/virtualbox-libre/vbox-service.conf b/libre/virtualbox-libre/vboxservice.conf
index 9d4ec629f..9d4ec629f 100644..100755
--- a/libre/virtualbox-libre/vbox-service.conf
+++ b/libre/virtualbox-libre/vboxservice.conf
diff --git a/libre/virtualbox-libre/vbox-service.rc b/libre/virtualbox-libre/vboxservice.rc
index 96233f66d..5a62d69a3 100644..100755
--- a/libre/virtualbox-libre/vbox-service.rc
+++ b/libre/virtualbox-libre/vboxservice.rc
@@ -2,22 +2,22 @@
. /etc/rc.conf
. /etc/rc.d/functions
-. /etc/conf.d/vbox-service
+. /etc/conf.d/${0##*/}
name=VBoxService
PID=$(pidof -o %PPID $name)
case "$1" in
start)
- stat_busy "Starting $name service"
+ stat_busy 'Starting VirtualBox Guest Service'
[[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
- && { add_daemon vbox-service; stat_done; } \
+ && { add_daemon ${0##*/}; stat_done; } \
|| { stat_fail; exit 1; }
;;
stop)
- stat_busy "Stopping $name service"
+ stat_busy 'Stopping VirtualBox Guest Service'
[[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon vbox-service; stat_done; } \
+ && { rm_daemon ${0##*/}; stat_done; } \
|| { stat_fail; exit 1; }
;;
restart)
@@ -26,11 +26,11 @@ case "$1" in
$0 start
;;
status)
- stat_busy "Checking $name status";
- ck_status vbox-service
+ stat_busy 'Checking VirtualBox Guest Service status'
+ ck_status ${0##*/}
;;
*)
- echo "usage: $0 {start|stop|restart|status}"
+ echo "usage: ${0##*/} {start|stop|restart|status}" >&2
exit 1
esac
diff --git a/libre/virtualbox-libre/vboxservice.service b/libre/virtualbox-libre/vboxservice.service
new file mode 100755
index 000000000..bbd61617d
--- /dev/null
+++ b/libre/virtualbox-libre/vboxservice.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=VirtualBox Guest Service
+ConditionVirtualization=oracle
+
+[Service]
+ExecStart=/usr/bin/VBoxService -f
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf
index 49d82d828..c36f6a143 100644..100755
--- a/libre/virtualbox-libre/vboxweb.conf
+++ b/libre/virtualbox-libre/vboxweb.conf
@@ -3,9 +3,9 @@
# WebService Variables
#VBOXWEB_LOGFILE=
-#$VBOXWEB_HOST=
-#$VBOXWEB_PORT=
-#$VBOXWEB_TIMEOUT=
-#$VBOXWEB_CHECK_INTERVAL=
-#$VBOXWEB_THREADS=
-#$VBOXWEB_KEEPALIVE=
+#VBOXWEB_HOST=
+#VBOXWEB_PORT=
+#VBOXWEB_TIMEOUT=
+#VBOXWEB_CHECK_INTERVAL=
+#VBOXWEB_THREADS=
+#VBOXWEB_KEEPALIVE=
diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc
index 97273e3c7..97273e3c7 100644..100755
--- 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
new file mode 100755
index 000000000..303381597
--- /dev/null
+++ b/libre/virtualbox-libre/vboxweb.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=VirtualBox Web Service
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/vboxweb.pid
+ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid --background
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-source.install
new file mode 100755
index 000000000..2d62eae43
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-source.install
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ dkms add vboxguest/${1%-*}
+ cat << EOF
+==> To build and install your modules run dkms install vboxguest/${1%-*}
+==> To do this automatically at startup you can add dkms in your DAEMONS
+EOF
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ # Remove modules using dkms
+ [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
new file mode 100755
index 000000000..38bbe807d
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ getent group vboxsf > /dev/null || groupadd -g 109 vboxsf
+ true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+ # rename /etc/rc.d/vboxservice
+ if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then
+ cat << EOF
+==> rc.d vbox-service script was renamed to vboxservice.
+EOF
+ fi
+ # fix gid of vboxsf
+ if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then
+ groupmod -g 109 vboxsf
+ fi
+ true
+}
+
+# arg 1: the old package version
+post_remove() {
+ groupdel vboxsf >/dev/null 2>&1 || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-source.install b/libre/virtualbox-libre/virtualbox-libre-host-source.install
new file mode 100755
index 000000000..8028cb7e0
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-host-source.install
@@ -0,0 +1,30 @@
+#/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ dkms add vboxhost/${1%-*}
+ cat << EOF
+==> To build and install your modules run dkms install vboxhost/${1%-*}
+==> To do this automatically at startup you can add dkms in your DAEMONS
+EOF
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ # Remove modules using dkms
+ [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
new file mode 100755
index 000000000..b6d804eb7
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+utils() {
+ if [ -x usr/bin/update-mime-database ]; then
+ update-mime-database usr/share/mime > /dev/null 2>&1
+ fi
+
+ if [ -x usr/bin/xdg-icon-resource ]; then
+ xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
+ fi
+
+ if [ -x usr/bin/update-desktop-database ]; then
+ usr/bin/update-desktop-database -q
+ fi
+
+ if [ -x usr/bin/udevadm ]; then
+ usr/bin/udevadm control --reload
+ fi
+}
+
+# arg 1: the new package version
+post_install() {
+ getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers
+ utils
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+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.
+EOF
+ fi
+}
+
+# arg 1: the old package version
+post_remove() {
+ groupdel vboxusers >/dev/null 2>&1 || true
+ utils
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-source.install b/libre/virtualbox-libre/virtualbox-source.install
deleted file mode 100644
index 24d90b1c2..000000000
--- a/libre/virtualbox-libre/virtualbox-source.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-/bin/cat << EOF
-===> To compile the modules do /usr/bin/vboxbuild
-EOF
-
-}
-
-post_upgrade() {
-/bin/cat << EOF
-===> To recompile the modules do /usr/bin/vboxbuild
-EOF
-}
diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install
deleted file mode 100644
index 29646e973..000000000
--- a/libre/virtualbox-libre/virtualbox.install
+++ /dev/null
@@ -1,34 +0,0 @@
-utils() {
- if [ -x usr/bin/update-mime-database ]; then
- update-mime-database usr/share/mime > /dev/null 2>&1
- fi
-
- if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
- fi
-
- if [ -x usr/bin/update-desktop-database ]; then
- usr/bin/update-desktop-database -q
- fi
-}
-
-post_install() {
- getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
- utils
-}
-
-post_upgrade() {
- getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
- utils
- if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
-/bin/cat << EOF
-===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
-===> Use virtualbox-source package if you don't use our stock linux-libre package.
-EOF
- fi
-}
-
-post_remove() {
- groupdel vboxusers >/dev/null 2>&1 || true
- utils
-}
diff --git a/libre/virtualbox-modules-lts/LocalConfig.kmk b/libre/virtualbox-modules-lts/LocalConfig.kmk
deleted file mode 100644
index af79f90cd..000000000
--- a/libre/virtualbox-modules-lts/LocalConfig.kmk
+++ /dev/null
@@ -1,19 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS =
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/libre/virtualbox-modules-lts/PKGBUILD b/libre/virtualbox-modules-lts/PKGBUILD
deleted file mode 100644
index 8ff59d712..000000000
--- a/libre/virtualbox-modules-lts/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
-
-pkgbase=virtualbox-modules-lts
-pkgname=('virtualbox-modules-lts' 'virtualbox-parabola-modules-lts')
-pkgver=4.1.14
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-lts' 'linux-libre-lts-headers')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
- LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('f8baa04e6d589bc6b1fb4e7079fbe414'
- '4c88bd122677a35f68abd76eb01b378b'
- 'ed1341881437455d9735875ddf455fbe')
-
-_extramodules=extramodules-3.0-LIBRE-LTS
-_kernver=$(pacman -Ss linux-libre-lts | awk 'NR==1{print $2}')-LIBRE-LTS
-
-export KERN_DIR=/lib/modules/${_kernver}/build
-export KERN_INCL=/usr/src/linux-${_kernver}/include/
-
-build() {
- cd "$srcdir/VirtualBox-${pkgver}"
-
- cp "$srcdir/LocalConfig.kmk" .
-
- ./configure \
- --with-linux=/usr/src/linux-${_kernver} \
- --disable-java \
- --disable-docs \
- --disable-xpcom \
- --disable-python \
- --disable-sdl-ttf \
- --disable-alsa \
- --disable-pulse \
- --disable-dbus \
- --disable-opengl \
- --build-headless \
- --nofatal
- source ./env.sh
- kmk all
-
- make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
- make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-}
-
-package_virtualbox-parabola-modules-lts(){
- pkgdesc="Additions only for Parabola guests (long-term supported kernel modules)"
- license=('GPL')
- install=virtualbox-parabola-modules-lts.install
- depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
- replaces=('virtualbox-archlinux-modules-lts')
- conflicts=('virtualbox-archlinux-modules-lts')
- provides=("virtualbox-parabola-modules=$pkgver" "virtualbox-archlinux-modules=$pkgver" "virtualbox-archlinux-modules-lts=$pkgver")
-
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
-
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-
- for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
- install -D -m644 ${module} \
- "$pkgdir/lib/modules/${_extramodules}/${module}"
- done
-
- install -D -m 0644 "$srcdir/60-vboxguest.rules" \
- "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
-
- find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-}
-
-package_virtualbox-modules-lts(){
- pkgdesc="Long-term supported kernel modules for VirtualBox"
- license=('GPL')
- install=virtualbox-modules-lts.install
- depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
- provides=("virtualbox-modules=$pkgver")
-
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
-
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-
- install -D -m644 vboxdrv.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
-
- install -D -m644 vboxnetadp.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
-
- install -D -m644 vboxnetflt.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
-
- install -D -m644 vboxpci.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
-
- find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-}
diff --git a/libre/virtualbox-modules/.directory b/libre/virtualbox-modules/.directory
deleted file mode 100644
index 7486c78f1..000000000
--- a/libre/virtualbox-modules/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,3,20,12,36,27
diff --git a/libre/virtualbox-modules/60-vboxguest.rules b/libre/virtualbox-modules/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/libre/virtualbox-modules/60-vboxguest.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
-ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/libre/virtualbox-modules/LocalConfig.kmk b/libre/virtualbox-modules/LocalConfig.kmk
deleted file mode 100644
index af79f90cd..000000000
--- a/libre/virtualbox-modules/LocalConfig.kmk
+++ /dev/null
@@ -1,19 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS =
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
deleted file mode 100644
index e14bf347c..000000000
--- a/libre/virtualbox-modules/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id$
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-#Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
-#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
-
-pkgbase=virtualbox-modules
-pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
-pkgver=4.1.16
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
- LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('eacfb802ecdd6d3435228eb3d3488719'
- '4c88bd122677a35f68abd76eb01b378b'
- 'ed1341881437455d9735875ddf455fbe')
-
-_extramodules=extramodules-3.4-LIBRE
-_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
-
-export KERN_DIR=/lib/modules/${_kernver}/build
-export KERN_INCL=/usr/src/linux-${_kernver}/include/
-
-build() {
- cd "$srcdir/VirtualBox-${pkgver}"
-
- cp "$srcdir/LocalConfig.kmk" .
-
- ./configure \
- --with-linux=/usr/src/linux-${_kernver} \
- --disable-java \
- --disable-docs \
- --disable-xpcom \
- --disable-python \
- --disable-sdl-ttf \
- --disable-alsa \
- --disable-pulse \
- --disable-dbus \
- --disable-opengl \
- --build-headless \
- --nofatal
- source ./env.sh
- kmk all
-
- make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
- make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-}
-
-package_virtualbox-parabola-modules(){
- pkgdesc="Additions only for Parabola guests (kernel modules)"
- license=('GPL')
- install=virtualbox-parabola-modules.install
- depends=('linux-libre>=3.4' 'linux-libre<3.5')
- replaces=('virtualbox-archlinux-modules')
- conflicts=('virtualbox-archlinux-modules')
- provides=("virtualbox-archlinux-modules=$pkgver")
-
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
-
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-
- for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
- install -D -m644 ${module} \
- "$pkgdir/lib/modules/${_extramodules}/${module}"
- done
-
- install -D -m 0644 "$srcdir/60-vboxguest.rules" \
- "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
-
- find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-
- sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-parabola-modules.install"
-}
-
-package_virtualbox-modules(){
- pkgdesc="Kernel modules for VirtualBox"
- license=('GPL')
- install=virtualbox-modules.install
- depends=('linux-libre>=3.4' 'linux-libre<3.5')
-
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
-
-
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-
- install -D -m644 vboxdrv.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
-
- install -D -m644 vboxnetadp.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
-
- install -D -m644 vboxnetflt.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
-
- install -D -m644 vboxpci.ko \
- "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
-
- find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-
- sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install"
-}
diff --git a/libre/virtualbox-modules/linux34.patch b/libre/virtualbox-modules/linux34.patch
deleted file mode 100644
index 05ec78557..000000000
--- a/libre/virtualbox-modules/linux34.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur VirtualBox-4.1.14.orig/Config.kmk VirtualBox-4.1.14/Config.kmk
---- VirtualBox-4.1.14.orig/Config.kmk 2012-04-26 16:56:21.000000000 +0000
-+++ VirtualBox-4.1.14/Config.kmk 2012-05-21 14:35:22.348398884 +0000
-@@ -2856,7 +2856,7 @@
- TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
- -fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \
- -Wno-sign-compare -Wdeclaration-after-statement
--TEMPLATE_VBOXR0DRV_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement -Werror-implicit-function-declaration,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti
-+TEMPLATE_VBOXR0DRV_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement -Werror-implicit-function-declaration,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti -fpermissive
- ifndef VBOX_LINUX_VERSION_2_4
- # 2.6
- TEMPLATE_VBOXR0DRV_SYSSUFF = .ko
diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
deleted file mode 100644
index 14242eaf4..000000000
--- a/libre/virtualbox-modules/virtualbox-modules.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-/bin/cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
- EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
- echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
- EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install
deleted file mode 100644
index 0e101aedf..000000000
--- a/libre/virtualbox-modules/virtualbox-parabola-modules.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
- EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
- EXTRAMODULES='extramodules-3.4-LIBRE'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index 87d775d4e..87d775d4e 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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
new file mode 100755
index 000000000..4f587b5a3
--- /dev/null
+++ b/libre/xscreensaver-libre/LICENSE
@@ -0,0 +1,9 @@
+/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz@jwz.org>
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation. No representations are made about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ */
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
new file mode 100755
index 000000000..2404ba154
--- /dev/null
+++ b/libre/xscreensaver-libre/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+_pkgname=xscreensaver
+pkgname=xscreensaver-libre
+pkgver=5.15
+pkgrel=3
+pkgdesc="Screen saver and locker for the X Window System (without non-free asm files)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.jwz.org/xscreensaver/"
+license=('BSD')
+depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \
+ 'perl-libwww' 'perl-http-message')
+makedepends=('bc' 'libxpm' 'gdm')
+optdepends=('gdm: for login manager support')
+replaces=("${_pkgname}")
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
+backup=('etc/pam.d/xscreensaver')
+source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \
+ add-electricsheep.diff xscreensaver.pam LICENSE libre.patch)
+sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052'
+ '677496218b81a42d90bee400026e94dd87fb8ffb'
+ '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ '4209ea586b204fd1d81c382a0522c654f9fd9134'
+ '327b839eb5d069827c1f25ef19fc8d4e83de7ab2')
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ patch -p0 -i "${srcdir}/add-electricsheep.diff"
+ patch -Np1 -i "${srcdir}/libre.patch" # deleting dmsc.asm file due that doesn't has source code supplied
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
+ --with-pam --with-login-manager --with-gtk --with-gl \
+ --without-gle --with-pixbuf --with-jpeg
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ make install_prefix="${pkgdir}" install
+ install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+ install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver"
+ chmod 755 "${pkgdir}/usr/bin/xscreensaver"
+ echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
+}
diff --git a/libre/xscreensaver-libre/add-electricsheep.diff b/libre/xscreensaver-libre/add-electricsheep.diff
new file mode 100755
index 000000000..18b4dea97
--- /dev/null
+++ b/libre/xscreensaver-libre/add-electricsheep.diff
@@ -0,0 +1,12 @@
+--- driver/XScreenSaver.ad.in-orig 2009-10-17 02:19:06.000000000 -0400
++++ driver/XScreenSaver.ad.in 2009-10-17 02:21:16.000000000 -0400
+@@ -347,7 +347,8 @@
+ @GL_KLUDGE@ GL: rubikblocks -root \n\
+ @GL_KLUDGE@ GL: companioncube -root \n\
+ @GL_KLUDGE@ GL: hilbert -root \n\
+-@GL_KLUDGE@ GL: tronbit -root \n
++@GL_KLUDGE@ GL: tronbit -root \n\
++ electricsheep --root 1 \n
+
+
+
diff --git a/libre/xscreensaver-libre/libre.patch b/libre/xscreensaver-libre/libre.patch
new file mode 100755
index 000000000..569f8435c
--- /dev/null
+++ b/libre/xscreensaver-libre/libre.patch
@@ -0,0 +1,112 @@
+diff -Naur xscreensaver-5.15/hacks/images/m6502/dmsc.asm /dev/null
+--- xscreensaver-5.15/hacks/images/m6502/dmsc.asm 2008-03-02 03:34:37.000000000 -0200
++++ /dev/null 2012-06-14 14:00:43.782877377 -0300
+@@ -1,108 +0,0 @@
+-; By DMSC - daniel.serpell@gmail.com
+-;
+-; This demo was programmed in ACME:
+-; http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/
+-;
+-; If you want the source code, send me an email :-)
+-;
+-
+- dcb 76, 94, 11,133, 32,162, 8,160, 8,145, 16,136,208,251,165, 16
+- dcb 24,105, 32,133, 16,165, 17,105, 0,133, 17,165, 32,202,208,231
+- dcb 96,230, 48,165, 48, 41, 63,133, 48,170,189,106, 6,170,189, 8
+- dcb 3,105, 1, 41, 3,157, 8, 3,138, 73,231,170,189, 0, 2,105
+- dcb 1, 41, 3,157, 0, 2,165, 48, 73, 63,170,189,106, 6, 73,224
+- dcb 170,189, 8, 2,105, 1, 41, 3,157, 8, 2,138, 73,231,170,189
+- dcb 0, 3,105, 1, 41, 3,157, 0, 3, 96,224,192,160,128, 96,225
+- dcb 64,193,161,226,129, 32,194, 97,162,227,195,130,228, 65,163,196
+- dcb 98,229,131,164,197,230,231,132,165,198, 99, 66, 33, 0,199,166
+- dcb 133,100,167, 67,134,101,135, 34, 68,102,103, 69, 35, 70, 71, 36
+- dcb 1, 37, 38, 39, 2, 3, 4, 5, 6, 7,166, 48,189,198, 6,170
+- dcb 254, 24, 3, 73, 7,170,254, 16, 3, 73,231,170,254, 24, 2, 73
+- dcb 7,170,254, 16, 2, 96, 0, 32, 1, 33, 64, 2, 65, 34, 96, 66
+- dcb 3, 97, 35, 98, 67,128, 4,129, 36, 99,130, 68,160, 5,161,131
+- dcb 100, 37,162, 69,132,192,163,101, 6,193, 38,194, 70,164,133,195
+- dcb 102,224, 7,225, 39,165,226,196,134, 71,227,103,197,166,228,135
+- dcb 198,229,167,230,199,231,166, 49,189, 21, 7,170,189, 0,160,157
+- dcb 0, 5,230, 49, 96,195,227,194,162,228, 97,226,128,129,130,225
+- dcb 64,161,163,224, 96,160,193,196, 32, 98,192, 65, 0,131,229,164
+- dcb 33, 99,197, 66,132, 1,230, 34,165, 67,100,198, 2, 3, 68, 6
+- dcb 35,133,166, 5,101, 4,199, 7, 36,231, 69,134,167, 37, 38,102
+- dcb 135, 70,232, 71, 39,103,136,200,168, 8, 11, 10,169,233,104, 9
+- dcb 12,137,201, 13, 40, 44, 72, 43,170, 42, 45, 41,105, 73,202, 14
+- dcb 138,234, 74, 75,106,203, 76,171, 46, 77,235,107,139, 15,108,172
+- dcb 174,140,173,141,142,204,109,206,207,205, 78,175, 47,236,239,143
+- dcb 237,238,110,240,241,111,208, 16, 79,176,209,242, 48,144,243, 80
+- dcb 177,244,112,210, 17, 49,178,179, 52, 53,147, 18, 81,211,145, 19
+- dcb 146, 51, 85,180, 20, 54,113,148, 22, 50, 84,212, 21, 55,115,245
+- dcb 83,114,116, 23, 82, 86, 88, 89, 87,118,117,119,149,213, 56, 57
+- dcb 181,214, 90,121,122,150,151,182,183,215,246, 58,120,247, 24,153
+- dcb 184,152,216, 25, 26, 59, 91,248,123,185, 27, 60,217,154, 28, 92
+- dcb 249, 29,155,186, 61,218, 93,124,250,187, 30,251, 62,156, 94,125
+- dcb 219,188, 31,252,254,220,253, 63,126,255,157,221, 95,159,191,222
+- dcb 127,189,223,158,190,165, 66, 41,224,208, 72,165, 66, 24,105, 1
+- dcb 41, 31,133, 66,165, 67,240, 7,198, 67,169, 0, 76, 97, 8,198
+- dcb 69,240,247, 16, 37,166, 64,230, 64,189,177, 9, 16, 15, 41,127
+- dcb 133, 67, 73,127,208,228,169, 1,133, 70, 76, 42, 8,170,189,117
+- dcb 8,133, 69,234,234,189,181, 8,133, 65,166, 65,230, 65,189,245
+- dcb 8,133, 68,165, 66, 24,105,224,133, 66,166, 66,169, 1,102, 68
+- dcb 42,157, 0,160, 96, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2
+- dcb 3, 2, 3, 3, 3, 3, 3, 1, 2, 3, 1, 5, 3, 3, 3, 3
+- dcb 3, 2, 2, 3, 3, 5, 4, 3, 3, 5, 4, 4, 4, 3, 3, 4
+- dcb 4, 1, 3, 4, 3, 5, 5, 5, 4, 5, 4, 4, 3, 4, 4, 7
+- dcb 4, 4, 4, 2, 1, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30
+- dcb 32, 35, 35, 38, 40, 43, 46, 49, 50, 52, 4, 55, 55, 60, 63, 65
+- dcb 68, 71, 73, 75, 78, 78, 33, 83, 86, 89, 94, 98,102,106,109,112
+- dcb 116, 94,120,123,127,130,134,139,144,148,153,157,161,164,167,171
+- dcb 178,171,182,186, 5, 56, 68, 56, 36,124, 4, 76, 84, 36, 68, 84
+- dcb 40, 24, 40,124,100, 84, 88, 56, 84, 72, 76, 80, 96, 40, 84, 40
+- dcb 36, 84, 56, 44, 28,124, 36, 24, 24, 36,124, 24, 52, 16, 60, 80
+- dcb 24, 37, 30,124, 32, 28,188, 1,190,124, 24, 36, 60, 32, 28, 32
+- dcb 28, 24, 36, 24, 63, 36, 24, 36, 63, 60, 16, 32, 52, 44,120, 36
+- dcb 56, 4, 60, 56, 4, 56, 4, 56, 57, 6, 56, 44, 52, 36, 12, 48
+- dcb 208, 48, 12,252,164,164, 88,120,132,132, 72,252,132,132,120,252
+- dcb 164,132,252,160,128,120,132,164, 56,252, 32, 32,252, 8, 4,248
+- dcb 252, 48, 80,140,252, 4, 4,252, 64, 60, 64,252, 64, 48, 8,252
+- dcb 120,132,132,132,120,252,144,144, 96,120,132,134,133,120,252,144
+- dcb 144,108, 68,164,164,152,128,252,128,248, 4, 4,248, 4, 8,240
+- dcb 224, 28, 16,224, 28, 16,224,204, 48, 48,204,140,148,164,196, 0
+- dcb 0,133, 41, 10, 28, 29, 63, 63, 63,136, 15, 10, 28, 29, 14, 27
+- dcb 63, 63, 63,132, 55, 17, 18, 28, 62, 18, 28, 62, 10,136, 27, 14
+- dcb 10, 21, 21, 34,143, 15, 10, 28, 29,142, 39, 40, 48, 50,149,145
+- dcb 10, 23, 13, 62, 23, 24, 32,136, 28, 24, 22, 14,136, 11, 14, 10
+- dcb 30, 29, 18, 15, 30, 21,128, 14, 15, 15, 14, 12, 29, 28, 63, 63
+- dcb 63,144,159,255, 55, 17, 18, 28, 62, 18, 28, 62, 10, 21, 21,129
+- dcb 15, 24, 27, 62, 23, 24, 32,136, 11, 34, 14, 63, 63, 63,141, 63
+- dcb 63, 63, 11, 34, 14,150,159,143, 11, 34, 62, 39, 48, 54, 38, 2
+- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2
+- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2
+- dcb 0, 0, 7, 63, 5, 63, 2, 9,143,159,255,169, 0,133, 42,169
+- dcb 1,133, 44,133, 45,169, 0,133, 32,169,160,133, 33,165, 42,133
+- dcb 43,162, 15,160, 15,145, 32, 24,101, 44,230, 44,136, 16,246,165
+- dcb 32, 24,105, 32,133, 32,165, 33,105, 0,133, 33,169, 1,133, 44
+- dcb 165, 43, 24,101, 45,133, 43,230, 45,202, 16,215,169, 0,133, 32
+- dcb 169,160,133, 33,169,224,133, 34,169, 3,133, 35,169, 0,133, 36
+- dcb 169, 4,133, 37,169,240,133, 38,169, 3,133, 39,169, 16,133, 40
+- dcb 169, 4,133, 41,169, 15,133, 46,160, 15,177, 32, 74, 74, 74, 74
+- dcb 170,189, 62, 11,209, 34,240, 18,145, 34,145, 36,170,152, 73, 15
+- dcb 168,138,145, 38,145, 40,152, 73, 15,168,136, 16,221,165, 32, 24
+- dcb 105, 32,133, 32,165, 33,105, 0,133, 33,165, 34, 24,105,224,133
+- dcb 34,165, 35,105,255,133, 35,165, 36, 24,105, 32,133, 36,165, 37
+- dcb 105, 0,133, 37,165, 38, 24,105,224,133, 38,165, 39,105,255,133
+- dcb 39,165, 40, 24,105, 32,133, 40,165, 41,105, 0,133, 41,198, 46
+- dcb 16,150,230, 42,165, 42, 41, 63,240, 3, 76, 95, 10, 96, 0, 11
+- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11, 0, 11
+- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11,169, 1
+- dcb 162,255,134, 16,162, 1,134, 17, 32, 3, 6,169, 2,162, 7,134
+- dcb 16,162, 2,134, 17, 32, 3, 6,169, 3,162, 7,134, 16,162, 3
+- dcb 134, 17, 32, 3, 6,169, 31,133, 66,169, 0,133, 70,133, 67,133
+- dcb 64,169, 1,141,109, 8,169, 0,141,114, 8,169,160,141,115, 8
+- dcb 169, 63,133, 48,169,128,133, 49,169, 3,141,109, 8,169, 0,170
+- dcb 157, 0,160,232,208,250, 32, 33, 6, 32,170, 6, 32, 6, 7, 32
+- dcb 21, 8,165, 66, 73, 31,208, 13,173,109, 8, 24,105, 2, 41, 3
+- dcb 105, 3,141,109, 8,165, 49,208,221,173, 17, 7, 73, 1,141, 17
+- dcb 7,165, 70,240,209, 32, 29, 12, 32, 91, 10,169, 31,133, 66,169
+- dcb 0,133, 70,133, 67,141,109, 8,169, 0,141,114, 8,169, 3,141
+- dcb 115, 8, 32, 29, 12, 32, 21, 8,165, 66, 73, 31,208,247,173,115
+- dcb 8, 73, 7,141,115, 8,165, 70,240,235, 76, 94, 11,169, 0,170
+- dcb 157, 0, 2,157, 0, 3,157, 0, 4,157, 0, 5,232,208,241, 96
+-
diff --git a/libre/xscreensaver-libre/xscreensaver.pam b/libre/xscreensaver-libre/xscreensaver.pam
new file mode 100755
index 000000000..b4d80c21f
--- /dev/null
+++ b/libre/xscreensaver-libre/xscreensaver.pam
@@ -0,0 +1 @@
+auth required pam_unix_auth.so
diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
new file mode 100755
index 000000000..a5fe02165
--- /dev/null
+++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -0,0 +1,281 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Tue, 5 Jun 2012 08:57:06 +0200
+Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
+
+diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
+index 0e8ccf5..fa46c08 100644
+--- a/browser/components/migration/content/migration.js
++++ b/browser/components/migration/content/migration.js
+@@ -249,7 +249,7 @@ var MigrationWizard = {
+ }
+
+ var brandBundle = document.getElementById("brandBundle");
+- // These strings don't exist when not using official branding. If that's
++ // These strings may not exist when not using official branding. If that's
+ // the case, just skip this page.
+ try {
+ var pageTitle = brandBundle.getString("homePageMigrationPageTitle");
+@@ -281,8 +281,8 @@ var MigrationWizard = {
+ case "chrome":
+ source = "sourceNameChrome";
+ break;
+- case "firefox":
+- source = "sourceNameFirefox";
++ case "self":
++ source = "brand";
+ break;
+ }
+
+@@ -292,7 +292,12 @@ var MigrationWizard = {
+ var oldHomePageURL = this._migrator.sourceHomePageURL;
+
+ if (oldHomePageURL && source) {
+- var appName = MigrationUtils.getLocalizedString(source);
++ var appName;
++ if (source == "brand") {
++ appName = brandBundle.GetStringFromName("brandFullName");
++ } else {
++ appName = MigrationUtils.getLocalizedString(source);
++ }
+ var oldHomePageLabel =
+ brandBundle.getFormattedString("homePageImport", [appName]);
+ var oldHomePage = document.getElementById("oldHomePage");
+diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
+index f030756..23e37ff 100644
+--- a/browser/components/migration/content/migration.xul
++++ b/browser/components/migration/content/migration.xul
+@@ -42,7 +42,7 @@
+ #elifdef XP_UNIX
+ <radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
+ #endif
+- <radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/>
++ <radio id="self" hidden="true"/>
+ <radio id="nothing" label="&importFromNothing.label;" accesskey="&importFromNothing.accesskey;" hidden="true"/>
+ </radiogroup>
+ <label id="noSources" hidden="true">&noMigrationSources.label;</label>
+diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
+index d7fec75..d531b83 100644
+--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
++++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
+@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
+ component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
+ component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
+-contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
++contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
+ #ifdef HAS_IE_MIGRATOR
+ component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
+diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
+index a6598fe..8f83da8 100644
+--- a/browser/components/migration/src/FirefoxProfileMigrator.js
++++ b/browser/components/migration/src/FirefoxProfileMigrator.js
+@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
+
+
+ FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
+-FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
++FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
+ FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
+
+ const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
+diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
+index 0669aa8..19552e3 100644
+--- a/browser/components/migration/src/MigrationUtils.jsm
++++ b/browser/components/migration/src/MigrationUtils.jsm
+@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({
+ * @see nsIStringBundle
+ */
+ getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
+- const OVERRIDES = {
+- "4_firefox": "4_firefox_history_and_bookmarks"
+- };
+- aKey = OVERRIDES[aKey] || aKey;
+-
+ if (aReplacements === undefined)
+ return getMigrationBundle().GetStringFromName(aKey);
+ return getMigrationBundle().formatStringFromName(
+@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({
+ },
+
+ /**
++ * Returns whether a given migration type is supported.
++ *
++ * @param aKey Migrator key
++ * @returns whether the migrator key is supported.
++ */
++ canMigrate:
++ function MU_canMigrate(aMigratorKey) {
++ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
++ },
++
++ /**
+ * Cleans up references to migrators and nsIProfileInstance instances.
+ */
+ finishMigration: function MU_finishMigration() {
+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
+index 744f117..59e5a4c 100644
+--- a/browser/components/migration/src/ProfileMigrator.js
++++ b/browser/components/migration/src/ProfileMigrator.js
+@@ -12,6 +12,7 @@ function ProfileMigrator() {
+
+ ProfileMigrator.prototype = {
+ migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
++ canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
+ QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
+ classDescription: "Profile Migrator",
+ contractID: "@mozilla.org/toolkit/profile-migrator;1",
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+index 21cf405..f3c1a6b 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
++++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+@@ -17,8 +17,6 @@
+ <!ENTITY importFromSafari.accesskey "S">
+ <!ENTITY importFromChrome.label "Chrome">
+ <!ENTITY importFromChrome.accesskey "C">
+-<!ENTITY importFromFirefox.label "Firefox">
+-<!ENTITY importFromFirefox.accesskey "X">
+
+ <!ENTITY noMigrationSources.label "No programs that contain bookmarks, history or password data could be found.">
+
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
+index 260bc29..52b32cc 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
++++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
+@@ -8,7 +8,6 @@ profileName_format=%S %S
+ sourceNameIE=Internet Explorer
+ sourceNameSafari=Safari
+ sourceNameChrome=Google Chrome
+-sourceNameFirefox=Mozilla Firefox
+
+ importedBookmarksFolder=From %S
+
+@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)
+ 2_ie=Cookies
+ 2_safari=Cookies
+ 2_chrome=Cookies
+-2_firefox=Cookies
++2_self=Cookies
+
+ 4_ie=Browsing History
+ 4_safari=Browsing History
+ 4_chrome=Browsing History
+-4_firefox_history_and_bookmarks=Browsing History and Bookmarks
++4_self=Browsing History and Bookmarks
+
+ 8_ie=Saved Form History
+ 8_safari=Saved Form History
+ 8_chrome=Saved Form History
+-8_firefox=Saved Form History
++8_self=Saved Form History
+
+ 16_ie=Saved Passwords
+ 16_safari=Saved Passwords
+ 16_chrome=Saved Passwords
+-16_firefox=Saved Passwords
++16_self=Saved Passwords
+
+ 32_ie=Favorites
+ 32_safari=Bookmarks
+@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)
+ 64_ie=Other Data
+ 64_safari=Other Data
+ 64_chrome=Other Data
+-64_firefox=Bookmarks Backups
++64_self=Bookmarks Backups
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index 339ffda..6999b26 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -38,7 +38,7 @@ toolkit.jar:
+ + content/global/mozilla.xhtml (mozilla.xhtml)
+ content/global/nsDragAndDrop.js (nsDragAndDrop.js)
+ content/global/resetProfile.css (resetProfile.css)
+-* content/global/resetProfile.js (resetProfile.js)
++ content/global/resetProfile.js (resetProfile.js)
+ content/global/resetProfile.xul (resetProfile.xul)
+ content/global/resetProfileProgress.xul (resetProfileProgress.xul)
+ content/global/treeUtils.js (treeUtils.js)
+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
+index dcb4065..09c1146 100644
+--- a/toolkit/content/resetProfile.js
++++ b/toolkit/content/resetProfile.js
+@@ -36,13 +36,13 @@ function resetSupported() {
+ getService(Ci.nsIToolkitProfileService);
+ let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-
+ // Reset is only supported for the default profile if the self-migrator used for reset exists.
+ try {
+- return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
+- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);
++ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
++ "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
++ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
++ return ("canMigrate" in pm) && pm.canMigrate("self");
++ }
+ } catch (e) {
+ // Catch exception when there is no selected profile.
+ Cu.reportError(e);
+@@ -53,9 +53,6 @@ function resetSupported() {
+ function getMigratedData() {
+ Components.utils.import("resource:///modules/MigrationUtils.jsm");
+
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-
+ // From migration.properties
+ const MIGRATED_TYPES = [
+ 4, // History and Bookmarks
+@@ -68,7 +65,7 @@ function getMigratedData() {
+ let dataTypes = [];
+ for (let itemID of MIGRATED_TYPES) {
+ try {
+- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
++ let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
+ dataTypes.push(typeName);
+ } catch (x) {
+ // Catch exceptions when the string for a data type doesn't exist.
+diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
+index f35c227..7062886 100644
+--- a/toolkit/profile/nsIProfileMigrator.idl
++++ b/toolkit/profile/nsIProfileMigrator.idl
+@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports
+ * @client Toolkit (Startup code)
+ * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
+ */
+-[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
++[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
+ interface nsIProfileMigrator : nsISupports
+ {
+ /**
+@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports
+ * @note The startup code ignores COM exceptions thrown from this method.
+ */
+ void migrate(in nsIProfileStartup aStartup, in ACString aKey);
++
++ /**
++ * Returns whether a given migration type is supported.
++ *
++ * @param aKey Migrator key
++ * @returns whether the migrator key is supported.
++ */
++ bool canMigrate(in ACString aKey);
+ };
+
+ %{C++
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index 60348b5..c240c4f 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3651,7 +3651,7 @@ XREMain::XRE_mainRun()
+ if (gDoProfileReset) {
+ // Automatically migrate from the current application if we just
+ // reset the profile.
+- aKey = MOZ_APP_NAME;
++ aKey = "self";
+ }
+ pm->Migrate(&mDirProvider, aKey);
+ }
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index af4b45aae..745723604 100644..100755
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 153514 2012-03-15 13:26:26Z ibiru $
+# $Id: PKGBUILD 160908 2012-06-06 17:03:39Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
# With many changes from iceweasel-libre.
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=12.0
-_debrel=3
+_debver=16.0.2
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -23,23 +23,20 @@ makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mes
url="http://wiki.mozilla.org/XUL:Xul_Runner"
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
mozconfig
mozilla-pkgconfig.patch
- gcc47.patch)
+ Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
options=('!emptydirs')
conflicts=('xulrunner')
provides=("xulrunner=${_debver}")
replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('b45f57bfe21b0e6db4f0683e794917cb'
- '2b66fb2e51631ef3b07de89ef9d17d0c'
- '552adcf5da3b07757e7fe29c8bd2ec2d'
+md5sums=('4a4f19048e34f7f0a2d28adc351df1ed'
+ 'ee38477dd7ede1c32e559ee74139b5c9'
'f2f4f4a573f549e8b494e33b3ad226bc'
'27271ce647a83906ef7a24605e840d61'
- '5a8563f8fda7ad30405c86764267a19c')
+ '0a31239f1008038df5057982fe745dec')
-dpkg-source() {
- # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+build() {
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
@@ -47,56 +44,47 @@ dpkg-source() {
mv debian "${_debname}-${_debver}"
cd "${_debname}-${_debver}"
-# Doesn't apply and seems unimportant
+ # 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
+ rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
+
quilt push -a
find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
- cd ..
-}
-
-build() {
-# Don't run this if we're using -e
-if [ $NOEXTRACT -eq 0 ]; then
- msg2 "Applying Debian patches..."
- cd "${srcdir}"
- dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-
- msg2 "Starting normal build..."
- mv "${_debname}-${_debver}" "$srcdir/mozilla-release"
- cd "$srcdir/mozilla-release"
cp "$srcdir/mozconfig" .mozconfig
+ # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+ patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch"
+
# Fails, claiming the page size to have changed.
[ "$CARCH" = "mips64el" ] && echo 'ac_add_options --disable-jemalloc' >> .mozconfig
#fix libdir/sdkdir - fedora
patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
- patch -Np1 -i "$srcdir/gcc47.patch"
-fi
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver}"
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
export PYTHON="/usr/bin/python2"
make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
}
package() {
- cd "$srcdir/mozilla-release"
+ cd "${_debname}-${_debver}"
make -j1 -f client.mk DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation}
- ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-${_debver}/dictionaries"
- ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-${_debver}/hyphenation"
+ rm -rf "$pkgdir"/usr/lib/xulrunner-${_debver::4}/{dictionaries,hyphenation}
+ ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-${_debver::4}/dictionaries"
+ ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-${_debver::4}/hyphenation"
# add xulrunner library path to ld.so.conf
install -d $pkgdir/etc/ld.so.conf.d
- echo "/usr/lib/xulrunner-${_debver}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
+ echo "/usr/lib/xulrunner-${_debver::4}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
- chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/header.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/typelib.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpidl.py"
+ chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py"
+ sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py"
+ sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/header.py"
+ sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/typelib.py"
+ sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpidl.py"
}
diff --git a/libre/xulrunner-libre/gcc47.patch b/libre/xulrunner-libre/gcc47.patch
deleted file mode 100644
index 5cea6769d..000000000
--- a/libre/xulrunner-libre/gcc47.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-
-# HG changeset patch
-# User Martin Stránský <stransky@redhat.com>
-# Date 1328886461 -3600
-# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
-# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049
-Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
-
-diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
---- a/ipc/chromium/src/base/file_util_linux.cc
-+++ b/ipc/chromium/src/base/file_util_linux.cc
-@@ -1,15 +1,18 @@
- // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <string>
- #include <vector>
-
- #include "base/eintr_wrapper.h"
- #include "base/file_path.h"
- #include "base/string_util.h"
-
-diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
---- a/ipc/chromium/src/base/message_pump_libevent.cc
-+++ b/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -1,16 +1,19 @@
- // Copyright (c) 2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/message_pump_libevent.h"
-
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
- #include "base/scoped_nsautorelease_pool.h"
- #include "base/scoped_ptr.h"
- #include "base/time.h"
- #include "third_party/libevent/event.h"
-
-diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
---- a/ipc/chromium/src/base/time_posix.cc
-+++ b/ipc/chromium/src/base/time_posix.cc
-@@ -8,16 +8,19 @@
- #include <mach/mach_time.h>
- #endif
- #include <sys/time.h>
- #ifdef ANDROID
- #include <time64.h>
- #else
- #include <time.h>
- #endif
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
-
- #include <limits>
-
- #include "base/basictypes.h"
- #include "base/logging.h"
-
- namespace base {
-
-
diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig
index 34c5a6137..34c5a6137 100644..100755
--- 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 100644..100755
--- 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 cbf5b9c60..649cb962d 100644..100755
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
pkgname=your-freedom
pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=2
+pkgrel=1
pkgdesc="This package conflicts with every unfree package known to date to ensure your system is free."
arch=('any')
url="https://parabolagnulinux.org"
@@ -23,4 +23,5 @@ package() {
sort -u
))
}
-md5sums=('c4ecf01611d55df03b5e4412dca4e70d')
+
+md5sums=('5e50a4ec73267a732d153c1079e9b021')
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
index 50988f587..0786adabf 100644..100755
--- a/libre/your-freedom/your-freedom.install
+++ b/libre/your-freedom/your-freedom.install
@@ -19,7 +19,7 @@ pre_install() {
* Etc.
Please report back to the Parabola Project on the usual channels:
- * https://bugs.parabolagnulinux.org
+ * https://labs.parabola.nu
* irc://freenode.net/#parabola
* mailto:dev@list.parabolagnulinux.org
EOM