diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-06-11 14:44:44 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-06-11 14:44:44 -0300 |
commit | d552afbbdc76f89dc83c6dcbeeaa81478ffd0e47 (patch) | |
tree | 561d498fe448b1bacb21ca6ff8cbc6fee5a3f751 /libre | |
parent | b1617c9b6e0460394b39b0e11bf41f22e77936a4 (diff) | |
parent | 6d006ae5a02b1276e0fe231c95a23465e126e759 (diff) |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre')
43 files changed, 1573 insertions, 446 deletions
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/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD new file mode 100644 index 000000000..77e0dfe94 --- /dev/null +++ b/libre/apache-ant/PKGBUILD @@ -0,0 +1,110 @@ +# 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.4 + +provides=("apache-ant-libre=$pkgver") +replaces=("apache-ant-libre") +conflicts=("apache-ant-libre") + +pkgrel=1.1 +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 + source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var + 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 + source "/etc/profile.d/jdk.sh" # Get the JAVA_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=('c474fa9d0c35a24037c23b6e476862c1' + 'bd63c881be406f515fc4d22635e8326a' + 'aaa615512cbe1ed7f3b62c1ff46802f8') diff --git a/libre/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh new file mode 100644 index 000000000..fdc04b2f8 --- /dev/null +++ b/libre/apache-ant/apache-ant.csh @@ -0,0 +1,2 @@ +#!/bin/csh +setenv ANT_HOME /opt/apache-ant 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/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD new file mode 100644 index 000000000..6fc5679e7 --- /dev/null +++ b/libre/blender-libre/PKGBUILD @@ -0,0 +1,121 @@ +# $Id$ +# Contributor: John Sowiak <john@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> + +# Apparently, the blender guys refuse to release source tarballs for +# intermediate releases that deal mainly with binaries but incorporate tiny +# minor changes from svn. Since I'm sick and tired of the urges of users that +# look for release numbers only, we make a messy PKGBUILD that can checkout svn +# release if necessary. + +_svn=true +_pkgname=blender +pkgname=blender-libre +true && pkgver=2.63a # Hack for svn +true && pkgrel=2 +epoch=4 +pkgdesc="A fully integrated 3D graphics creation suite without cuda-toolkit recommendation" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url="http://www.blender.org" +depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' + 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' + 'openimageio' 'libsndfile' 'jack') +makedepends=('cmake' 'boost' 'subversion') +replaces=("${_pkgname}") +conflicts=("${_pkgname}") +provides=("${_pkgname}=${pkgver}") +options=(!strip) +install=blender.install +if [[ $_svn = false ]]; then + source=(http://download.blender.org/source/$_pkgname-$pkgver.tar.gz) + md5sums=('31a60b3ce5466d965cb7e2648995e092') +else + source=(ffmpeg-0.11.patch) + md5sums=('168db32487e363e71fd4671e204afccf') +fi + +_svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" +_svnmod="blender" + +build() { +if [[ $_svn = true ]]; then + cd "$srcdir" + msg "Connecting to SVN server...." + + if [[ -d "$_svnmod/.svn" ]]; then + (cd "$_svnmod" && svn up ) + else + svn co "$_svntrunk" --config-dir ./ "$_svnmod" + fi + + msg "SVN checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_svnmod-build" + cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build" + cd "$srcdir/$_svnmod-build" +else + cd "$srcdir/$_pkgname-$pkgver" +fi + + patch -Np0 < "$srcdir"/ffmpeg-0.11.patch + sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h + sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c + + mkdir build + cd build + + [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD=OFF" + + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DWITH_INSTALL_PORTABLE=OFF \ + -DWITH_PYTHON_INSTALL=OFF \ + -DWITH_OPENCOLLADA=ON \ + -DOPENIMAGEIO_ROOT_DIR=/usr \ + -DWITH_GAMEENGINE=ON \ + -DWITH_JACK=ON \ + -DWITH_PLAYER=ON \ + -DWITH_BUILTIN_GLEW=OFF \ + -DWITH_CODEC_FFMPEG=ON \ + -DWITH_CODEC_SNDFILE=ON \ + -DWITH_CYCLES=ON \ + -DWITH_CYCLES_CUDA_BINARIES=OFF \ + -DWITH_FFTW3=ON \ + -DWITH_MOD_OCEANSIM=ON \ + -DPYTHON_VERSION=3.2 \ + -DPYTHON_LIBPATH=/usr/lib \ + -DPYTHON_LIBRARY=python3.2mu \ + -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \ + $ENABLESSE2 + + make $MAKEFLAGS + +# cp -rf "$srcdir"/${_pkgname}-$pkgver/release/plugins/* \ +# "$srcdir"/${_pkgname}-$pkgver/source/blender/blenpluginapi/ +# cd "$srcdir"/${_pkgname}-$pkgver/source/blender/blenpluginapi +# chmod 755 bmake + make +} + +package() { + if [[ $_svn = true ]]; then + cd "$srcdir/$_svnmod-build/build" + else + cd "$srcdir/$_pkgname-$pkgver/build" + fi + make DESTDIR="${pkgdir}" install + python -m compileall "${pkgdir}/usr/share/blender" + +# install plugins +# install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} +# cp "$srcdir"/${_pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ +# "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ +# cp "$srcdir"/${_pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ +# "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ +} diff --git a/libre/blender-libre/blender.install b/libre/blender-libre/blender.install new file mode 100644 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/ffmpeg-0.11.patch b/libre/blender-libre/ffmpeg-0.11.patch new file mode 100644 index 000000000..bc67052bf --- /dev/null +++ b/libre/blender-libre/ffmpeg-0.11.patch @@ -0,0 +1,444 @@ +Index: intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +=================================================================== +--- intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp (revision 47422) ++++ intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp (working copy) +@@ -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 +Index: intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp +=================================================================== +--- intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp (revision 47422) ++++ intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp (working copy) +@@ -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); +Index: intern/ffmpeg/ffmpeg_compat.h +=================================================================== +--- intern/ffmpeg/ffmpeg_compat.h (revision 47422) ++++ intern/ffmpeg/ffmpeg_compat.h (working copy) +@@ -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 +Index: source/blender/blenkernel/intern/writeffmpeg.c +=================================================================== +--- source/blender/blenkernel/intern/writeffmpeg.c (revision 47422) ++++ source/blender/blenkernel/intern/writeffmpeg.c (working copy) +@@ -42,6 +42,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> + +@@ -615,7 +616,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) { +@@ -657,11 +658,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; + +@@ -707,13 +718,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; +@@ -776,6 +788,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; + } + } +@@ -785,6 +798,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; + } + } +@@ -793,27 +807,26 @@ + 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; + } +Index: source/blender/imbuf/intern/anim_movie.c +=================================================================== +--- source/blender/imbuf/intern/anim_movie.c (revision 47422) ++++ source/blender/imbuf/intern/anim_movie.c (working copy) +@@ -445,7 +445,7 @@ + int i, videoStream; + + AVCodec *pCodec; +- AVFormatContext *pFormatCtx; ++ AVFormatContext *pFormatCtx = NULL; + AVCodecContext *pCodecCtx; + int frs_num; + double frs_den; +@@ -464,7 +464,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; + } + +@@ -998,7 +998,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, +Index: source/blender/imbuf/intern/indexer.c +=================================================================== +--- source/blender/imbuf/intern/indexer.c (revision 47422) ++++ source/blender/imbuf/intern/indexer.c (working copy) +@@ -531,13 +531,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"); +@@ -574,7 +567,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; + } +@@ -737,7 +735,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; + } +Index: source/blender/imbuf/intern/util.c +=================================================================== +--- source/blender/imbuf/intern/util.c (revision 47422) ++++ source/blender/imbuf/intern/util.c (working copy) +@@ -247,7 +247,7 @@ + + static int isffmpeg(const char *filename) + { +- AVFormatContext *pFormatCtx; ++ AVFormatContext *pFormatCtx = NULL; + unsigned int i; + int videoStream; + AVCodec *pCodec; +@@ -268,7 +268,7 @@ + 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; + } +Index: source/gameengine/VideoTexture/VideoFFmpeg.cpp +=================================================================== +--- source/gameengine/VideoTexture/VideoFFmpeg.cpp (revision 47422) ++++ source/gameengine/VideoTexture/VideoFFmpeg.cpp (working copy) +@@ -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,14 +582,12 @@ + { + // open camera source + AVInputFormat *inputFormat; +- AVFormatParameters formatParams; +- AVRational frameRate; ++ AVDictionary *formatParams = NULL; + char filename[28], rateStr[20]; + char *p; + + 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"); +@@ -623,7 +617,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) +@@ -637,20 +637,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; +@@ -665,6 +667,8 @@ + // no need to thread if the system has a single core + m_isThreaded = true; + } ++ ++ av_dict_free(&formatParams); + } + + // play video +Index: source/gameengine/VideoTexture/VideoFFmpeg.h +=================================================================== +--- source/gameengine/VideoTexture/VideoFFmpeg.h (revision 47422) ++++ source/gameengine/VideoTexture/VideoFFmpeg.h (working copy) +@@ -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/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 94d5390ab..3443dacb4 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 158070 2012-05-02 11:53:48Z tomegun $ +# $Id: PKGBUILD 160797 2012-06-06 10:14:15Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # 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> pkgname=filesystem -pkgver=2012.2 -pkgrel=5 +pkgver=2012.6 +pkgrel=2 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -17,8 +17,8 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc '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') + 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' + 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first') md5sums=('772fe869b921698cc3e6fde73c4ac85a' '6be47d893fd49b2e4a8c0e811b350861' '13753e4e0964f3652b0cc60a28528bdf' @@ -31,6 +31,7 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a' 'e5d8323a4dbee7a6d0d2a19cbf4b819f' '7bc65f234dfb6abf24e7c3b03e86f4ff' 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' 'd2dc4e39dbdea75b107f91789e3274ab' @@ -43,10 +44,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 +56,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 @@ -65,17 +67,15 @@ package() { install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf # 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 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/filesystem/os-release b/libre/filesystem/os-release new file mode 100644 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/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index c27cf61f9..b74958e3c 100644 --- 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/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 81b24e100..c2cec2e13 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,5 @@ # $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> @@ -6,7 +7,7 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.12.4 -pkgrel=1 +pkgrel=4 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64') url="http://hplipopensource.com" @@ -28,24 +29,39 @@ provides=("${_pkgname}=${pkgver}") options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('a063f76aa47edab55a3f31ff2558df07' + '2fe18f4091afb3dec200271dc7836128') 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|' 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 ./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 \ @@ -70,5 +86,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 --- 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/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD index 3c0b42b31..5f4db3101 100644 --- a/libre/iceape-i18n/PKGBUILD +++ b/libre/iceape-i18n/PKGBUILD @@ -10,8 +10,8 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceape -_debver=2.7.4 -_debrel=2 +_debver=2.7.5 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -21,7 +21,7 @@ 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.5 pkgver=${_debver}.${_debrel} pkgrel=1 @@ -57,25 +57,25 @@ 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=('03a75ce1325fc748d0943cd39659e8ca' + '9fc2070dc6db8d94f322cb5e27523ea4' + '6cb55fe51fca1de674ca32b10edc7c8b' + '138121b288c269aa418ca0c33eb65326' + '8fd47eed7c79fe29c74a81d9b4a4864a' + 'f253842c0a377e86c6c62f7db27db32d' + 'b93caebe5ceb08d2cde78fe40fff3c0c' + 'a36d0776b736609b1e72b8530cc9e755' + '9acd2d8e4fd39700aa99a21681403a72' + '60703c83180e8bb3abdcfbf26bf1289d' + 'dc708663d015830fb11e800f48d7492c' + '313e6a88a602e09b5f08d6ff8ccdc89a' + '31debae1dca6035695805d0de55c71f3' + '1f927d23eb1db49db3ffe2d3ee5e3da5' + '4b5e52235ce8a52d1144d5f6e45a069c' + '81d1a28544f9a6e92eafc48e57a45a35' + 'bb32f5938b885d2de225e4d8e2471d28' + '69d447db48244cc1546d0ce3447e8ab8' + '16d36a140dfbd9a001b28f4fcbc81df8' + '211bb03760a2eacf685f27f03e71da4d' + '83225015ad8f023ff0d9f9643c295e4c' + '67d3ec1632a4ed2aaf8e7a5df0284b1e') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 9099fb270..a2e3ed362 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -3,8 +3,8 @@ # We're getting this from Debian Sid _debname=iceape -_debver=2.7.4 -_debrel=2 +_debver=2.7.5 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}-2.0-lang.patch clrf.patch libre.patch) -md5sums=('aedc7546db1fdc50cc9c5f21a7ad6138' - '4519446d9f23885dd748a59dfbbfa0a4' +md5sums=('7a6e671485a75cd9495f346e0f8e4dcb' + '174e572e9d7b1b62a8e437f70fe771ba' '60ba9e8f2fafd20e41268af534a55ea7' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 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/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 100644 index 000000000..4da03a569 --- /dev/null +++ b/libre/iceweasel-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/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 85ede7409..28b96bcdd 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -3,6 +3,7 @@ # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> +# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> @@ -12,15 +13,15 @@ _pgo=false # We're getting this from Debian Sid _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/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -49,17 +50,19 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" libre.patch iceweasel-install-dir.patch region.properties - vendor.js) -md5sums=('b45f57bfe21b0e6db4f0683e794917cb' - '08aa0a949d9cbb26116490f7878a62fe' - 'd7ad1c025d2442427a06cc702906ef0d' + vendor.js + Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) +md5sums=('e440446bb92dc1c0311346c68024590b' + 'cb8bfb543002a5d78db7e8661f9f87ec' + 'a9848e41461776bc4bf8d2de824b1204' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - '64be2fab525189c285ee04495d628035' + 'bd7d322d89001e39b1f11972507063c7' 'e529742c0a425648087bc3ce537fe4c5' 'f1c76e7e244257856a386ca2de69bdf0' - '0d053487907de4376d67d8f499c5502b') + '0d053487907de4376d67d8f499c5502b' + '41ce105f0c1877fe22e0c0ec45e09565') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") @@ -78,6 +81,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 .. @@ -98,6 +104,10 @@ if [ $NOEXTRACT -eq 0 ]; then 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" + +# 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" + fi cd "$srcdir/mozilla-build" diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index ecebbb3ce..88a06741e 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,13 +1,13 @@ -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 +diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/browser/app/profile/firefox.js +--- mozilla-build.orig/browser/app/profile/firefox.js 2012-06-01 09:03:47.000000000 -0300 ++++ mozilla-build/browser/app/profile/firefox.js 2012-06-05 19:53:08.847012282 -0300 @@ -64,11 +64,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", ""); @@ -18,7 +18,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -80,7 +80,7 @@ +@@ -92,7 +92,7 @@ pref("extensions.autoDisableScopes", 15); // Dictionary download preference @@ -27,7 +27,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br // The minimum delay in seconds for the timer to fire. // default=2 minutes -@@ -200,7 +200,7 @@ +@@ -218,7 +218,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,7 +36,7 @@ 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 @@ +@@ -252,7 +252,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); @@ -45,7 +45,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br // 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 @@ +@@ -345,7 +345,7 @@ pref("browser.download.manager.resumeOnWakeDelay", 10000); // search engines URL @@ -54,7 +54,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); -@@ -563,7 +563,7 @@ +@@ -593,7 +593,7 @@ pref("accessibility.typeaheadfind.flashBar", 1); // plugin finder service url @@ -63,21 +63,9 @@ 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 +diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties +--- mozilla-build.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300 ++++ mozilla-build/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-05 20:07:51.593611484 -0300 @@ -1,8 +1,8 @@ # Default search engine -browser.search.defaultenginename=Google @@ -98,9 +86,9 @@ diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/regio # 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 +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> @@ -110,10 +98,10 @@ diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1 </p> <p> <abbr title="extended abbr text should show when mouse over"><abbr> 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> @@ -121,9 +109,9 @@ diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul + <browser type="content" src="http://www.duckduckgo.com/" 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 -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> @@ -132,16 +120,16 @@ diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/la + <browser type="content" src="http://www.duckduckgo.com/" 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-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/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,8 +143,8 @@ 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="); @@ -164,9 +152,9 @@ diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/x 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 +diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties +--- mozilla-build.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300 ++++ mozilla-build/mobile/locales/en-US/chrome/region.properties 2012-06-05 20:53:03.264432170 -0300 @@ -1,8 +1,8 @@ # Default search engine -browser.search.defaultenginename=Google @@ -187,9 +175,9 @@ diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties ice # 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 +diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.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. @@ -199,9 +187,9 @@ diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/m 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 @@ -219,15 +207,15 @@ diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region +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 @@ +diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/browser/locales/generic/profile/bookmarks.html.in +--- mozilla-build.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300 ++++ mozilla-build/browser/locales/generic/profile/bookmarks.html.in 2012-06-05 21:03:38.239300038 -0300 +@@ -11,13 +11,12 @@ <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/">Parabola GNU/Linux-libre</A> </DL><p> <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> <DL><p> @@ -240,3 +228,15 @@ diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region + <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</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-10 03:18:01.897259931 -0300 +@@ -143,7 +143,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/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 9c1223d07..550ad4b3f 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158148 2012-05-03 13:20:53Z andrea $ +# $Id: PKGBUILD 160829 2012-06-06 16:14:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,8 +6,8 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.8.3 -pkgrel=1.3 +pkgver=4.8.4 +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=('a1d6951b27c868c738a36dbd21702b658f3d6245' 'f41541371414dcbe5e76687835e648112b3ff364') pkgdesc='KDE File Manager & Web Browser' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index b031d3c90..0ddf606ec 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 159699 2012-05-26 07:40:36Z andrea $ +# $Id: PKGBUILD 160936 2012-06-07 06:38:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.8.3 -pkgrel=2.1 +pkgver=4.8.4 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit' - 'media-player-info' 'herqq') + 'media-player-info') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell') provides=("kdelibs=$pkgver") replaces=('kdelibs-experimental' 'kdelibs') @@ -25,9 +25,9 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar. 'kde-applications-menu.patch' 'use-pythondontwritebytecode.patch' 'khtml-fsdg.diff') -sha1sums=('50633efa4ea2a133e51bf55286ff754c46f2eae2' +sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'a1e35760d5b4e29471ad357c963a343c67200f32' + 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -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/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch index bab46a9a2..e221e939a 100644 --- 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..b221fbca7 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 158333 2012-05-03 17:21:20Z andrea $ +# $Id: PKGBUILD 160882 2012-06-06 16:17:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.8.3 -pkgrel=3.1 +pkgver=4.8.4 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -15,15 +15,10 @@ 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') + source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('b3926c5cd929cec209421c2f1cb8659cc1c82458') 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/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 0bda68d17..5558e73f4 100644 --- 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 160887 2012-06-06 16:17:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.8.3 +pkgver=4.8.4 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -19,7 +19,7 @@ replaces=('kdeutils-ark') conflicts=('kdeutils-ark') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('9ff1fff082f53f31d0d31f2570005ae551fd2164') +sha1sums=('1d0d311beb8beeee7f33a58baef7f95192eb69ac') build() { cd "${srcdir}" diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 72f4c464d..f60e4c99f 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154187 2012-03-24 08:44:42Z allan $ +# $Id: PKGBUILD 161268 2012-06-08 11:32:36Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> @@ -6,7 +6,7 @@ pkgname=linux-libre-api-headers _basekernel=3.3 -_sublevel=2 +_sublevel=8 pkgver=${_basekernel}.${_sublevel} pkgrel=1 pkgdesc="Kernel Libre headers sanitized for use in userspace" @@ -19,7 +19,7 @@ replaces=('linux-api-headers' 'kernel-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') + 'd561c637365f1f0fca29aca39f7a3903') build() { cd ${srcdir}/linux-${_basekernel} @@ -40,5 +40,5 @@ package() { rm -rf ${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-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 3593442f9..ac7ab36e8 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,9 +9,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=32 +_sublevel=34 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.31 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.32 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -32,9 +32,9 @@ 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' - '1fc88c19baf04fbb37385712ad9c4d57' - 'df7e69a7b238c6492b589cc2beb894d2' - '2ef390e115d6ae1c074c30fec9258442' + '627ea698f9e8613f5d239ac2e6622c4e' + '9cfcf3807201ce44aa720571232a10ce' + '8bb5c5aa217202c3ac3798ba7798e07d' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - 'bacdceaf5ce186cfe69dffc89cd246a0') + '9c4fed22ad8ea99a54d20c22a63ad3d7') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 7094b2731..83bab0f8c 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -4998,7 +4998,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 diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index f7cd1263b..fa7be5e5b 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -4739,7 +4739,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 diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 6cd9761a7..55ed9e496 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.32-1-LIBRE-LTS +KERNEL_VERSION=3.0.34-1-LIBRE-LTS post_install () { # updating module dependencies @@ -28,7 +28,7 @@ post_install () { post_upgrade() { pacman -Q grub &>/dev/null hasgrub=$? - pacman -Q grub2 &>/dev/null + pacman -Q grub2-common &>/dev/null hasgrub2=$? pacman -Q lilo &>/dev/null haslilo=$? diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ae3f19ae1..4f10a211a 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,18 +12,17 @@ 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=6 -#pkgver=${_basekernel}.${_sublevel} -pkgver=${_basekernel} -_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver -pkgrel=1.2 +_sublevel=2 +pkgver=${_basekernel}.${_sublevel} +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +pkgrel=1 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 @@ -35,16 +34,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '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' + 'ea827952923c8a926c0831ad3f124190' + '669c3f9d5c6a2109bad8e511287826c3' + '454231e14419e56a5281eb7bc6fde83e' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - 'de092ff42e61e88a67f50c351c2ad7c0') + 'f70a4bf0ee00d8be680cfbd65459836d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 0bea26739..a6e1a6310 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -411,6 +411,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 @@ -5177,7 +5178,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 # diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 8a4734dac..9f3698ac2 100644 --- 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.4.1-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -389,6 +389,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 @@ -4949,7 +4950,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 # diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 6a2a2795a..584f0f645 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.0-1.2-LIBRE +KERNEL_VERSION=3.4.2-1-LIBRE post_install () { # updating module dependencies diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD index 564ca267d..3a5654396 100644 --- a/libre/luxrays-libre/PKGBUILD +++ b/libre/luxrays-libre/PKGBUILD @@ -3,12 +3,12 @@ # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> _pkgname=luxrays pkgname=luxrays-libre -pkgver=1.0rc1 -_pkgver=396d39b06aa6 +pkgver=1.0rc2 +_pkgver=8707be9e6dc9 pkgrel=1 epoch=0 pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.luxrender.net/" license=('GPL') depends=('freeimage' 'freeglut' 'glew') @@ -17,7 +17,7 @@ replaces=('luxrays') conflicts=('luxrays') provides=("luxrays=$pkgver") source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('a96ac693ec2900d8d1b209f88edd7e94') +md5sums=('b4f31563a8235a2791ab9df58be43adb') build() { cd "$srcdir/luxrender-$_pkgname-$_pkgver" diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index f4684ee7f..c802e1200 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -4,11 +4,11 @@ # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> pkgname=luxrender-libre -pkgver=1.0rc1 -_pkgver=08ae99830f8e +pkgver=1.0rc2 +_pkgver=008805644181 pkgrel=1 -pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenGL)" -arch=('i686' 'x86_64') +pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)" +arch=('i686' 'x86_64' 'mips64el') url="http://www.luxrender.net/" license=('GPL') depends=('boost-libs' 'freeimage' 'openexr') @@ -19,7 +19,7 @@ replaces=('luxrender') conflicts=('luxrender') provides=("luxrender=$pkgver") source=(https://bitbucket.org/luxrender/lux/get/"$_pkgver".tar.bz2) -md5sums=('738616b55ac58c98de431b98f90a05fb') +md5sums=('1922ccce6f70e7d707b340e2415875cd') build() { cd "$srcdir"/luxrender-lux-$_pkgver 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..649cb962d 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,5 @@ package() { sort -u )) } -md5sums=('c4ecf01611d55df03b5e4412dca4e70d') + +md5sums=('5e50a4ec73267a732d153c1079e9b021') |