From b57a9248281bb12b690122cb2c04b14a789a00dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sun, 22 Jul 2012 02:54:46 -0300 Subject: linux-libre-tools-3.5-1: updating md5sum --- libre/linux-libre-tools/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 1c3e94361..3803b520c 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'cpupower.rc' 'cpupower.conf' 'cpupower.service') -md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' +md5sums=('2407fc9563a74acaf38aa0c06516eb1c' '73dbc931e86b3b73d6e2338dcbee81a4' '18d5aa9e4c6bb23bb02bf65e155e0f0e' '20870541e88109d2f153be3c58a277f1') -- cgit v1.2.3-2-g168b From 98b9141f47309f331d969a4fcbc21d47a8b609f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sun, 22 Jul 2012 16:59:58 -0300 Subject: mozilla-devscripts: updating package --- libre/mozilla-devscripts/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD index faa4b3a2a..ef7ea7641 100644 --- a/libre/mozilla-devscripts/PKGBUILD +++ b/libre/mozilla-devscripts/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Michał Masłowski +# Contributor: Márcio Silva 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" -- cgit v1.2.3-2-g168b From 28e3a130ba71f25ba564a49faace57e6ce246f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sun, 22 Jul 2012 18:43:19 -0300 Subject: psutils-libre: deleting .directory file --- libre/psutils-libre/.directory | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 libre/psutils-libre/.directory (limited to 'libre') 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 -- cgit v1.2.3-2-g168b From e8a1c3baadc9539b355cec98771effc89ede53c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sun, 22 Jul 2012 22:53:58 -0300 Subject: texlive-bin-libre: updating package --- libre/texlive-bin-libre/PKGBUILD | 22 ++++++++++++--------- .../luatex-r4449-radical-rule-thickness.patch | 23 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch (limited to 'libre') diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 68c71284c..3dd2a8620 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgname=texlive-bin-libre pkgver=2012.0 -pkgrel=1 +pkgrel=2 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64' 'mips64el') @@ -25,19 +25,19 @@ source=('texmf.cnf' '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' @@ -45,7 +45,8 @@ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae' '393a4bf67adc7ca5df2b386759d1a637' 'e3a664d5a7f0923f35060fe9d25d2573' 'ac2c3c3aa765581f8504e21a5edbfb9f' - 'f315a860158cfc952c82a6d759961024') + 'f315a860158cfc952c82a6d759961024' + '5190f3295eb9a604c5f17f5bd607299b') build() { if [ "${CARCH}" != "i686" ]; then @@ -58,6 +59,9 @@ build() { 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 ############################################################# 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 100644 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); -- cgit v1.2.3-2-g168b From 22d7d514590e6e2f08bdb1593b9060cbff38f974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Sun, 22 Jul 2012 22:55:49 -0300 Subject: texlive-core-libre: deleting .directory file --- libre/texlive-core-libre/.directory | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 libre/texlive-core-libre/.directory (limited to 'libre') diff --git a/libre/texlive-core-libre/.directory b/libre/texlive-core-libre/.directory deleted file mode 100644 index 9d572f361..000000000 --- a/libre/texlive-core-libre/.directory +++ /dev/null @@ -1,5 +0,0 @@ -[Dolphin] -Timestamp=2012,6,26,20,37,17 - -[Settings] -HiddenFilesShown=true -- cgit v1.2.3-2-g168b From f4845199ed567d98e95fcc7f1961922e13a6b248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 23 Jul 2012 00:00:00 -0300 Subject: parabola-keyring-20120723-1: updating version --- libre/parabola-keyring/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 432a5cf75..385790ccd 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: André Silva pkgname=parabola-keyring -pkgver=20120719 -pkgrel=2 +pkgver=20120723 +pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') url='https://projects.parabolagnulinux.org/hackers.git/' @@ -16,5 +16,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('de7f518935faea83aaa4d74001be8ecc' - '22dd9f76911e4984a6cc625d9d1f9465') +md5sums=('f9ab13c8c969c3bf136e302a666e32d9' + '5c27394f0575ab9fb27bf3ab9cb212e3') -- cgit v1.2.3-2-g168b From 0bd206bfb0dcaf7b5e8ee531ac7e07a70babd40a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 23 Jul 2012 03:43:41 -0300 Subject: xulrunner-libre-14.0.1.2-1: updating version --- libre/xulrunner-libre/PKGBUILD | 59 +++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) (limited to 'libre') diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index 001eb5f48..8c332db12 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -4,10 +4,10 @@ # With many changes from iceweasel-libre. -# We're getting this from Debian Sid +# We're getting this from Debian Experimental _debname=iceweasel -_debver=13.0 -_debrel=1 +_debver=14.0.1 +_debrel=2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -23,7 +23,6 @@ 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 Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) @@ -31,15 +30,13 @@ options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('e440446bb92dc1c0311346c68024590b' - 'cb8bfb543002a5d78db7e8661f9f87ec' - 'a9848e41461776bc4bf8d2de824b1204' +md5sums=('8e4f3987d37c8e73b168948d0771b872' + '8689c150a4d3a0a688ad2db6044feac6' 'f2f4f4a573f549e8b494e33b3ad226bc' '27271ce647a83906ef7a24605e840d61' - '41ce105f0c1877fe22e0c0ec45e09565') + '88350bc611361a1ff635f5c960c6d6ee') -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,31 +44,18 @@ 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 + # 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 + # 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. @@ -79,29 +63,28 @@ if [ $NOEXTRACT -eq 0 ]; then #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.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" } -- cgit v1.2.3-2-g168b From 89935048066b26fde378d2254e65c548333729bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 23 Jul 2012 03:44:43 -0300 Subject: xulrunner-libre-14.0.1.2-1: removing obsolete gcc47.patch file --- libre/xulrunner-libre/gcc47.patch | 77 --------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 libre/xulrunner-libre/gcc47.patch (limited to 'libre') 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ý -# 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 -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#endif - - #include - #include - - #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 - #include -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#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 - #endif - #include - #ifdef ANDROID - #include - #else - #include - #endif -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#endif - - #include - - #include "base/basictypes.h" - #include "base/logging.h" - - namespace base { - - -- cgit v1.2.3-2-g168b From e37f740d95f8f2d9db25c5f24cea29deae14e107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 23 Jul 2012 03:55:05 -0300 Subject: iceweasel-libre-14.0.1.2-2: fixing some comments on PKGBUILD --- libre/iceweasel-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 23423e428..259413591 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -12,7 +12,7 @@ _pgo=false -# We're getting this from Debian Sid +# We're getting this from Debian Experimental _debname=iceweasel _debver=14.0.1 _debrel=2 -- cgit v1.2.3-2-g168b From fcd5a0c490ce3d5f0c171c974946b0f236627ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 23 Jul 2012 04:21:24 -0300 Subject: xulrunner-libre-14.0.1.2-1: updating Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 215 +++++++++++---------- 1 file changed, 116 insertions(+), 99 deletions(-) (limited to 'libre') 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 index 4da03a569..4a0507271 100644 --- 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 @@ -2,35 +2,20 @@ From: Mike Hommey Date: Tue, 5 Jun 2012 08:57:06 +0200 Subject: Bug 756390 - Make the "Reset Firefox" feature more generic ---- - browser/components/migration/content/migration.js | 15 ++++++++++----- - browser/components/migration/content/migration.xul | 2 +- - .../migration/src/BrowserProfileMigrators.manifest | 2 +- - .../components/migration/src/FirefoxProfileMigrator.js | 2 +- - browser/components/migration/src/ProfileMigrator.js | 4 ++++ - .../en-US/chrome/browser/migration/migration.dtd | 2 -- - .../en-US/chrome/browser/migration/migration.properties | 11 +++++------ - toolkit/content/aboutSupport.js | 8 ++++---- - toolkit/content/jar.mn | 2 +- - toolkit/content/resetProfile.js | 6 ++---- - toolkit/profile/nsIProfileMigrator.idl | 10 +++++++++- - toolkit/xre/nsAppRunner.cpp | 2 +- - 83 files changed, 394 insertions(+), 382 deletions(-) - 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; @@ -41,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 - +