From 5e92143b58bc8552319151b87c531fa5a66005e5 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 16 Jul 2012 18:37:52 -0300 Subject: d0_blind_id-git: add new package to pcr repo --- pcr/d0_blind_id-git/PKGBUILD | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pcr/d0_blind_id-git/PKGBUILD diff --git a/pcr/d0_blind_id-git/PKGBUILD b/pcr/d0_blind_id-git/PKGBUILD new file mode 100644 index 000000000..bfda13205 --- /dev/null +++ b/pcr/d0_blind_id-git/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: MrBougo +pkgname=d0_blind_id-git +pkgver=20120716 +pkgrel=1 +pkgdesc="Cryptographic library for identification with Schnorr ID scheme and Blind RSA Signatures" +arch=('i686' 'x86_64') +url="http://github.com/divVerent/d0_blind_id" +license=('BSD') +depends=('gmp') +makedepends=('git') +conflicts=() +options=('!libtool') + +_gitroot="git://git.xonotic.org/xonotic/d0_blind_id.git" +_gitname="d0_blind_id" + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + sh autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$_gitname-build" + make DESTDIR="$pkgdir/" install + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} -- cgit v1.2.3-54-g00ecf From cd68c83ecc1faa97e0d2f3a86a058765cdd3eb13 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 17 Jul 2012 15:44:39 -0300 Subject: linux-libre-3.4.5-1: updating version --- libre/linux-libre/PKGBUILD | 29 +++++++++++++++-------------- libre/linux-libre/linux-libre.install | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 08a32eae0..250ec13ef 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,10 +12,10 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.4 -_sublevel=4 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -34,18 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' '3.4.4-fix-backlight-regression.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - 'e9bb311ab329555a61696b1a18df2d34' - '669c3f9d5c6a2109bad8e511287826c3' - '454231e14419e56a5281eb7bc6fde83e' - 'e49ac236dfeef709f91a3d993ea7b62c' - '2967cecc3af9f954ccc822fd63dca6ff' - '8267264d9a8966e57fdacd1fa1fc65c4' - '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' - '80a46681386bb87813989faeb92bdd9a' - '86910efeadb5d1e5d5416ff1a9dacb33') + if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -385,3 +374,15 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } +md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' + '0882e254b12df2c8d73df29de85223a7' + '669c3f9d5c6a2109bad8e511287826c3' + '454231e14419e56a5281eb7bc6fde83e' + 'e49ac236dfeef709f91a3d993ea7b62c' + '2967cecc3af9f954ccc822fd63dca6ff' + '8267264d9a8966e57fdacd1fa1fc65c4' + '04b21c79df0a952c22d681dd4f4562df' + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + '80a46681386bb87813989faeb92bdd9a' + '86910efeadb5d1e5d5416ff1a9dacb33') \ No newline at end of file diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 44850230f..7d7e7a1db 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.4-3-LIBRE +KERNEL_VERSION=3.4.5-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' -- cgit v1.2.3-54-g00ecf From 0f30930e8efdf56b42d1418b5b14ae44afd4a38e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 17 Jul 2012 15:49:58 -0300 Subject: linux-libre-3.4.5-1: adding a new line at the end on PKGBUILD file --- libre/linux-libre/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 250ec13ef..59ea3ba2c 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -385,4 +385,5 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' '80a46681386bb87813989faeb92bdd9a' - '86910efeadb5d1e5d5416ff1a9dacb33') \ No newline at end of file + '86910efeadb5d1e5d5416ff1a9dacb33') + -- cgit v1.2.3-54-g00ecf From 7d8a07367c221dc4f04f0fa4735c82b95842f4ff Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 17 Jul 2012 16:10:57 -0300 Subject: linux-libre-3.4.5-1: coming back md5sums to the original place due that contains mips patch and variables to enable it on PKGBUILD --- libre/linux-libre/PKGBUILD | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 59ea3ba2c..e3116046b 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -34,6 +34,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' '3.4.4-fix-backlight-regression.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") +md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' + '0882e254b12df2c8d73df29de85223a7' + '669c3f9d5c6a2109bad8e511287826c3' + '454231e14419e56a5281eb7bc6fde83e' + 'e49ac236dfeef709f91a3d993ea7b62c' + '2967cecc3af9f954ccc822fd63dca6ff' + '8267264d9a8966e57fdacd1fa1fc65c4' + '04b21c79df0a952c22d681dd4f4562df' + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + '80a46681386bb87813989faeb92bdd9a' + '86910efeadb5d1e5d5416ff1a9dacb33') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -374,16 +386,3 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } -md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - '0882e254b12df2c8d73df29de85223a7' - '669c3f9d5c6a2109bad8e511287826c3' - '454231e14419e56a5281eb7bc6fde83e' - 'e49ac236dfeef709f91a3d993ea7b62c' - '2967cecc3af9f954ccc822fd63dca6ff' - '8267264d9a8966e57fdacd1fa1fc65c4' - '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' - '80a46681386bb87813989faeb92bdd9a' - '86910efeadb5d1e5d5416ff1a9dacb33') - -- cgit v1.2.3-54-g00ecf From 120fb2912d957d87aeaa59665a70f35a079484fd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 17 Jul 2012 16:13:52 -0300 Subject: linux-libre-3.4.5-1: deleting blank spaces --- libre/linux-libre/PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e3116046b..d36ba4da2 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -46,7 +46,6 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '263725f20c0b9eb9c353040792d644e5' '80a46681386bb87813989faeb92bdd9a' '86910efeadb5d1e5d5416ff1a9dacb33') - if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3-54-g00ecf From 661bd5e9553921c40bbdb66fc29d10dc12a271a9 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 17 Jul 2012 17:10:13 -0300 Subject: linux-libre-lts-3.0.37-1: updating version --- libre/linux-libre-lts/PKGBUILD | 6 +++--- libre/linux-libre-lts/linux-libre-lts.install | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 17651ce1e..9793f599e 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,10 +9,10 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS k # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=36 +_sublevel=37 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.36 # nearly always the same as pkgver -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '150413437fe54d4822e9e43189e37319' + '5fbdf641fc8962f875d1e9e8ce8f2969' '9cfcf3807201ce44aa720571232a10ce' '8bb5c5aa217202c3ac3798ba7798e07d' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 8a688091d..12b654f19 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.36-2-LIBRE-LTS +KERNEL_VERSION=3.0.37-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' -- cgit v1.2.3-54-g00ecf From 561d5f2c9502a8a8f13a20f8d0fa5498b20cc357 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 17 Jul 2012 17:12:48 -0300 Subject: xonotic-git: add new package to pcr repo --- pcr/xonotic-git/PKGBUILD | 197 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 197 insertions(+) create mode 100644 pcr/xonotic-git/PKGBUILD diff --git a/pcr/xonotic-git/PKGBUILD b/pcr/xonotic-git/PKGBUILD new file mode 100644 index 000000000..2a032cd4a --- /dev/null +++ b/pcr/xonotic-git/PKGBUILD @@ -0,0 +1,197 @@ +# Maintainer: MrBougo +# Contributor: wido +# Contributor: Alexander Suhoverhov + +pkgname=xonotic-git +pkgver=20120718 +pkgrel=1 +pkgdesc="A free, fast-paced crossplatform first-person shooter" +arch=('i686' 'x86_64') +url="http://xonotic.org" +license=('GPL') +depends=( + 'd0_blind_id-git' + 'libxpm' + 'libjpeg>=8' + 'libpng>=1.4.0' + 'libmodplug' + 'libvorbis' + 'libxxf86dga' + 'libxxf86vm' + 'alsa-lib' + 'sdl' + 'curl' +) +makedepends=('git' 'p7zip' 'zip' 'unzip' 'vorbis-tools' 'sdl' 'mesa' 'imagemagick') +optdepends=( + 'libtheora: recording in ogv' + #'d0_blind_id-git: crypto libraries for player authentification' +) +provides=('xonotic' 'xonotic-data') +conflicts=('xonotic' 'xonotic-data') + +_gitroot="git://git.xonotic.org/xonotic/xonotic.git" +_gitname="xonotic" +_releasename="git-AUR" +_compression=5 + +# the jpeg and ogg variables can be modified, the function may also be skipped for raw data +# the values here are also used in the official -low builds +_compress() { + find $1 -type f -print0 | + git_src_repo=$2 \ + CACHEDIR="$srcdir"/datacache \ + do_jpeg=true \ + jpeg_qual_rgb=80 \ + jpeg_qual_a=97 \ + do_dds=false \ + do_ogg=true \ + ogg_qual=1 \ + del_src=true \ + xargs -0 "$srcdir"/$_gitname/misc/tools/cached-converter.sh +} + +_git_extract() { + _from=$1 + _to=$2 + shift 2 + { cd "$_from"; git archive --format=tar HEAD -- "$@"; } \ + | { + cd "$_to" + tar xvf - + } +} + +# 7z compresses nicely but can't deal with flags and symlinks +_mkzip() { + _archive=$1 + shift + _ziplist=`mktemp` + find "$@" -xtype f \( -executable -or -type l \) -print > "$_ziplist" + 7za a -tzip -mx=$_compression -x@"$_ziplist" "$_archive" "$@" || true + zip -$_compression -y -@<"$_ziplist" "$_archive" || true + rm -f "$_ziplist" +} + +#credit goes to omgwizard for the shallow clone idea +_update() { + cd "$srcdir"/$_gitname + sed 's/git clone/git clone --depth 1/g' --in-place=".PKGBUILD_BU" ./all + ./all update + mv -f ./all.PKGBUILD_BU ./all + cd "$OLDPWD" +} + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + #future updates might introduce new subrepos, use shallow cloning anyway + cd $_gitname && _update + msg "The local files are updated." + else + git clone --depth 1 $_gitroot $_gitname + cd $_gitname + touch d0_blind_id.no + touch netradiant.no + _update + fi + + msg "GIT checkout done or server timeout" + + # BUILD + + msg "Copying sources..." + + rm -rf "$srcdir"/src + mkdir -p "$srcdir"/src/darkplaces "$srcdir"/src/fteqcc + _git_extract "$srcdir"/$_gitname/fteqcc "$srcdir"/src/fteqcc + _git_extract "$srcdir"/$_gitname/darkplaces "$srcdir"/src/darkplaces + _git_extract "$srcdir"/$_gitname/data/xonotic-data.pk3dir "$srcdir"/src \ + qcsrc Makefile check-cvars.sh + + msg "Fetching map binaries..." + cd "$srcdir"/$_gitname + ./all update-maps + + msg "Compiling the engine..." + cd "$srcdir"/src/darkplaces + CC="${CC:-gcc} -g -DSUPPORTIPV6" make release + + msg "Compiling fteqcc..." + cd "$srcdir"/src/fteqcc + make all + + msg "Compiling the game code" + cd "$srcdir"/src/ + make FTEQCC="../../fteqcc/fteqcc.bin" # relative to the directories containing progs.src + + msg "Building data pk3's..." + rm -rf "$srcdir"/temp # just in case it was interrupted previously + mkdir "$srcdir"/temp + cd "$srcdir"/temp + for _subrepo in font-nimbussansl font-xolonium xonotic-data xonotic-music xonotic-maps; do + mkdir $_subrepo + _git_extract "$srcdir"/$_gitname/data/$_subrepo.pk3dir "$srcdir"/temp/$_subrepo + done + + rm -rf "$srcdir"/temp/xonotic-data/qcsrc + mv "$srcdir"/src/progs.dat "$srcdir"/src/csprogs.dat "$srcdir"/src/menu.dat "$srcdir"/temp/xonotic-data + + cd "$srcdir"/temp/xonotic-maps + #2x40 question marks. That's as many as eight tens. And that's terrible. + for X in "$srcdir"/$_gitname/data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do + if [ -f "$X" ]; then + unzip "$X" + rm -f maps/*.log maps/*.irc maps/*.lin + fi + done + + msg "Compressing data..." + cd "$srcdir"/temp/ + # don't compress the font files + for _subrepo in xonotic-data xonotic-music xonotic-maps; do + _compress $_subrepo "$srcdir"/$_gitname/data/$_subrepo.pk3dir + done + + msg "Packing data..." + for _subrepo in font-nimbussansl font-xolonium xonotic-data xonotic-music xonotic-maps; do + cd "$srcdir"/temp/$_subrepo + _mkzip "$srcdir"/$_subrepo.pk3 * # this wildcard excludes dot files + done + + msg "Removing temporary files..." + rm -rf "$srcdir"/temp +} + +package() { + msg "Installing..." + mkdir -p "$pkgdir"/opt/$pkgname/ + _git_extract "$srcdir"/$_gitname/ "$pkgdir"/opt/$pkgname \ + Docs \ + server \ + xonotic-linux-glx.sh xonotic-linux-sdl.sh \ + key_0.d0pk + chmod 755 "$pkgdir"/opt/$pkgname/xonotic-linux-glx.sh \ + "$pkgdir"/opt/$pkgname/xonotic-linux-sdl.sh + + # Binaries -- those names are needed by the launcher script + case "$CARCH" in + x86_64) _arch="linux64" ;; + *) _arch="linux32" ;; + esac + install -m755 "$srcdir"/src/darkplaces/darkplaces-glx "$pkgdir"/opt/$pkgname/xonotic-$_arch-glx + install -m755 "$srcdir"/src/darkplaces/darkplaces-glx "$pkgdir"/opt/$pkgname/xonotic-$_arch-sdl + install -m755 "$srcdir"/src/darkplaces/darkplaces-dedicated "$pkgdir"/opt/$pkgname/xonotic-$_arch-dedicated + + mkdir -p "$pkgdir"/opt/$pkgname/data/ + mv -f "$srcdir"/*.pk3 "$pkgdir"/opt/$pkgname/data || true # those files are too big to be copied + + # Launch scripts + mkdir -p "$pkgdir"/usr/bin + mv -f "$pkgdir"/opt/$pkgname/server/server_linux.sh "$pkgdir"/opt/$pkgname/ + ln -sf /opt/$pkgname/xonotic-linux-glx.sh "$pkgdir"/usr/bin/xonotic-glx + ln -sf /opt/$pkgname/xonotic-linux-sdl.sh "$pkgdir"/usr/bin/xonotic-sdl + ln -sf /opt/$pkgname/server_linux.sh "$pkgdir"/usr/bin/xonotic-dedicated +} -- cgit v1.2.3-54-g00ecf From 98e9dda466e303d77d6f58932cf60c940b5e533c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 18 Jul 2012 01:55:00 -0300 Subject: iceweasel-libre-14.0.1.1-1: updating version --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 204 ++++++++++++--------- libre/iceweasel-libre/PKGBUILD | 12 +- libre/iceweasel-libre/libre.patch | 14 +- 3 files changed, 133 insertions(+), 97 deletions(-) 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 index 3e7149308..4a0507271 100644 --- 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 @@ -1,17 +1,21 @@ +From: Mike Hommey +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 ffb0c34..442a5ff 100644 +index 0e8ccf5..fa46c08 100644 --- a/browser/components/migration/content/migration.js +++ b/browser/components/migration/content/migration.js -@@ -314,7 +314,7 @@ var MigrationWizard = { +@@ -249,7 +249,7 @@ var MigrationWizard = { } - var bundle = document.getElementById("brandBundle"); + 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 = bundle.getString("homePageMigrationPageTitle"); -@@ -346,8 +346,8 @@ var MigrationWizard = { + var pageTitle = brandBundle.getString("homePageMigrationPageTitle"); +@@ -281,8 +281,8 @@ var MigrationWizard = { case "chrome": source = "sourceNameChrome"; break; @@ -22,75 +26,107 @@ index ffb0c34..442a5ff 100644 break; } -@@ -357,8 +357,13 @@ var MigrationWizard = { +@@ -292,7 +292,12 @@ var MigrationWizard = { var oldHomePageURL = this._migrator.sourceHomePageURL; if (oldHomePageURL && source) { -- var bundle2 = document.getElementById("bundle"); -- var appName = bundle2.getString(source); +- var appName = MigrationUtils.getLocalizedString(source); + var appName; + if (source == "brand") { -+ appName = bundle.GetStringFromName("brandFullName"); ++ appName = brandBundle.GetStringFromName("brandFullName"); + } else { -+ var bundle2 = document.getElementById("bundle"); -+ appName = bundle2.getString(source); ++ appName = MigrationUtils.getLocalizedString(source); + } - var oldHomePageLabel = bundle.getFormattedString("homePageImport", - [appName]); + 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 f8653b1..f3ac62a 100644 +index 4bcc1d9..c4db956 100644 --- a/browser/components/migration/content/migration.xul +++ b/browser/components/migration/content/migration.xul -@@ -76,7 +76,7 @@ - #endif - #endif +@@ -74,7 +74,7 @@ + #elifdef XP_UNIX + #endif - +