Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/nbd/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD

11 files changed, 497 insertions, 108 deletions

diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
new file mode 100644
index 000000000..b6b429442
--- /dev/null
+++ b/libre/apache-ant/PKGBUILD
@@ -0,0 +1,108 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
+# Contributor: Andrew Wright <andreww@photism.org>
+
+pkgname=apache-ant
+pkgver=1.8.2
+
+provides=("apache-ant-libre=$pkgver")
+replaces=("apache-ant-libre")
+conflicts=("apache-ant-libre")
+
+pkgrel=4.2
+pkgdesc="A Java-based build tool"
+arch=('any')
+license=('Apache')
+url="http://ant.apache.org/"
+_mirror=http://archive.apache.org/dist
+source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
+        ${pkgname}.sh ${pkgname}.csh)
+depends=('java-environment')
+
+# This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
+declare -A _opts
+_opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar'
+_opts[xalan-java]='<junitreport> task;/usr/share/java/xalan.jar'
+_opts[antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
+#_opts[java-bsf]='<script> task;/usr/share/java/bsf.jar'
+#_opts[groovy]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/groovy.jar'
+_opts[java-asm2]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/asm-2.jar::asm.jar /usr/share/java/asm-util-2.jar::asm-util.jar'
+#_opts[netrexx]='<netrexx> task, Rexx with <script> task;/usr/share/java/netrexx.jar'
+_opts[rhino]='Javascript with <script> task;/usr/share/java/js.jar'
+_opts[jython]='Python with <script> task;/opt/jython/jython.jar'
+#_opts[jacl]='TCL with <script> task;/usr/share/java/jacl.jar'
+#_opts[tcljava]='TCL with <script> task;/usr/share/java/tcljava.jar'
+_opts[beanshell>=1.3]='BeanShell with <script> task;/usr/share/java/bsh.jar::beanshell.jar'
+#_opts[jruby]='Ruby with <script> task;/usr/share/java/jruby.jar'
+#_opts[judo]='Judoscript with <script> task;/usr/share/java/judo.jar'
+_opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logging/commons-logging.jar'
+#_opts[java-log4j]='Log4jListener;/usr/share/java/log4j.jar'
+#_opts[java-commons-net>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
+#_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
+#_opts[java-mail]='<mimemail> task, mime encoding with <mail>;/usr/share/java/mail.jar'
+#_opts[java-activation]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
+#_opts[jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
+#_opts[java-xmlcommons-resolver>=1.1beta]="external files for 'xmlcatalog' datatype;/usr/share/java/resolver.jar"
+#_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
+#_opts[java-advanced-imaging]='<image> task/usr/share/java/jai/*.jar'
+
+for pkg in "${!_opts[@]}"; do
+  optdepends+=("$pkg: ${_opts[$pkg]%;*}")
+  makedepends+=("$pkg")
+done
+
+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}
+  # Symlink to external optional libraries
+  for jar in ${_opts[@]#*;}; do
+    ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}`
+  done
+  # Build
+  sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}-bin
+  source "${srcdir}"/${pkgname}.sh   # Get the ANT_HOME env var
+
+  ## Install profile.d script
+  install -d "${pkgdir}"/etc/profile.d
+  install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
+
+  ## Install the main distribution
+  install -d "${pkgdir}"/${ANT_HOME}
+  cp -Rp * "${pkgdir}"/${ANT_HOME}
+
+  ## Fix the distribution
+  # Remove Windows .bat/.cmd files
+  rm -f "${pkgdir}"/${ANT_HOME}/bin/*.{bat,cmd}
+  # Fix python2 path
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py
+  # Symlink to external optional libraries
+  for jar in ${_opts[@]#*;}; do
+    ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar/*::}`
+  done
+
+  ## Symlink the /opt distribution to the normal places
+  install -d "${pkgdir}"/usr/bin
+  install -d "${pkgdir}"/usr/share/doc/${pkgname}
+  install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+
+  cd "${pkgdir}"/${ANT_HOME}
+  for prog in bin/*; do
+      ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
+  done
+  ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname}
+  ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html
+  ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname}
+}
+
+md5sums=('0d9e108afcd15b820150b8085c96d2b1'
+         'bd63c881be406f515fc4d22635e8326a'
+         '298e8ba2e99ccda7706113ea37e030f2')
diff --git a/libre/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh
new file mode 100644
index 000000000..490a17b65
--- /dev/null
+++ b/libre/apache-ant/apache-ant.csh
@@ -0,0 +1,3 @@
+#!/bin/csh
+setenv ANT_HOME /usr/share/java/apache-ant
+setenv PATH ${PATH}:${ANT_HOME}/bin
diff --git a/libre/apache-ant/apache-ant.sh b/libre/apache-ant/apache-ant.sh
new file mode 100644
index 000000000..6e4809da5
--- /dev/null
+++ b/libre/apache-ant/apache-ant.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+export ANT_HOME=/opt/apache-ant
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index d77f392b6..3443dacb4 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160716 2012-06-04 15:02:22Z dreisner $
+# $Id: PKGBUILD 160797 2012-06-06 10:14:15Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgname=filesystem
 pkgver=2012.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 8cef64bb6..f880b6496 100644
--- 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]
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index b03b8196b..8e03cb882 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,12 +9,12 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=12.0
-_debrel=7
+_debver=13.0
+_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=(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 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)
 
 pkgbase=iceweasel-i18n
 pkgname=($(for lang in ${_langpacks[@]}
@@ -56,87 +56,87 @@ 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=('e35b6b08fb314569174a12fb5d289f21'
+         'f7b4e4e93fc8a34b38af201d3dc5665d'
+         '16b41103c5ae2325884d266a4fa6ef2e'
+         '86829f63977541a6f8b241b352891fc8'
+         '442b5518d9e91a577de05e5e7bd4c1a3'
+         '771de4f956802cd2199e9a153ad7e93b'
+         '55612034c6b9aed03268f9387f6af846'
+         '00a47e3c42377a060d3b73a015a53615'
+         '10b1bd554a5390b15e441ee631663052'
+         '54780d957f68d12c1a22a014b099f504'
+         'dcdbb703a40aec783f62a994765a6298'
+         'eddaa79e00457f6a8ecab407fac979b1'
+         '49b6f4928bc1d0411368809ba47580b3'
+         'd0570b0084e5ec860626887e08ccdd90'
+         'a19c12048002e057afc3d1ca5bae4ad9'
+         '0a492ec08fa304b4bf6d83a65b549ff9'
+         '76f67c9ee46feca9d18d2bb30014816f'
+         'c3d9f562c28598307c740e4d4dd7348e'
+         '7567922156989828cd5c0e28a315e195'
+         'df91ab90a3e1fef34f5848a9f6444468'
+         '7d8e45e6e3da8b7d4a1cf94548583262'
+         'a661b6a102c5d98de9649d86cab880e0'
+         '51695205bfdddf982bb746cf4468ea1b'
+         '19de09fc98cde75bfa88c5274eff7cae'
+         'a59ef12c791749a6eca60ee001617751'
+         '53cbe9dfb8b124d579fcabaf8dcfafce'
+         '44de34e679070df84e74dee75c70c544'
+         'ee98508a21f6ff480f65924c1069965d'
+         '9827926ba6f4bba2858410b998fcb05b'
+         '0833c07b595ce249a384b1dda8f34963'
+         '0f3f0c3cf0813e91f570141b7e0212a4'
+         'f6fd9346dc9a0c16058ad765a808809b'
+         '8284e350944633e38c86d3ce6b30a23e'
+         'f67a900d496426c87478ad9bbc6ebbb0'
+         '3d67d29fcf015a4726a3b63c3e56efa6'
+         'a4dd7eecd30aa8e5675239ecb2aac643'
+         '17e14278b65190304b174fe2cb7f0ba7'
+         '7919d3e268fbe9a9385ae61da767972a'
+         '8ca4ea94c9433fa93270d6942f7bbdca'
+         '163c71e0d58891e4e4812c6f410b34e3'
+         '3e343f4039ba87817cbe4209f0828da2'
+         'c0993d2d4409635d5a5cc55a5dc22afa'
+         '9e9ebb4b90e64dc3bda9912ec68f5919'
+         'bf8f1b84ea8dbea3b35bef433cf0f513'
+         'f3c00bf1812f3f2ed940372100ef6baa'
+         'b8789e2547a5c507297fd75d10c61e47'
+         '8cafb2f5804a985f521d0fd8c4ac38e6'
+         'e74a59d6927b4f56804a412a70354be2'
+         '4d680519a811201ebf57944201c92522'
+         'fe24a7f2620b8743604784bc56600b0f'
+         'dfdb2c6b135ab98e2652c19136496c12'
+         '504fdcaf8730829d5c6d48b5fa8c89a8'
+         '459400531f8414c5b527a98cf5c854cd'
+         'b24b7067ba0a293f12e23a80998de2b8'
+         '2ffebdb22377309bacfa4f35e78e53ee'
+         '7f32199165b0aeca6dffb43ddd4e7934'
+         '9cddba25c3042a29d43e7d986ae9a2fe'
+         'b10c6b5ba44de100402a451fb0f87a0b'
+         '7ff013fd4b1eb6343d4d94c80697b0b8'
+         '24987ec9124fe40503d6218943f7f2c1'
+         '88ccdd6115de5e0e121aba11d8881f9d'
+         'f53d6573ab123cc740edff0a0f051214'
+         'bb8ebd84fbb6e85716633730986f8afb'
+         '308ab080c1a1978916d50277d7b1e170'
+         '6954762d9100f3f59f83a04833c6fc8b'
+         '11cbdb81af5cb5691b362a6fbb54522e'
+         '06df7af5c296be68853fbcaf6c11d354'
+         '321f8f412ad21213ee4bc9e5831e6061'
+         '4f7177bab3fb5e3f31f954e73403803f'
+         '6edd087d6c667739687426922961cdcf'
+         'b3d74b6ceab4befa4c42d245cbdfdbe4'
+         '3f6df88d121bd305740014e1677328f8'
+         'df58cc660670b906925aa22a5136aeaf'
+         '590727cebf9bdb599358b4b2d3ed40f9'
+         'f4d0f0184e77f3ea9585296b820de2cd'
+         'd074f5f4167585fc62ae802b7929669e'
+         'd5810f44cc19b5629183da39b234f92c'
+         '777d7caca99c317c3e71f464f53983d6'
+         'f9cfe429a139e450c3bb859d2224441c'
+         '468a90cc6648bd4ed7b39afc3e3dc253'
+         'de53d77cc1cd0126de3f00ddc24afe08'
+         'dddedd2b83b3083ce01ae25824a2eaf5'
+         '1e3122decb28bf37b630f84b05e02be8'
+         '9666c6e23b39f07d3b0b286e7514e3fd')
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index f4684ee7f..26395f4f3 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -6,8 +6,8 @@
 pkgname=luxrender-libre
 pkgver=1.0rc1
 _pkgver=08ae99830f8e
-pkgrel=1
-pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenGL)"
+pkgrel=1.1
+pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
 license=('GPL')
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index be42680ad..eb120c0ad 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=texlive-core-libre
 _pkgname=texlive-core
 pkgver=2011.24722
 _revnr=${pkgver#2011.}
-pkgrel=1
+pkgrel=1.1
 pkgdesc="TeX Live core distribution"
 license=('GPL')
 arch=(any)
@@ -21,7 +21,7 @@ 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"
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 100644
index 000000000..4da03a569
--- /dev/null
+++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -0,0 +1,271 @@
+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

+

+---

+ 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

+--- a/browser/components/migration/content/migration.js

++++ b/browser/components/migration/content/migration.js

+@@ -314,7 +314,7 @@ var MigrationWizard = {

+     }

+ 

+     var bundle = 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 = {

+       case "chrome":

+         source = "sourceNameChrome";

+         break;

+-      case "firefox":

+-        source = "sourceNameFirefox";

++      case "self":

++        source = "brand";

+         break;

+     }

+ 

+@@ -357,8 +357,13 @@ var MigrationWizard = {

+     var oldHomePageURL = this._migrator.sourceHomePageURL;

+ 

+     if (oldHomePageURL && source) {

+-      var bundle2 = document.getElementById("bundle");

+-      var appName = bundle2.getString(source);

++      var appName;

++      if (source == "brand") {

++        appName = bundle.GetStringFromName("brandFullName");

++      } else {

++        var bundle2 = document.getElementById("bundle");

++        appName = bundle2.getString(source);

++      }

+       var oldHomePageLabel = bundle.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

+--- a/browser/components/migration/content/migration.xul

++++ b/browser/components/migration/content/migration.xul

+@@ -76,7 +76,7 @@

+ #endif

+ #endif

+       <radio id="chrome"    label="&importFromChrome.label;"    accesskey="&importFromChrome.accesskey;"/>

+-      <radio id="firefox"   label="&importFromFirefox.label;"   accesskey="&importFromFirefox.accesskey;"/>

++      <radio id="self"      hidden="true"/>

+       <radio id="fromfile"  label="&importFromHTMLFile.label;"  accesskey="&importFromHTMLFile.accesskey;" hidden="true"/>

+       <radio id="nothing"   label="&importFromNothing.label;"   accesskey="&importFromNothing.accesskey;" hidden="true"/>

+     </radiogroup>

+diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest

+index f49e481..e490ddf 100644

+--- a/browser/components/migration/src/BrowserProfileMigrators.manifest

++++ b/browser/components/migration/src/BrowserProfileMigrators.manifest

+@@ -3,4 +3,4 @@ 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}

+diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js

+index 7b4a6e4..add5bc4 100644

+--- a/browser/components/migration/src/FirefoxProfileMigrator.js

++++ b/browser/components/migration/src/FirefoxProfileMigrator.js

+@@ -448,7 +448,7 @@ FirefoxProfileMigrator.prototype = {

+   ]),

+ 

+   classDescription: "Firefox Profile Migrator",

+-  contractID: "@mozilla.org/profile/migrator;1?app=browser&type=firefox",

++  contractID: "@mozilla.org/profile/migrator;1?app=browser&type=self",

+   classID: Components.ID("{91185366-ba97-4438-acba-48deaca63386}")

+ };

+ 

+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js

+index ea66675..fe4df10 100644

+--- a/browser/components/migration/src/ProfileMigrator.js

++++ b/browser/components/migration/src/ProfileMigrator.js

+@@ -51,6 +51,10 @@ ProfileMigrator.prototype = {

+                            params);

+   },

+ 

++  canMigrate: function PM__canMigrate(aMigratorKey) {

++    return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;

++  },

++

+   _toCString: function PM__toCString(aStr) {

+     let cstr = Cc["@mozilla.org/supports-cstring;1"].

+                createInstance(Ci.nsISupportsCString);

+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd

+index 86e9d0b..8df7864 100644

+--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd

++++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd

+@@ -13,8 +13,6 @@

+ <!ENTITY importFromSafari.accesskey     "S">

+ <!ENTITY importFromChrome.label         "Chrome">

+ <!ENTITY importFromChrome.accesskey     "C">

+-<!ENTITY importFromFirefox.label        "Firefox">

+-<!ENTITY importFromFirefox.accesskey    "X">

+ <!ENTITY importFromHTMLFile.label       "From an HTML File">

+ <!ENTITY importFromHTMLFile.accesskey   "F">

+ 

+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties

+index 495ed78..0272654 100644

+--- a/browser/locales/en-US/chrome/browser/migration/migration.properties

++++ b/browser/locales/en-US/chrome/browser/migration/migration.properties

+@@ -4,7 +4,6 @@ profileName_format=%S %S

+ sourceNameIE=Internet Explorer

+ sourceNameSafari=Safari

+ sourceNameChrome=Google Chrome

+-sourceNameFirefox=Mozilla Firefox

+ 

+ importedBookmarksFolder=From %S

+ importedSearchURLsFolder=Keyword Searches (From %S)

+@@ -21,27 +20,27 @@ importedSafariBookmarks=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=Browsing History

++4_self=Browsing History

+ 

+ 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

+ 32_chrome=Bookmarks

+-32_firefox=Bookmarks

++32_self=Bookmarks

+ 

+ 64_ie=Other Data

+ 64_safari=Other Data

+diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js

+index c86d80c..ff1ccfe 100644

+--- a/toolkit/content/aboutSupport.js

++++ b/toolkit/content/aboutSupport.js

+@@ -608,13 +608,13 @@ function populateResetBox() {

+                          .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__";

+-

+   // Only show the reset box for the default profile if the self-migrator used for reset exists.

+   try {

+     if (!currentProfileDir.equals(profileService.selectedProfile.rootDir) ||

+-        !("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc))

++        !("@mozilla.org/toolkit/profile-migrator;1" in Cc))

++      return;

++    let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);

++    if (!("canMigrate" in pm) || !pm.canMigrate("self"))

+       return;

+     document.getElementById("reset-box").style.visibility = "visible";

+   } catch (e) {

+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

+index 6f0d2d6..da7342b 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/treeUtils.js                (treeUtils.js)

+ *+ content/global/viewZoomOverlay.js          (viewZoomOverlay.js)

+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js

+index 975a9ed..d8e46b1 100644

+--- a/toolkit/content/resetProfile.js

++++ b/toolkit/content/resetProfile.js

+@@ -6,12 +6,10 @@ Components.utils.import("resource://gre/modules/Services.jsm");

+ 

+ // based on onImportItemsPageShow from migration.js

+ function onResetProfileLoad() {

+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

+   const MAX_MIGRATED_TYPES = 16;

+ 

+   var migratedItems = document.getElementById("migratedItems");

+-  var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +

++  var bundle = Services.strings.createBundle("chrome://browser" +

+                                              "/locale/migration/migration.properties");

+ 

+   // Loop over possible data to migrate to give the user a list of what will be preserved. This

+@@ -21,7 +19,7 @@ function onResetProfileLoad() {

+     var itemID = Math.pow(2, i);

+     try {

+       var checkbox = document.createElement("label");

+-      checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_" + MOZ_APP_NAME));

++      checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_self"));

+       migratedItems.appendChild(checkbox);

+     } catch (x) {

+       // Catch exceptions when the string for a data type doesn't exist because it's not migrated

+diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl

+index e941336..5b264af 100644

+--- a/toolkit/profile/nsIProfileMigrator.idl

++++ b/toolkit/profile/nsIProfileMigrator.idl

+@@ -69,7 +69,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 

+ {

+   /**

+@@ -92,6 +92,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 32eef5c..dbe1580 100644

+--- a/toolkit/xre/nsAppRunner.cpp

++++ b/toolkit/xre/nsAppRunner.cpp

+@@ -3561,7 +3561,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)

+             if (gDoProfileReset) {

+               // Automatically migrate from the current application if we just

+               // reset the profile.

+-              aKey = MOZ_APP_NAME;

++              aKey = "self";

+               pm->Migrate(&dirProvider, aKey);

+               // Set the new profile as the default after migration.

+               rv = SetCurrentProfileAsDefault(profileSvc, profD);

diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index af4b45aae..001eb5f48 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $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>
 
@@ -6,8 +6,8 @@
 
 # We're getting this from Debian Sid
 _debname=iceweasel
-_debver=12.0
-_debrel=3
+_debver=13.0
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -26,17 +26,17 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_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=('e440446bb92dc1c0311346c68024590b'
+         'cb8bfb543002a5d78db7e8661f9f87ec'
+         'a9848e41461776bc4bf8d2de824b1204'
          'f2f4f4a573f549e8b494e33b3ad226bc'
          '27271ce647a83906ef7a24605e840d61'
-         '5a8563f8fda7ad30405c86764267a19c')
+         '41ce105f0c1877fe22e0c0ec45e09565')
 
 dpkg-source() {
   # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
@@ -50,6 +50,9 @@ dpkg-source() {
 # 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 ..
@@ -68,12 +71,14 @@ if [ $NOEXTRACT -eq 0 ]; then
 
   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}"
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index cbf5b9c60..84a6f47fa 100644
--- 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,4 @@ package() {
         sort -u
         ))
 }
-md5sums=('c4ecf01611d55df03b5e4412dca4e70d')
+md5sums=('0025025765e754425e381e8e2d136740')