From 8b0311edd629ecf9c3749271fe850dc7e5586e70 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 26 Jun 2013 02:57:00 -0300 Subject: remove useless package --- pcr/libav-builder/PKGBUILD | 48 ---------------------------------------------- pcr/libav/PKGBUILD | 39 ++++++++++++++++--------------------- 2 files changed, 17 insertions(+), 70 deletions(-) delete mode 100644 pcr/libav-builder/PKGBUILD diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD deleted file mode 100644 index 5f7168f86..000000000 --- a/pcr/libav-builder/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Maintainer (Parabola): Márcio Silva - -static=false -pkgbase=libav -if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then - pkgname=libav-static-builder -elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then - pkgname=libav-builder -fi -pkgflag=builder -pkgver=9.3 -pkgrel=1 -pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)" -arch=any -url="http://$pkgbase.org/" -license=GPL -depends=${pkgname%-$pkgflag}=$pkgver -conflicts=( - ffmpeg - ffmpeg-static -) -if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then - conflicts+=( - ${pkgname%-static-$pkgflag} - ) -elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then - conflicts+=( - ${pkgname%-$pkgflag}-static - ) -fi - -package() { - install -m755 -d $pkgdir/usr/{include,lib{,/pkgconfig}} - include_list=$(ls /opt/${pkgname%-$pkgflag}/include) - for i in $include_list; do - ln -s /opt/${pkgname%-$pkgflag}/include/$i $pkgdir/usr/include - done - lib_list=$(ls /opt/${pkgname%-$pkgflag}/lib | grep lib) - for l in $lib_list; do - ln -s /opt/${pkgname%-$pkgflag}/lib/$l $pkgdir/usr/lib - done - pkgconfig_list=$(ls /opt/${pkgname%-$pkgflag}/lib/pkgconfig) - for c in $pkgconfig_list; do - ln -s /opt/${pkgname%-$pkgflag}/lib/pkgconfig/$c $pkgdir/usr/lib/pkgconfig - done -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD index 05dd756c0..23f03db2d 100644 --- a/pcr/libav/PKGBUILD +++ b/pcr/libav/PKGBUILD @@ -1,11 +1,7 @@ -# $Id$ -# Maintainer : Ionut Biru -# Contributor: Tom Newsom -# Contributor: Paul Mattal # Maintainer (Parabola): Márcio Silva static=false -pkgbase=libav +_pkgname=libav if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then pkgname=libav-static pkgflag=-static @@ -13,7 +9,7 @@ if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then pkgname=libav fi -pkgver=9.3 +pkgver=9.7 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc" arch=( @@ -21,10 +17,8 @@ arch=( x86_64 mips64el ) -url="http://$pkgbase.org/" -license=( - GPL -) +url=http://$_pkgname.org/ +license=GPL3 depends=( alsa-lib bzip2 @@ -37,7 +31,8 @@ depends=( libvorbis libvpx opencore-amr - openjpeg + #openjpeg + opus rtmpdump schroedinger sdl @@ -50,30 +45,29 @@ makedepends=( yasm libvdpau ) -source=( - http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz -) -sha512sums=( - de3aaa571fed67d22ec2a0c53599af56684afa38445cf67fd09d26c23eeded5a184d045f472d414815d17783b421f937fd3d9565637e20f2050aaaf0081164fe -) +source=http://$_pkgname.org/releases/$_pkgname-$pkgver.tar.gz +sha512sums=6a446e8dceb9ee4f1fb7a7d68d254086990bbcab5b1014598b21c75e0add22dab47c30a95bc3129835cc40a8d32de9c61fb267b2fa2aa9353dbbfc4b716767e4 build() { - cd $pkgbase-$pkgver + cd $_pkgname-$pkgver [[ $static == false ]] && sttcv=disable || sttcv=enable - ./configure\ + setarch $CARCH ./configure\ --prefix=/opt/$pkgname\ --disable-debug\ --$sttcv-static\ --enable-avresample\ + --enable-avserver\ + --enable-dxva2\ --enable-gpl\ --enable-libfreetype\ --enable-libgsm\ --enable-libmp3lame\ --enable-libopencore_amrnb\ --enable-libopencore_amrwb\ - --enable-libopenjpeg\ + --disable-libopenjpeg\ + --enable-libopus\ --enable-libpulse\ --enable-librtmp\ --enable-libschroedinger\ @@ -87,14 +81,13 @@ build() { --enable-shared\ --enable-version3\ --enable-x11grab - setarch $CARCH make setarch $CARCH make tools/qt-faststart setarch $CARCH make doc/av{conv,play,server}.1 } package() { - cd $pkgbase-$pkgver + cd $_pkgname-$pkgver setarch $CARCH make DESTDIR=$pkgdir install install-man install -m755 -d $pkgdir/etc/ld.so.conf.d install -m755 -d $pkgdir/usr/bin @@ -103,10 +96,12 @@ package() { ln -s /opt/$pkgname/bin/avconv $pkgdir/usr/bin/avconv$pkgflag ln -s /opt/$pkgname/bin/avplay $pkgdir/usr/bin/avplay$pkgflag ln -s /opt/$pkgname/bin/avprobe $pkgdir/usr/bin/avprobe$pkgflag + ln -s /opt/$pkgname/bin/avserver $pkgdir/usr/bin/avserver$pkgflag ln -s /opt/$pkgname/bin/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname ln -s /opt/$pkgname/share/man/man1/avconv.1 $pkgdir/usr/share/man/man1/avconv$pkgflag.1 ln -s /opt/$pkgname/share/man/man1/avplay.1 $pkgdir/usr/share/man/man1/avplay$pkgflag.1 ln -s /opt/$pkgname/share/man/man1/avprobe.1 $pkgdir/usr/share/man/man1/avprobe$pkgflag.1 + ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1 echo /opt/libav$pkgflag/lib > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf } -- cgit v1.2.3 From 405805b7540fb87f3bae69748bb45d09ef080c2e Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 26 Jun 2013 02:57:46 -0300 Subject: remove ffmpeg-static package --- pcr/ffmpeg-static/PKGBUILD | 61 ---------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 pcr/ffmpeg-static/PKGBUILD diff --git a/pcr/ffmpeg-static/PKGBUILD b/pcr/ffmpeg-static/PKGBUILD deleted file mode 100644 index 1e5634fb6..000000000 --- a/pcr/ffmpeg-static/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id$ -# Maintainer : Ionut Biru -# Contributor: Tom Newsom -# Contributor: Paul Mattal -# Maintainer (Parabola): Márcio Silva - -pkgname=ffmpeg-static -pkgver=1.0 -pkgrel=2 -epoch=1 -pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library' -arch=(i686 x86_64 mips64el) -url=http://${pkgname%-static}.org/ -license=(GPL) -depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib) -makedepends=(yasm libvdpau) -provides=(${pkgname%-static}) -conflicts=(${pkgname%-static}) -source=(http://${pkgname%-static}.org/releases/${pkgname%-static}-$pkgver.tar.bz2) -md5sums=(3ed526cea20c1bffb5a37f7730f710bd) - -build() { - cd ${pkgname%-static}-$pkgver - - ./configure \ - --prefix=/usr \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-libgsm \ - --enable-libspeex \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libschroedinger \ - --enable-libopenjpeg \ - --enable-librtmp \ - --enable-libpulse \ - --enable-libv4l2 \ - --enable-gpl \ - --enable-version3 \ - --enable-runtime-cpudetect \ - --disable-debug \ - --enable-static - make - make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 -} - -package() { - cd ${pkgname%-static}-$pkgver - make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" -} - -# vim:set ts=2 sw=2 et: -- cgit v1.2.3 From fce1580b63172a287542e466ccae368960a9b0e0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 26 Jun 2013 04:05:55 -0300 Subject: grub-2.00.5043-1: updating version, build latest bzr snapshot, fixes gcc issues on efi boot --- libre/grub/PKGBUILD | 84 ++++++++----------- libre/grub/grub_bzr_export.sh | 113 -------------------------- libre/grub/parabola_grub_mkconfig_fixes.patch | 12 +-- 3 files changed, 39 insertions(+), 170 deletions(-) delete mode 100644 libre/grub/grub_bzr_export.sh diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 21220a209..59c7dbe0a 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -3,23 +3,25 @@ # Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva -## grub-extras lua and gpxe fail to build +_GRUB_BZR_REV="5043" + +## grub-extras lua and gpxe fail to build with grub bzr rev 5043 [[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" [[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" -pkgver=2.00 +pkgver=2.00.${_GRUB_BZR_REV} pkgrel=1 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') -backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') +backup=('etc/default/grub' 'etc/grub.d/40_custom') install="${pkgname}.install" options=('!makeflags') -conflicts=('grub-legacy' 'grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") +conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy') replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") @@ -28,51 +30,42 @@ makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' 'fuse: For grub-mount usage' - 'dosfstools: For EFI support' + 'dosfstools: For grub-mkrescue FAT FS and EFI support' 'efibootmgr: For grub-install EFI support' 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' 'mtools: For grub-mkrescue FAT FS support') -source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" - '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch' - 'grub-2.00-fix-docs.patch' +# source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" +source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}" 'parabola_grub_mkconfig_fixes.patch' '60_memtest86+' - 'grub.default' - 'grub.cfg') + 'grub.default') for _DIR_ in 915resolution ntldr-img ; do - source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/") + source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=") done -source+=("grub-extras-lua::bzr+bzr://bzr.savannah.gnu.org/grub-extras/lua/#revision=24" - "grub-extras-gpxe::bzr+bzr://bzr.savannah.gnu.org/grub-extras/gpxe/#revision=13") - -sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' - 'b68565bc155094bade390c257c3f31bc55ae244b' - '1dc08391bb13f8e23faa21a76cc4cc4b25467702' - 'c631ec04d458c60a3ceffe60d2d1806d54554d9c' +# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' +sha1sums=('SKIP' + '513172d91d1a2e2cda7c0a744c766d5868cb28bf' '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559' '06b926320cb2add6c157d59d46e553b89dd3aa03' - '662ec5f0d44122b66666a788387ec69389295b2c' - 'SKIP' - 'SKIP' 'SKIP' 'SKIP') _build_grub-common_and_bios() { ## Copy the source for building the common/bios package - cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-bios-${pkgver}" - cd "${srcdir}/grub-bios-${pkgver}/" + cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios" + cd "${srcdir}/grub-${pkgver}-bios/" ## Add the grub-extra sources - export GRUB_CONTRIB="${srcdir}/grub-bios-${pkgver}/grub-extras/" + export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/" - install -d "${srcdir}/grub-bios-${pkgver}/grub-extras" - for _DIR_ in 915resolution ntldr-img lua gpxe ; do - cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}" + install -d "${srcdir}/grub-${pkgver}-bios/grub-extras" + for _DIR_ in 915resolution ntldr-img ; do + cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}" done ## Unset all compiler FLAGS for bios build @@ -83,11 +76,11 @@ _build_grub-common_and_bios() { unset MAKEFLAGS ## Start the actual build process - cd "${srcdir}/grub-bios-${pkgver}/" + cd "${srcdir}/grub-${pkgver}-bios/" ./autogen.sh echo - CFLAGS="-fno-stack-protector" ./configure \ + ./configure \ --with-platform="pc" \ --target="i386" \ "${_EFIEMU}" \ @@ -117,15 +110,15 @@ _build_grub-common_and_bios() { _build_grub-efi() { ## Copy the source for building the efi package - cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-efi-${pkgver}" - cd "${srcdir}/grub-efi-${pkgver}/" + cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi" + cd "${srcdir}/grub-${pkgver}-efi/" - export GRUB_CONTRIB="${srcdir}/grub-efi-${pkgver}/grub-extras/" + # export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-efi/grub-extras/" - install -d "${srcdir}/grub-efi-${pkgver}/grub-extras/" - for _DIR_ in lua gpxe ; do - cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}" - done + # install -d "${srcdir}/grub-${pkgver}-efi/grub-extras/" + # for _DIR_ in lua gpxe ; do + # cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}" + # done ## Unset all compiler FLAGS for efi build unset CFLAGS @@ -134,7 +127,7 @@ _build_grub-efi() { unset LDFLAGS unset MAKEFLAGS - cd "${srcdir}/grub-efi-${pkgver}/" + cd "${srcdir}/grub-${pkgver}-efi/" ./autogen.sh echo @@ -177,14 +170,6 @@ build() { cd "${srcdir}/grub-${pkgver}/" - ## Fix compiling with gcc48 - patch -Np1 -i "${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch" - echo - - ## Fix docs compiling - patch -Np1 -i "${srcdir}/grub-2.00-fix-docs.patch" - echo - ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo @@ -208,7 +193,7 @@ build() { _package_grub-common_and_bios() { - cd "${srcdir}/grub-bios-${pkgver}/" + cd "${srcdir}/grub-${pkgver}-bios/" make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo @@ -223,15 +208,12 @@ _package_grub-common_and_bios() { ## Install /etc/default/grub (used by grub-mkconfig) install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - ## Install grub.cfg for backup array - install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" - } _package_grub-efi() { - cd "${srcdir}/grub-efi-${pkgver}/" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/grub-${pkgver}-efi/" + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo ## remove gdb debugging related files diff --git a/libre/grub/grub_bzr_export.sh b/libre/grub/grub_bzr_export.sh deleted file mode 100644 index ff8f99ecc..000000000 --- a/libre/grub/grub_bzr_export.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env bash - -## For actual repos - -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution - -## For launchpad mirror - -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-lua lua -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-gpxe gpxe -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-ntldr-img ntldr-img -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-915resolution 915resolution - -## grub-extras zfs is integrated into grub bzr main repo and is no longer needed separately. - -_WD="${PWD}/" -_OUTPUT_DIR="${_WD}/" - -_ACTUAL_PKGVER="2.00" - -_GRUB_BZR_REPO_DIR="${_WD}/grub_mainline_BZR/" -_GRUB_BZR_EXP_REPO_DIR="${_WD}/grub_experimental_BZR/" -_GRUB_EXTRAS_REPOS_DIR="${_WD}/grub_extras_BZR/" - -_MAIN_SNAPSHOT() { - - cd "${_GRUB_BZR_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_BZR_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" - echo - -} - -_EXP_SNAPSHOT() { - - cd "${_GRUB_BZR_EXP_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_BZR_EXP_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" - echo - -} - -_EXTRAS_SNAPSHOT() { - - cd "${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME})" - bzr export --root="${_GRUB_EXTRAS_NAME}" --format="tar" "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - echo - - xz -9 "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - -} - -echo - -set -x -e - -echo - -_MAIN_SNAPSHOT - -echo - -# _EXP_SNAPSHOT - -echo - -_GRUB_EXTRAS_NAME="lua" -_EXTRAS_SNAPSHOT - -# _GRUB_EXTRAS_NAME="gpxe" -# _EXTRAS_SNAPSHOT - -_GRUB_EXTRAS_NAME="ntldr-img" -_EXTRAS_SNAPSHOT - -_GRUB_EXTRAS_NAME="915resolution" -_EXTRAS_SNAPSHOT - -echo - -set +x +e - -echo - -unset _WD -unset _OUTPUT_DIR -unset _GRUB_BZR_REPO_DIR -unset _GRUB_EXTRAS_REPOS_DIR -unset _GRUB_EXTRAS_NAME diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch index 5324afa01..fbcca19ec 100644 --- a/libre/grub/parabola_grub_mkconfig_fixes.patch +++ b/libre/grub/parabola_grub_mkconfig_fixes.patch @@ -1,8 +1,8 @@ diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 516be86..5f37db2 100644 +index 8decc1d..170047f 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ +@@ -212,6 +212,8 @@ export GRUB_DEFAULT \ GRUB_THEME \ GRUB_GFXPAYLOAD_LINUX \ GRUB_DISABLE_OS_PROBER \ @@ -12,10 +12,10 @@ index 516be86..5f37db2 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 765bfdc..b148558 100644 +index 2c4bb0a..c7120d2 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in -@@ -115,6 +115,14 @@ cat < Date: Wed, 26 Jun 2013 04:09:26 -0300 Subject: liferea-libre-1.8.15-1: updating version --- libre/liferea-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 3ac0fdb5d..4126d4d01 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186254 2013-05-23 00:44:27Z eric $ +# $Id: PKGBUILD 188905 2013-06-25 03:54:44Z eric $ # Maintainer: Eric Bélanger # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.14 +pkgver=1.8.15 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('980939a9f6483f4e9ca2353ffdba131cb9a88a6e' +sha1sums=('9a86773996d61d03c03e9a5137a2c0a3e2539f4f' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { -- cgit v1.2.3 From e4edce2be37eafac9f049886bd88caa101102812 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 26 Jun 2013 05:55:09 -0300 Subject: gimp-toolset-gps: add packages to pcr repo --- pcr/gimp-toolset-gps/PKGBUILD | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pcr/gimp-toolset-gps/PKGBUILD diff --git a/pcr/gimp-toolset-gps/PKGBUILD b/pcr/gimp-toolset-gps/PKGBUILD new file mode 100644 index 000000000..a74d6d928 --- /dev/null +++ b/pcr/gimp-toolset-gps/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer (Parabola): Márcio Silva + +pkgname=gimp-toolset-gps +_pkgname=${pkgname:13} +_reqname=${pkgname::4} +pkgver=2.0 +_pkgver=${pkgver/./_} +pkgrel=1 +_pkgsrc1=${_pkgname^^}%20$_pkgver%20final +_pkgsrc2=${_pkgname^^}%20extras +pkgdesc='GIMP Paint Studio is a collection of brushes and accompanying tool presets. highly useful feature of the GIMP.' +arch=any +license=( + GPL2 + CCPL:by-sa +) +url=https://code.google.com/p/$_pkgname-gimp-paint-studio +depends=gimp +makedepends=unzip-libre +noextract=( + $_pkgsrc1.zip + $_pkgsrc2.zip +) +source=( + https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc1.zip + https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc2.zip +) +sha512sums=( + b06016eab194db7862590940c6fb7e9c14bbb6d3ce83c2b85293da2c75ecf8b9e64585a38f749da36d63e2711a25a0073415568f10be4b997120d93ba2b5c112 + c3ef322898299bde60f2c8e29ebdd5fa47236f6b2859bf5d3d01a92290e1ad888ba71b0813f7325921c87bf57632cf794da31e8ccab0c46cb020be52d2c1135f +) + +prepare() { + a=$srcdir/$_pkgname-$pkgver + mkdir $a + unzip $srcdir/$_pkgsrc1.zip -d $a + unzip $srcdir/$_pkgsrc2.zip -d $a + # drop useless splashes + rm -v $a/splashes/* && rmdir -v $a/splashes + # fix perm for custom umask + find $srcdir/$_pkgname-$pkgver -type d -exec chmod 0755 -R {} \; &&\ + find $srcdir/$_pkgname-$pkgver -type f -exec chmod 0644 -R {} \; +} + +package() { + b=$pkgdir/usr/share/gimp/2.0 + install -d $b + cp -va $srcdir/$_pkgname-$pkgver/* $b +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3 From 1021c607d17125c85e61ef6b78d1954096c5d22d Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 26 Jun 2013 06:00:38 -0300 Subject: change to toolkit name --- pcr/gimp-toolkit-gps/PKGBUILD | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pcr/gimp-toolkit-gps/PKGBUILD diff --git a/pcr/gimp-toolkit-gps/PKGBUILD b/pcr/gimp-toolkit-gps/PKGBUILD new file mode 100644 index 000000000..6f3a92ba2 --- /dev/null +++ b/pcr/gimp-toolkit-gps/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer (Parabola): Márcio Silva + +pkgname=gimp-toolkit-gps +_pkgname=${pkgname:13} +_reqname=${pkgname::4} +pkgver=2.0 +_pkgver=${pkgver/./_} +pkgrel=1 +_pkgsrc1=${_pkgname^^}%20$_pkgver%20final +_pkgsrc2=${_pkgname^^}%20extras +pkgdesc='GIMP Paint Studio is a collection of brushes and accompanying tool presets. highly useful feature of the GIMP.' +arch=any +license=( + GPL2 + CCPL:by-sa +) +url=https://code.google.com/p/$_pkgname-gimp-paint-studio +depends=gimp +conflicts=${pkgname/kit/set} +renplaces=${pkgname/kit/set} +makedepends=unzip-libre +noextract=( + $_pkgsrc1.zip + $_pkgsrc2.zip +) +source=( + https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc1.zip + https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc2.zip +) +sha512sums=( + b06016eab194db7862590940c6fb7e9c14bbb6d3ce83c2b85293da2c75ecf8b9e64585a38f749da36d63e2711a25a0073415568f10be4b997120d93ba2b5c112 + c3ef322898299bde60f2c8e29ebdd5fa47236f6b2859bf5d3d01a92290e1ad888ba71b0813f7325921c87bf57632cf794da31e8ccab0c46cb020be52d2c1135f +) + +prepare() { + a=$srcdir/$_pkgname-$pkgver + mkdir $a + unzip $srcdir/$_pkgsrc1.zip -d $a + unzip $srcdir/$_pkgsrc2.zip -d $a + # drop useless splashes + rm -v $a/splashes/* && rmdir -v $a/splashes + # fix perm for custom umask + find $srcdir/$_pkgname-$pkgver -type d -exec chmod 0755 -R {} \; &&\ + find $srcdir/$_pkgname-$pkgver -type f -exec chmod 0644 -R {} \; +} + +package() { + b=$pkgdir/usr/share/gimp/2.0 + install -d $b + cp -va $srcdir/$_pkgname-$pkgver/* $b +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3 From a92014ac95b7d895d424773b81f8c2fd5a2164d8 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 26 Jun 2013 06:01:04 -0300 Subject: change to toolkit name --- pcr/gimp-toolset-gps/PKGBUILD | 51 ------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 pcr/gimp-toolset-gps/PKGBUILD diff --git a/pcr/gimp-toolset-gps/PKGBUILD b/pcr/gimp-toolset-gps/PKGBUILD deleted file mode 100644 index a74d6d928..000000000 --- a/pcr/gimp-toolset-gps/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer (Parabola): Márcio Silva - -pkgname=gimp-toolset-gps -_pkgname=${pkgname:13} -_reqname=${pkgname::4} -pkgver=2.0 -_pkgver=${pkgver/./_} -pkgrel=1 -_pkgsrc1=${_pkgname^^}%20$_pkgver%20final -_pkgsrc2=${_pkgname^^}%20extras -pkgdesc='GIMP Paint Studio is a collection of brushes and accompanying tool presets. highly useful feature of the GIMP.' -arch=any -license=( - GPL2 - CCPL:by-sa -) -url=https://code.google.com/p/$_pkgname-gimp-paint-studio -depends=gimp -makedepends=unzip-libre -noextract=( - $_pkgsrc1.zip - $_pkgsrc2.zip -) -source=( - https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc1.zip - https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc2.zip -) -sha512sums=( - b06016eab194db7862590940c6fb7e9c14bbb6d3ce83c2b85293da2c75ecf8b9e64585a38f749da36d63e2711a25a0073415568f10be4b997120d93ba2b5c112 - c3ef322898299bde60f2c8e29ebdd5fa47236f6b2859bf5d3d01a92290e1ad888ba71b0813f7325921c87bf57632cf794da31e8ccab0c46cb020be52d2c1135f -) - -prepare() { - a=$srcdir/$_pkgname-$pkgver - mkdir $a - unzip $srcdir/$_pkgsrc1.zip -d $a - unzip $srcdir/$_pkgsrc2.zip -d $a - # drop useless splashes - rm -v $a/splashes/* && rmdir -v $a/splashes - # fix perm for custom umask - find $srcdir/$_pkgname-$pkgver -type d -exec chmod 0755 -R {} \; &&\ - find $srcdir/$_pkgname-$pkgver -type f -exec chmod 0644 -R {} \; -} - -package() { - b=$pkgdir/usr/share/gimp/2.0 - install -d $b - cp -va $srcdir/$_pkgname-$pkgver/* $b -} - -# vim:set ts=2 sw=2 et: -- cgit v1.2.3 From 411051fd85e858ba82d0b1e4512f0c2b0b05b243 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 26 Jun 2013 06:04:41 -0300 Subject: gimp-toolkit-gps: fixing type --- pcr/gimp-toolkit-gps/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcr/gimp-toolkit-gps/PKGBUILD b/pcr/gimp-toolkit-gps/PKGBUILD index 6f3a92ba2..fae564053 100644 --- a/pcr/gimp-toolkit-gps/PKGBUILD +++ b/pcr/gimp-toolkit-gps/PKGBUILD @@ -17,7 +17,7 @@ license=( url=https://code.google.com/p/$_pkgname-gimp-paint-studio depends=gimp conflicts=${pkgname/kit/set} -renplaces=${pkgname/kit/set} +replaces=${pkgname/kit/set} makedepends=unzip-libre noextract=( $_pkgsrc1.zip -- cgit v1.2.3 From 8bd8506680eefd5799b3d33441420fb8803b53cb Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Wed, 26 Jun 2013 13:10:38 -0500 Subject: Removing python2-paramiko from pcr, is in community --- pcr/python2-paramiko/PKGBUILD | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 pcr/python2-paramiko/PKGBUILD diff --git a/pcr/python2-paramiko/PKGBUILD b/pcr/python2-paramiko/PKGBUILD deleted file mode 100644 index da62b4e28..000000000 --- a/pcr/python2-paramiko/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Chris Brannon -# Contributor: Douglas Soares de Andrade -# Contributor: Mario Danic - -pkgbase=python-paramiko -pkgname=python2-paramiko -pkgver=1.9.0 -pkgrel=1 -pkgdesc="Python module that implements the SSH2 protocol" -url="http://www.lag.net/paramiko/" -license=('LGPL') -arch=('any') -depends=('python2-crypto') -conflicts=() -replaces=() -source=(http://pypi.python.org/packages/source/p/paramiko/paramiko-$pkgver.tar.gz) - - -package_python2-paramiko() { - cd "$srcdir/paramiko-$pkgver" - - python2 setup.py install --root="$pkgdir" --optimize=1 - install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" - install -dm755 "$pkgdir/usr/share/doc/$pkgname/demos" - install -m644 demos/* "$pkgdir/usr/share/doc/$pkgname/demos" - chmod 755 "$pkgdir/usr/share/doc/$pkgname/demos/"*.py - - find "$pkgdir" -name '*.py' -print0 |xargs -0 \ - sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \ - -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,' -} -md5sums=('b78472021ff6586dd61ad6972032f54f') -- cgit v1.2.3 From 18e0217369462ef63cf9811a10d6b88ac66a5397 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 26 Jun 2013 19:56:09 -0300 Subject: change coadde, emulatorman and ze-lara deprecated emails --- libre-testing/systemd/rePKGBUILD | 2 +- libre/abuse-libre/PKGBUILD | 2 +- libre/atool-libre/PKGBUILD | 2 +- libre/audacity-libre/PKGBUILD | 2 +- libre/blackbox-libre/PKGBUILD | 2 +- libre/blender-addon-luxrender/PKGBUILD | 2 +- libre/epdfview-libre/PKGBUILD | 2 +- libre/lilo/PKGBUILD | 2 +- libre/mariadb/PKGBUILD | 2 +- libre/mozilla-searchplugins/PKGBUILD | 2 +- pcr/chiliproject/PKGBUILD | 2 +- pcr/cinepaint-lts/PKGBUILD | 2 +- pcr/clusterit/PKGBUILD | 2 +- pcr/collada-dom/PKGBUILD | 2 +- pcr/corosync/PKGBUILD | 2 +- pcr/ganglia/PKGBUILD | 2 +- pcr/gimp-art/PKGBUILD | 2 +- pcr/gimp-art/gimp-splash-artwork.license | 6 +++--- pcr/gimp-toolkit-gps/PKGBUILD | 2 +- pcr/lcmc/PKGBUILD | 2 +- pcr/libav/PKGBUILD | 2 +- pcr/mednafen-server/PKGBUILD | 2 +- pcr/sipwitch/PKGBUILD | 2 +- pcr/spacenav-daemon/PKGBUILD | 2 +- pcr/torque/PKGBUILD | 2 +- pcr/xf86-input-wizardpen/PKGBUILD | 2 +- social/sipwitch/PKGBUILD | 2 +- ~emulatorman/hunspell-gl/PKGBUILD | 2 +- ~emulatorman/raider/PKGBUILD | 2 +- ~emulatorman/xchat-xsys-noaudacious/PKGBUILD | 2 +- ~emulatorman/xonotic-data/PKGBUILD | 2 +- ~emulatorman/xonotic/PKGBUILD | 2 +- 32 files changed, 34 insertions(+), 34 deletions(-) diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD index 0487320e7..8b9e59932 100644 --- a/libre-testing/systemd/rePKGBUILD +++ b/libre-testing/systemd/rePKGBUILD @@ -4,7 +4,7 @@ # then please put 'unknown'. # Maintainer: Nicolas Reynolds -# Maintainer: André Silva +# Maintainer: André Silva source PKGBUILD unset build package md5sums source check _repo=testing diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD index 196fb2c85..1b7ed9072 100644 --- a/libre/abuse-libre/PKGBUILD +++ b/libre/abuse-libre/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Lukas Fleischer # Contributor: jlvsimoes # Contributor: kevin -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva _pkgname=abuse pkgname=abuse-libre diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD index ea1dfec52..0745630ad 100644 --- a/libre/atool-libre/PKGBUILD +++ b/libre/atool-libre/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: leif_thande # Contributor: tranquility # Contributor: Daniel J Griffiths -# Contributor (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva _pkgname=atool pkgname=atool-libre diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD index 6d6f287b3..610404545 100644 --- a/libre/audacity-libre/PKGBUILD +++ b/libre/audacity-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $ # Maintainer: Eric Bélanger -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva _pkgname=audacity pkgname=audacity-libre diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD index c76d7cba5..1c0c49a15 100644 --- a/libre/blackbox-libre/PKGBUILD +++ b/libre/blackbox-libre/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Sergej Pupykin # Contributor: durbatuluk # Contributor: Steve Ponsford -# Maintainer (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva _pkgname=blackbox pkgname=${_pkgname}-libre diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 6637e134c..040eeccf4 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=blender-addon-luxrender _pkgname=${pkgname:14:3}${pkgname::5}25 diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD index 28c77eed8..626e653f2 100644 --- a/libre/epdfview-libre/PKGBUILD +++ b/libre/epdfview-libre/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay # Contributor: Tom K # Contributor: Thayer Williams -# Maintainer (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva pkgname=epdfview-libre _pkgname=epdfview diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD index a896613ee..7bca08571 100644 --- a/libre/lilo/PKGBUILD +++ b/libre/lilo/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Eric Belanger # Contributor: judd -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva pkgname=lilo pkgver=23.2 diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD index a5b733e9f..256b6e9ae 100644 --- a/libre/mariadb/PKGBUILD +++ b/libre/mariadb/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Douglas Soares de Andrade -# Maintainer (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva falsename=mysql _falsename=MySQL diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 0d1d14cd0..b2e362899 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando -# Contributor (Parabola): Márcio Silva +# Contributor (Parabola): Márcio Silva # Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim diff --git a/pcr/chiliproject/PKGBUILD b/pcr/chiliproject/PKGBUILD index 4f933934a..976316dc4 100644 --- a/pcr/chiliproject/PKGBUILD +++ b/pcr/chiliproject/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=chiliproject pkgver=3.3.0 diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD index c680ac904..da085729f 100644 --- a/pcr/cinepaint-lts/PKGBUILD +++ b/pcr/cinepaint-lts/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] -# Maintainer (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva pkgname=cinepaint-lts pkgver=1.0 diff --git a/pcr/clusterit/PKGBUILD b/pcr/clusterit/PKGBUILD index c325a003b..59ef12be3 100644 --- a/pcr/clusterit/PKGBUILD +++ b/pcr/clusterit/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=clusterit pkgver=2.5 diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD index ebcc90448..1b42c921c 100644 --- a/pcr/collada-dom/PKGBUILD +++ b/pcr/collada-dom/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=collada-dom pkgver=2.4.0 diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD index 7bd87f791..a24064722 100644 --- a/pcr/corosync/PKGBUILD +++ b/pcr/corosync/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=corosync _pkgflag=lts diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD index 9fed072aa..efa005071 100644 --- a/pcr/ganglia/PKGBUILD +++ b/pcr/ganglia/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=ganglia pkgver=3.6.0 diff --git a/pcr/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD index 11c3b191b..cd38b329d 100644 --- a/pcr/gimp-art/PKGBUILD +++ b/pcr/gimp-art/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=gimp-art pkgver=2.8.2 diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license index 64267a6c0..0f060c013 100644 --- a/pcr/gimp-art/gimp-splash-artwork.license +++ b/pcr/gimp-art/gimp-splash-artwork.license @@ -1,7 +1,7 @@ GIMP LIBRE SPLASH LICENSE -Logo and Effects is created by Zé Lara and Márcio Silva -Idea by André Silva +Logo and Effects is created by Zé Lara and Márcio Silva +Idea by André Silva The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send aletter to Creative Commons, 444 Castro Street, @@ -10,4 +10,4 @@ Suite 900, Mountain View, California, 94041, USA. Sangeno Waterfall Picture is created by Abedinali from Wikimedia Commons under the Creative Commons CC0 1.0 Universal license (Public Domain). To the extent possible under law, Abedinali from Wikimedia Commons has waived all copyright and related or neighboring rights to Sangeno Waterfall. This work is published from: United States. -https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg \ No newline at end of file +https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg diff --git a/pcr/gimp-toolkit-gps/PKGBUILD b/pcr/gimp-toolkit-gps/PKGBUILD index fae564053..9f5784608 100644 --- a/pcr/gimp-toolkit-gps/PKGBUILD +++ b/pcr/gimp-toolkit-gps/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=gimp-toolkit-gps _pkgname=${pkgname:13} diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD index 538949f60..6b27ff5f4 100644 --- a/pcr/lcmc/PKGBUILD +++ b/pcr/lcmc/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=lcmc pkgver=1.5.1 diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD index 23f03db2d..782e12a15 100644 --- a/pcr/libav/PKGBUILD +++ b/pcr/libav/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva static=false _pkgname=libav diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD index 0db1b1068..9968dde38 100644 --- a/pcr/mednafen-server/PKGBUILD +++ b/pcr/mednafen-server/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=mednafen-server _pkgname=${pkgname%-server} diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD index 22852780c..eba2bb854 100644 --- a/pcr/sipwitch/PKGBUILD +++ b/pcr/sipwitch/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Dan Serban # Contributors: David Zaragoza, Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva pkgname=sipwitch pkgver=1.2.4 diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD index 0f06af418..fb1229ae4 100644 --- a/pcr/spacenav-daemon/PKGBUILD +++ b/pcr/spacenav-daemon/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=spacenav-daemon _pkgname=${pkgname%-daemon} diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD index 5f469fa5f..850aa3b7d 100644 --- a/pcr/torque/PKGBUILD +++ b/pcr/torque/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=torque pkgver=4.2.2 diff --git a/pcr/xf86-input-wizardpen/PKGBUILD b/pcr/xf86-input-wizardpen/PKGBUILD index 4b40ebea2..dfad17f34 100644 --- a/pcr/xf86-input-wizardpen/PKGBUILD +++ b/pcr/xf86-input-wizardpen/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=xf86-input-wizardpen _pkgname=${pkgname:11} diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD index 8cb84fad5..6ab789ccc 100644 --- a/social/sipwitch/PKGBUILD +++ b/social/sipwitch/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Dan Serban # Contributors: David Zaragoza, Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva pkgname=sipwitch pkgver=1.2.4 diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD index 210fda175..8c791a2fe 100644 --- a/~emulatorman/hunspell-gl/PKGBUILD +++ b/~emulatorman/hunspell-gl/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Adrián Chaves Fernández (Gallaecio) , 2009-2010. -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=hunspell-gl pkgver=2.9b diff --git a/~emulatorman/raider/PKGBUILD b/~emulatorman/raider/PKGBUILD index 960164820..c5629e9fc 100644 --- a/~emulatorman/raider/PKGBUILD +++ b/~emulatorman/raider/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: M.Carreira # Contributor: M.Carreira -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=raider pkgver=0.10.0 pkgrel=1 diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD index 977999a38..7ed44c2e3 100644 --- a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD +++ b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD @@ -1,5 +1,5 @@ # Contributor: Gökmen Görgen -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=xchat-xsys-noaudacious pkgver=2.2.0 pkgrel=3 diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD index 114954fc3..13f4d5c12 100644 --- a/~emulatorman/xonotic-data/PKGBUILD +++ b/~emulatorman/xonotic-data/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 35989 2010-12-25 03:22:46Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Alexander Suhoverhov -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=xonotic-data pkgver=0.5.0 diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD index 236474d3d..a51606cd5 100644 --- a/~emulatorman/xonotic/PKGBUILD +++ b/~emulatorman/xonotic/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Sven-Hendrik Haase # Contributor: Alexander Suhoverhov -# Contributor (Parabola): André Silva +# Contributor (Parabola): André Silva pkgname=xonotic pkgver=0.5.0 -- cgit v1.2.3 From 63a3d5181e366a566b52c0634a7ec16f86d36cbd Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 26 Jun 2013 20:01:00 -0300 Subject: mariadb: moved package to ~coadde repo --- libre/mariadb/PKGBUILD | 141 -------------------------------------- libre/mariadb/mariadb.install | 26 ------- libre/mariadb/mariadbd | 77 --------------------- libre/mariadb/my.cnf | 145 ---------------------------------------- libre/mariadb/mysql.install | 26 ------- libre/mariadb/mysqld | 77 --------------------- ~coadde/mariadb/PKGBUILD | 141 ++++++++++++++++++++++++++++++++++++++ ~coadde/mariadb/mariadb.install | 26 +++++++ ~coadde/mariadb/mariadbd | 77 +++++++++++++++++++++ ~coadde/mariadb/my.cnf | 145 ++++++++++++++++++++++++++++++++++++++++ ~coadde/mariadb/mysql.install | 26 +++++++ ~coadde/mariadb/mysqld | 77 +++++++++++++++++++++ 12 files changed, 492 insertions(+), 492 deletions(-) delete mode 100644 libre/mariadb/PKGBUILD delete mode 100644 libre/mariadb/mariadb.install delete mode 100755 libre/mariadb/mariadbd delete mode 100644 libre/mariadb/my.cnf delete mode 100644 libre/mariadb/mysql.install delete mode 100644 libre/mariadb/mysqld create mode 100644 ~coadde/mariadb/PKGBUILD create mode 100644 ~coadde/mariadb/mariadb.install create mode 100755 ~coadde/mariadb/mariadbd create mode 100644 ~coadde/mariadb/my.cnf create mode 100644 ~coadde/mariadb/mysql.install create mode 100644 ~coadde/mariadb/mysqld diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD deleted file mode 100644 index 256b6e9ae..000000000 --- a/libre/mariadb/PKGBUILD +++ /dev/null @@ -1,141 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Andrea Scarpino -# Contributor: Douglas Soares de Andrade -# Maintainer (Parabola): Márcio Silva - -falsename=mysql -_falsename=MySQL -pkgbase=mariadb -_pkgbase=MariaDB -pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") -pkgver=5.5.23 -pkgrel=1.5 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.${pkgbase}.org/" -makedepends=('cmake' 'openssl' 'zlib') -options=('!libtool') -source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgbase}-${pkgver}.tar.gz" - "${falsename}d" - 'my.cnf') -md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f' - '2234207625baa29b2ff7d7b4f088abce' - '1c949c0dbea5206af0db14942d9927b6') - -build() { - cd "${srcdir}" - mkdir build - cd build - - # CFLAGS/CXXFLAGS as suggested upstream - CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ - - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/${falsename} \ - -DMYSQL_DATADIR=/var/lib/${falsename} \ - -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \ - -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_unicode_ci \ - -DENABLED_LOCAL_INFILE=ON \ - -DINSTALL_INFODIR=share/${falsename}/docs \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/${falsename}/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/${falsename} \ - -DINSTALL_DOCREADMEDIR=share/${falsename} \ - -DINSTALL_SUPPORTFILESDIR=share/${falsename} \ - -DINSTALL_MYSQLSHAREDIR=share/${falsename} \ - -DINSTALL_DOCDIR=share/${falsename}/docs \ - -DINSTALL_SHAREDIR=share/${falsename} \ - -DWITH_READLINE=ON \ - -DWITH_ZLIB=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=1 \ - -DWITH_PARTITION_STORAGE_ENGINE=1 \ - -DWITH_PBXT_STORAGE_ENGINE=1 \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 - - make -} - -package_libmariadbclient(){ - pkgdesc="${_pkgbase} client libraries (branch of ${_falsename})" - depends=('openssl') - conflicts=("lib${falsename}client") - provides=("lib${falsename}client=${pkgver}") - - cd "${srcdir}"/build - for dir in include lib${falsename} lib${falsename}d libservices; do - make -C ${dir} DESTDIR="${pkgdir}" install - done - - install -d "${pkgdir}"/usr/bin - install -m755 scripts/${falsename}_config "${pkgdir}"/usr/bin/ - install -d "${pkgdir}"/usr/share/man/man1 - for man in ${falsename}_config ${falsename}_client_test_embedded ${falsename}test_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done -} - -package_mariadb-clients(){ - pkgdesc="${_pkgbase} client tools (branch of ${_falsename})" - depends=("lib${pkgbase}client") - conflicts=("${falsename}-clients") - provides=("${falsename}-clients=${pkgver}") - - cd "${srcdir}"/build - make -C client DESTDIR="${pkgdir}" install - - # install man pages - install -d "${pkgdir}"/usr/share/man/man1 - for man in ${falsename} ${falsename}admin ${falsename}check ${falsename}dump ${falsename}import ${falsename}show ${falsename}slap; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done - - # provided by mariadb - rm "${pkgdir}"/usr/bin/{${falsename}_{plugin,upgrade},${falsename}binlog,${falsename}test} -} - -package_mariadb(){ - pkgdesc="A fast SQL database server branch of ${_falsename} - ${_pkgbase}" - backup=("etc/${pkgbase}/my.cnf") - install=${falsename}.install - depends=("${pkgbase}-clients") - optdepends=('perl-dbi' "perl-dbd-${falsename}") - conflicts=("${falsename}") - provides=("${falsename}=${pkgver}") - options=('emptydirs') - - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${falsename}/my.cnf - install -Dm755 "${srcdir}"/${falsename}d "${pkgdir}"/etc/rc.d/${falsename}d - - # provided by libmariadbclient - rm "${pkgdir}"/usr/bin/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded} - rm "${pkgdir}"/usr/lib/lib${falsename}* - rm -r "${pkgdir}"/usr/include/ - rm "${pkgdir}"/usr/share/man/man1/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}.1 - - # provided by mariadb-clients - rm "${pkgdir}"/usr/bin/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap} - rm "${pkgdir}"/usr/share/man/man1/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}.1 - - # not needed - rm -r "${pkgdir}"/usr/{data,${falsename}-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/${falsename}-test-run.pl.1 - - install -dm700 "${pkgdir}"/var/lib/${falsename} -} diff --git a/libre/mariadb/mariadb.install b/libre/mariadb/mariadb.install deleted file mode 100644 index f56a0dcaa..000000000 --- a/libre/mariadb/mariadb.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install(){ - groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null - /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mariadb - chown -R mysql:mysql /var/lib/mariadb &>/dev/null -} - -post_upgrade(){ - getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null - - if [ "$(vercmp $2 5.5)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} - -post_remove(){ - if getent passwd mysql >/dev/null 2>&1; then - userdel mysql - fi - if getent group mysql >/dev/null 2>&1; then - groupdel mysql - fi -} diff --git a/libre/mariadb/mariadbd b/libre/mariadb/mariadbd deleted file mode 100755 index 3ae612096..000000000 --- a/libre/mariadb/mariadbd +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MariaDB Server" - [ ! -d /var/run/mariadb ] && install -d -g mysql -o mysql /var/run/mariadb &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mariadb/mariadb.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MariaDB Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mariadb/mariadb.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/libre/mariadb/my.cnf b/libre/mariadb/my.cnf deleted file mode 100644 index 9a41b4fc3..000000000 --- a/libre/mariadb/my.cnf +++ /dev/null @@ -1,145 +0,0 @@ -# MySQL config file for medium systems. -# -# This is for a system with little memory (32M - 64M) where MySQL plays -# an important part, or systems up to 128M where MySQL is used together with -# other programs (such as a web server) -# -# MySQL programs look for option files in a set of -# locations which depend on the deployment platform. -# You can copy this option file to one of those -# locations. For information about these locations, see: -# http://dev.mysql.com/doc/mysql/en/option-files.html -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -# Here follows entries for some specific programs - -# The MySQL server -[mysqld] -port = 3306 -socket = /var/run/mysqld/mysqld.sock -datadir = /var/lib/mysql -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -# Don't listen on a TCP/IP port at all. This can be a security enhancement, -# if all processes that need to connect to mysqld run on the same host. -# All interaction with mysqld must be made via Unix sockets or named pipes. -# Note that using this option without enabling named pipes on Windows -# (via the "enable-named-pipe" option) will render mysqld useless! -# -skip-networking - -# Replication Master Server (default) -# binary logging is required for replication -log-bin=mysql-bin - -# binary logging format - mixed recommended -binlog_format=mixed - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Replication Slave (comment out master section to use this) -# -# To configure this host as a replication slave, you can choose between -# two methods : -# -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - -# the syntax is: -# -# CHANGE MASTER TO MASTER_HOST=, MASTER_PORT=, -# MASTER_USER=, MASTER_PASSWORD= ; -# -# where you replace , , by quoted strings and -# by the master's port number (3306 by default). -# -# Example: -# -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, -# MASTER_USER='joe', MASTER_PASSWORD='secret'; -# -# OR -# -# 2) Set the variables below. However, in case you choose this method, then -# start replication for the first time (even unsuccessfully, for example -# if you mistyped the password in master-password and the slave fails to -# connect), the slave will create a master.info file, and any later -# change in this file to the variables' values below will be ignored and -# overridden by the content of the master.info file, unless you shutdown -# the slave server, delete master.info and restart the slaver server. -# For that reason, you may want to leave the lines below untouched -# (commented) and instead use CHANGE MASTER TO (see above) -# -# required unique id between 2 and 2^32 - 1 -# (and different from the master) -# defaults to 2 if master-host is set -# but will not function as a slave if omitted -#server-id = 2 -# -# The replication master for this slave - required -#master-host = -# -# The username the slave will use for authentication when connecting -# to the master - required -#master-user = -# -# The password the slave will authenticate with when connecting to -# the master - required -#master-password = -# -# The port the master is listening on. -# optional - defaults to 3306 -#master-port = -# -# binary logging - not required for slaves, but recommended -#log-bin=mysql-bin - -# Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = /var/lib/mysql -#innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = /var/lib/mysql -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -#innodb_buffer_pool_size = 16M -#innodb_additional_mem_pool_size = 2M -# Set .._log_file_size to 25 % of buffer pool size -#innodb_log_file_size = 5M -#innodb_log_buffer_size = 8M -#innodb_flush_log_at_trx_commit = 1 -#innodb_lock_wait_timeout = 50 - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/libre/mariadb/mysql.install b/libre/mariadb/mysql.install deleted file mode 100644 index 9a4479215..000000000 --- a/libre/mariadb/mysql.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install(){ - groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - usr/bin/mysql_install_db --user=mysql --basedir=/usr - chown -R mysql:mysql var/lib/mysql &>/dev/null -} - -post_upgrade(){ - getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - - if [ "$(vercmp $2 5.5)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} - -post_remove(){ - if getent passwd mysql >/dev/null 2>&1; then - userdel mysql - fi - if getent group mysql >/dev/null 2>&1; then - groupdel mysql - fi -} diff --git a/libre/mariadb/mysqld b/libre/mariadb/mysqld deleted file mode 100644 index 1ac88a7cc..000000000 --- a/libre/mariadb/mysqld +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MySQL Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MySQL Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/~coadde/mariadb/PKGBUILD b/~coadde/mariadb/PKGBUILD new file mode 100644 index 000000000..256b6e9ae --- /dev/null +++ b/~coadde/mariadb/PKGBUILD @@ -0,0 +1,141 @@ +# $Id$ +# Maintainer: +# Contributor: Andrea Scarpino +# Contributor: Douglas Soares de Andrade +# Maintainer (Parabola): Márcio Silva + +falsename=mysql +_falsename=MySQL +pkgbase=mariadb +_pkgbase=MariaDB +pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") +pkgver=5.5.23 +pkgrel=1.5 +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url="http://www.${pkgbase}.org/" +makedepends=('cmake' 'openssl' 'zlib') +options=('!libtool') +source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgbase}-${pkgver}.tar.gz" + "${falsename}d" + 'my.cnf') +md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f' + '2234207625baa29b2ff7d7b4f088abce' + '1c949c0dbea5206af0db14942d9927b6') + +build() { + cd "${srcdir}" + mkdir build + cd build + + # CFLAGS/CXXFLAGS as suggested upstream + CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ + + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/${falsename} \ + -DMYSQL_DATADIR=/var/lib/${falsename} \ + -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \ + -DDEFAULT_CHARSET=utf8 \ + -DDEFAULT_COLLATION=utf8_unicode_ci \ + -DENABLED_LOCAL_INFILE=ON \ + -DINSTALL_INFODIR=share/${falsename}/docs \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_PLUGINDIR=/usr/lib/${falsename}/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/${falsename} \ + -DINSTALL_DOCREADMEDIR=share/${falsename} \ + -DINSTALL_SUPPORTFILESDIR=share/${falsename} \ + -DINSTALL_MYSQLSHAREDIR=share/${falsename} \ + -DINSTALL_DOCDIR=share/${falsename}/docs \ + -DINSTALL_SHAREDIR=share/${falsename} \ + -DWITH_READLINE=ON \ + -DWITH_ZLIB=system \ + -DWITH_SSL=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITH_PBXT_STORAGE_ENGINE=1 \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ + -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ + -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + + make +} + +package_libmariadbclient(){ + pkgdesc="${_pkgbase} client libraries (branch of ${_falsename})" + depends=('openssl') + conflicts=("lib${falsename}client") + provides=("lib${falsename}client=${pkgver}") + + cd "${srcdir}"/build + for dir in include lib${falsename} lib${falsename}d libservices; do + make -C ${dir} DESTDIR="${pkgdir}" install + done + + install -d "${pkgdir}"/usr/bin + install -m755 scripts/${falsename}_config "${pkgdir}"/usr/bin/ + install -d "${pkgdir}"/usr/share/man/man1 + for man in ${falsename}_config ${falsename}_client_test_embedded ${falsename}test_embedded; do + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + done +} + +package_mariadb-clients(){ + pkgdesc="${_pkgbase} client tools (branch of ${_falsename})" + depends=("lib${pkgbase}client") + conflicts=("${falsename}-clients") + provides=("${falsename}-clients=${pkgver}") + + cd "${srcdir}"/build + make -C client DESTDIR="${pkgdir}" install + + # install man pages + install -d "${pkgdir}"/usr/share/man/man1 + for man in ${falsename} ${falsename}admin ${falsename}check ${falsename}dump ${falsename}import ${falsename}show ${falsename}slap; do + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + done + + # provided by mariadb + rm "${pkgdir}"/usr/bin/{${falsename}_{plugin,upgrade},${falsename}binlog,${falsename}test} +} + +package_mariadb(){ + pkgdesc="A fast SQL database server branch of ${_falsename} - ${_pkgbase}" + backup=("etc/${pkgbase}/my.cnf") + install=${falsename}.install + depends=("${pkgbase}-clients") + optdepends=('perl-dbi' "perl-dbd-${falsename}") + conflicts=("${falsename}") + provides=("${falsename}=${pkgver}") + options=('emptydirs') + + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${falsename}/my.cnf + install -Dm755 "${srcdir}"/${falsename}d "${pkgdir}"/etc/rc.d/${falsename}d + + # provided by libmariadbclient + rm "${pkgdir}"/usr/bin/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded} + rm "${pkgdir}"/usr/lib/lib${falsename}* + rm -r "${pkgdir}"/usr/include/ + rm "${pkgdir}"/usr/share/man/man1/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}.1 + + # provided by mariadb-clients + rm "${pkgdir}"/usr/bin/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap} + rm "${pkgdir}"/usr/share/man/man1/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}.1 + + # not needed + rm -r "${pkgdir}"/usr/{data,${falsename}-test,sql-bench} + rm "${pkgdir}"/usr/share/man/man1/${falsename}-test-run.pl.1 + + install -dm700 "${pkgdir}"/var/lib/${falsename} +} diff --git a/~coadde/mariadb/mariadb.install b/~coadde/mariadb/mariadb.install new file mode 100644 index 000000000..f56a0dcaa --- /dev/null +++ b/~coadde/mariadb/mariadb.install @@ -0,0 +1,26 @@ +post_install(){ + groupadd -g 89 mysql &>/dev/null + useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null + /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mariadb + chown -R mysql:mysql /var/lib/mariadb &>/dev/null +} + +post_upgrade(){ + getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null + + if [ "$(vercmp $2 5.5)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +} + +post_remove(){ + if getent passwd mysql >/dev/null 2>&1; then + userdel mysql + fi + if getent group mysql >/dev/null 2>&1; then + groupdel mysql + fi +} diff --git a/~coadde/mariadb/mariadbd b/~coadde/mariadb/mariadbd new file mode 100755 index 000000000..3ae612096 --- /dev/null +++ b/~coadde/mariadb/mariadbd @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting MariaDB Server" + [ ! -d /var/run/mariadb ] && install -d -g mysql -o mysql /var/run/mariadb &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /var/run/mariadb/mariadb.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping MariaDB Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /var/run/mariadb/mariadb.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/~coadde/mariadb/my.cnf b/~coadde/mariadb/my.cnf new file mode 100644 index 000000000..9a41b4fc3 --- /dev/null +++ b/~coadde/mariadb/my.cnf @@ -0,0 +1,145 @@ +# MySQL config file for medium systems. +# +# This is for a system with little memory (32M - 64M) where MySQL plays +# an important part, or systems up to 128M where MySQL is used together with +# other programs (such as a web server) +# +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html +# +# In this file, you can use all long options that a program supports. +# If you want to know which options a program supports, run the program +# with the "--help" option. + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here follows entries for some specific programs + +# The MySQL server +[mysqld] +port = 3306 +socket = /var/run/mysqld/mysqld.sock +datadir = /var/lib/mysql +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 1M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +# Don't listen on a TCP/IP port at all. This can be a security enhancement, +# if all processes that need to connect to mysqld run on the same host. +# All interaction with mysqld must be made via Unix sockets or named pipes. +# Note that using this option without enabling named pipes on Windows +# (via the "enable-named-pipe" option) will render mysqld useless! +# +skip-networking + +# Replication Master Server (default) +# binary logging is required for replication +log-bin=mysql-bin + +# binary logging format - mixed recommended +binlog_format=mixed + +# required unique id between 1 and 2^32 - 1 +# defaults to 1 if master-host is not set +# but will not function as a master if omitted +server-id = 1 + +# Replication Slave (comment out master section to use this) +# +# To configure this host as a replication slave, you can choose between +# two methods : +# +# 1) Use the CHANGE MASTER TO command (fully described in our manual) - +# the syntax is: +# +# CHANGE MASTER TO MASTER_HOST=, MASTER_PORT=, +# MASTER_USER=, MASTER_PASSWORD= ; +# +# where you replace , , by quoted strings and +# by the master's port number (3306 by default). +# +# Example: +# +# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, +# MASTER_USER='joe', MASTER_PASSWORD='secret'; +# +# OR +# +# 2) Set the variables below. However, in case you choose this method, then +# start replication for the first time (even unsuccessfully, for example +# if you mistyped the password in master-password and the slave fails to +# connect), the slave will create a master.info file, and any later +# change in this file to the variables' values below will be ignored and +# overridden by the content of the master.info file, unless you shutdown +# the slave server, delete master.info and restart the slaver server. +# For that reason, you may want to leave the lines below untouched +# (commented) and instead use CHANGE MASTER TO (see above) +# +# required unique id between 2 and 2^32 - 1 +# (and different from the master) +# defaults to 2 if master-host is set +# but will not function as a slave if omitted +#server-id = 2 +# +# The replication master for this slave - required +#master-host = +# +# The username the slave will use for authentication when connecting +# to the master - required +#master-user = +# +# The password the slave will authenticate with when connecting to +# the master - required +#master-password = +# +# The port the master is listening on. +# optional - defaults to 3306 +#master-port = +# +# binary logging - not required for slaves, but recommended +#log-bin=mysql-bin + +# Uncomment the following if you are using InnoDB tables +#innodb_data_home_dir = /var/lib/mysql +#innodb_data_file_path = ibdata1:10M:autoextend +#innodb_log_group_home_dir = /var/lib/mysql +# You can set .._buffer_pool_size up to 50 - 80 % +# of RAM but beware of setting memory usage too high +#innodb_buffer_pool_size = 16M +#innodb_additional_mem_pool_size = 2M +# Set .._log_file_size to 25 % of buffer pool size +#innodb_log_file_size = 5M +#innodb_log_buffer_size = 8M +#innodb_flush_log_at_trx_commit = 1 +#innodb_lock_wait_timeout = 50 + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +no-auto-rehash +# Remove the next comment character if you are not familiar with SQL +#safe-updates + +[myisamchk] +key_buffer_size = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/~coadde/mariadb/mysql.install b/~coadde/mariadb/mysql.install new file mode 100644 index 000000000..9a4479215 --- /dev/null +++ b/~coadde/mariadb/mysql.install @@ -0,0 +1,26 @@ +post_install(){ + groupadd -g 89 mysql &>/dev/null + useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + usr/bin/mysql_install_db --user=mysql --basedir=/usr + chown -R mysql:mysql var/lib/mysql &>/dev/null +} + +post_upgrade(){ + getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + + if [ "$(vercmp $2 5.5)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +} + +post_remove(){ + if getent passwd mysql >/dev/null 2>&1; then + userdel mysql + fi + if getent group mysql >/dev/null 2>&1; then + groupdel mysql + fi +} diff --git a/~coadde/mariadb/mysqld b/~coadde/mariadb/mysqld new file mode 100644 index 000000000..1ac88a7cc --- /dev/null +++ b/~coadde/mariadb/mysqld @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting MySQL Server" + [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /var/run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping MySQL Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /var/run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 -- cgit v1.2.3 From 870a13606c5d9d797a9f4dd78c990ac72fb59125 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 26 Jun 2013 21:44:46 -0300 Subject: iceweasel-libre-22.0.1-1: updating version --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 8 ++--- libre/iceweasel-libre/PKGBUILD | 36 ++++++++++++++------- .../iceweasel-20.0.1-fixed-loading-icon.png | Bin 0 -> 12184 bytes ...-do-not-fallback-to-manual-proxy-settings.patch | 36 +++++++++++++++++++++ libre/iceweasel-libre/mozconfig | 2 +- libre/iceweasel-libre/mozconfig.pgo | 2 +- 6 files changed, 67 insertions(+), 17 deletions(-) create mode 100644 libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png create mode 100644 libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index d89e4d1ae..f561d5d39 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -3,7 +3,7 @@ Date: Tue, 5 Jun 2012 08:57:06 +0200 Subject: Bug 756390 - Make the "Reset Firefox" feature more generic diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js -index 0e8ccf5..fa46c08 100644 +index 91c5c1c..2f8bd1a 100644 --- a/browser/components/migration/content/migration.js +++ b/browser/components/migration/content/migration.js @@ -249,7 +249,7 @@ var MigrationWizard = { @@ -184,7 +184,7 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index fa45115..1fcf3cd 100644 +index 0541ebf..f983ae4 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -42,7 +42,7 @@ toolkit.jar: @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index b08f8ce..446ee74 100644 +index 17f5598..0b9a24a 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun() +@@ -3743,7 +3743,7 @@ XREMain::XRE_mainRun() if (gDoProfileReset) { // Automatically migrate from the current application if we just // reset the profile. diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index eebf10e57..8e1c525c3 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -1,10 +1,10 @@ +# Maintainer (Parabola): André Silva +# Maintainer (Parabola): Márcio Silva # Contributor (ConnochaetOS): Henry Jensen # Contributor (Parabola): Luke Shumaker # Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando -# Contributor (Parabola): André Silva -# Contributor (Parabola): Márcio Silva # Contributor (Arch): Jakub Schmidtke # Thank you very much to the older contributors: # Contributor: evr @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=21.0 +_debver=22.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,20 +22,21 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) +makedepends=(autoconf2.13 diffutils imagemagick libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') options=(!emptydirs !makeflags) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) fi -optdepends=('networkmanager: Location detection via available WiFi networks') +optdepends=('networkmanager: Location detection via available WiFi networks' + 'libpulse: PulseAudio audio driver') url="http://packages.debian.org/experimental/${_pkgname}" install=iceweasel.install replaces=('firefox') @@ -51,18 +52,22 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" vendor.js shared-libs.patch replace-urls.txt + $_pkgname-22.0-do-not-fallback-to-manual-proxy-settings.patch + $_pkgname-20.0.1-fixed-loading-icon.png Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('0a7c51bb494463c327af918bae6c4ee4' - 'c17121a4ffd40f463e16d7828445d96e' - 'e1e903ca91997f18b428c54ef604f27d' - '383e8e2a97a8b13fe56d153adb6878b6' +md5sums=('45d7121606cc3b21cd2797c87b5dc3bd' + 'bf0440dd8c31527359d797daaf0d3edd' + '2d7ac85c32df6a4ccfcc6de7a1420bf7' + 'df08eaa1ac3bc6c2356be4fbf8ec8932' '2930f3bffe0d7a6b9845f8c006821bc2' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0c26941504d3f2abed759221e9bb5de1' '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '85e67561e0e491cd538ce018dfc2d948') + 'bc27a39d08ab3f6705e487c85598d8bf' + '6e335a517c68488941340ee1c23f97b0' + '86d4045285a9a15c20a62f46535809cb') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -131,6 +136,10 @@ prepare() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + # Should be fixed in Iceweasel 23 + # https://bugzilla.mozilla.org/show_bug.cgi?id=817533 + patch -Np1 -i ../$_pkgname-22.0-do-not-fallback-to-manual-proxy-settings.patch + # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in @@ -143,6 +152,11 @@ prepare() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + # Fix tab loading icon (flickers with libpng 1.6) + # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 + cp "$srcdir/$_pkgname-20.0.1-fixed-loading-icon.png" \ + browser/themes/linux/tabbrowser/loading.png } build() { diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png new file mode 100644 index 000000000..55f25e591 Binary files /dev/null and b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png differ diff --git a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch new file mode 100644 index 000000000..56e4bfc45 --- /dev/null +++ b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch @@ -0,0 +1,36 @@ + +# HG changeset patch +# User Patrick McManus +# Date 1365623297 14400 +# Node ID 85f1d207f52546e0e5fe78990cdefe6efae485fb +# Parent 2bb26d742f5ffd2d946291fd3c688dc3d6d34f67 +bug 817533 - failed system proxy lookups should not fallback to manual configs r=jduell + +diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp +--- a/netwerk/base/src/nsProtocolProxyService.cpp ++++ b/netwerk/base/src/nsProtocolProxyService.cpp +@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal + + // Proxy auto config magic... + if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) { + // Do not query PAC now. + *usePACThread = true; + return NS_OK; + } + +- // proxy info values ++ // If we aren't in manual proxy configuration mode then we don't ++ // want to honor any manual specific prefs that might be still set ++ if (mProxyConfig != PROXYCONFIG_MANUAL) ++ return NS_OK; ++ ++ // proxy info values for manual configuration mode + const char *type = nullptr; + const nsACString *host = nullptr; + int32_t port = -1; + + uint32_t proxyFlags = 0; + + if ((flags & RESOLVE_PREFER_SOCKS_PROXY) && + !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) { + diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index 21d56e13c..a5af10e63 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -25,10 +25,10 @@ ac_add_options --enable-system-pixman # Features ac_add_options --enable-startup-notification ac_add_options --enable-gstreamer +ac_add_options --enable-pulseaudio ac_add_options --disable-crashreporter ac_add_options --disable-updater -ac_add_options --disable-tests ac_add_options --disable-installer # Parabola features diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index 2f4ebe32b..71ba205a4 100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/mozconfig.pgo @@ -1,3 +1,3 @@ # PGO -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' +mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run' -- cgit v1.2.3 From 69f88b708f1b9a32680bdfe52138c0ef5916da19 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 26 Jun 2013 21:53:23 -0300 Subject: cgminer-libre-3.3.1-1: updating version --- libre/cgminer-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 001cd00f2..0fb3b9116 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93076 2013-06-24 03:20:38Z fyan $ +# $Id: PKGBUILD 93146 2013-06-26 07:01:43Z fyan $ # Maintainer: Felix Yan # Contributor: monson # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.3.0 +pkgver=3.3.1 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('65af0ace6627d2ff50203d9a789f52da' +md5sums=('1e6ccf16c4695fc086581bbb95923abe' 'fe4a243fabe24608f5c05e40f0f118f6' 'bd76fc92fedce18c59ccea2aa79cc664') -- cgit v1.2.3 From 03da82a569b6150d5dc8111645560c908b8e3380 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 26 Jun 2013 22:10:52 -0300 Subject: iceweasel-libre: add work around memory address space exhaustion during linking on i686 --- libre/iceweasel-libre/PKGBUILD | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 8e1c525c3..622dfe550 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -166,6 +166,11 @@ build() { export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" + # Work around memory address space exhaustion during linking on i686 + if [[ $CARCH == i686 ]]; then + LDFLAGS+=' -Wl,--no-keep-memory' + fi + if $_pgo; then export DISPLAY=:99 Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & -- cgit v1.2.3 From 6efd8402bd9663b9e8f0fe355a17e5e8cde0264e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 27 Jun 2013 00:25:00 -0300 Subject: iceweasel-libre: fix issues on PKGBUILD and libre.patch --- libre/iceweasel-libre/PKGBUILD | 6 +++++- libre/iceweasel-libre/libre.patch | 32 +++++++++++++++----------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 622dfe550..bf6f8fe83 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -59,7 +59,7 @@ md5sums=('45d7121606cc3b21cd2797c87b5dc3bd' 'bf0440dd8c31527359d797daaf0d3edd' '2d7ac85c32df6a4ccfcc6de7a1420bf7' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '2930f3bffe0d7a6b9845f8c006821bc2' + '0bbedfc161291de9dc61c531bf062c22' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0c26941504d3f2abed759221e9bb5de1' @@ -160,6 +160,8 @@ prepare() { } build() { + export DEBIAN_BUILD="mozilla-release" + cd "$srcdir/$DEBIAN_BUILD" export PATH="$srcdir/path:$PATH" @@ -186,6 +188,8 @@ build() { } package() { + export DEBIAN_BUILD="mozilla-release" + cd "$srcdir/$DEBIAN_BUILD" make -f client.mk DESTDIR="$pkgdir" install diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 3bb39d215..b5f0a4126 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,7 +1,7 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-05-11 16:19:20.000000000 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2013-05-18 13:47:28.091097903 -0300 -@@ -1203,12 +1203,6 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2013-06-26 23:50:49.004052388 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2013-06-26 23:45:52.697802427 -0300 +@@ -1208,12 +1208,6 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -11,12 +11,12 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br -pref("social.manifest.cliqz", "{\"builtin\": \"true\",\"origin\": \"https://mozsocial.cliqz.com\",\"name\": \"Cliqz\",\"description\": \"Cliqz for Firefox Social\",\"author\": \"Cliqz\",\"homepageURL\": \"https://mozsocial.cliqz.com/\",\"version\": \"0.9\",\"workerURL\": \"https://mozsocial.cliqz.com/worker\",\"sidebarURL\": \"https://mozsocial.cliqz.com/sidebar\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wKEgkPNcdyEiIAAANaSURBVDjLVZNPUJR1HMY/39/77vLXZYFhKf4sbEKRTlrjFFIzFgtlJmQyddAmrOlgjdIAt+yQp04Wzti9sUZwPFgzOdg0sIuThaGUOBROEqLAimsoiqy77Lvvt0s09ZyeZ+Z5ntPzCKvo2w+7Poe+/YXAQeBtEINqX9gX+2JT3mKpgznT0zhwpyvaTE/jAAACQG8H7D4CJ/YZHFkA/ICi4JW01FtXWFco5NjcPxweXMN/YADw/KMyEkHEj7qKugJQQZxlR4klUEvI74o0H/hfQXc0DG8cgd7uLah5Gle1oWSt7KzYyIH1WyXotYknYHBGJDIHk/fc1tXw5lPbsIaPXuXg2aZ1Wcn5L/3OzbKkeGVTyXpa86u044lmuRC7pkOxCbGMhTGqapuKqnfqArPHrvTP9k4inZFwgSLXz8cTvnDldj0zPcXrj+5gauZPQUT7fo9KVWUJo7f/wJDi2eoACSt1yxa79VzL6Z+lK9L0yVJ65cONpW26u/ZdOT87wUJqCUln9NvpC9IQXK8dT+2Qk5NDvFq7BdsYfWton4zfu9ydbbyHbYW2omw/raGXpGf4OP6cAurL6xCF0O0Ae598hUPnTuDPd4gtzVOc6xdLLIyx6tWYLAPUPJRbzuJyhkNj/fy6cFXzvblqWbZU+AM6Mjshlf4AP8Z+I+Wm+GFmmLG743iNXSyqxlZ0xWNl54SKgnzz2kfM3YnL7L1bpB1H60qCUr6mRPOycqTS9yZluaWMLPzC3sf28P3ckDt6+1LGatjzyDaQ4ONFm/jp2hQ3kotcvxvn1uJfYtse8myvLK08IJlOUVZQSI0vpM8FnuHFsudrkunUBemKNrcLenQxZeuxcVtWXME4GVh6oJlsj3Q07NQNxdXSffYzNqzNxRjFqKXv1bZLla/yvnFd97gqA/leR8r9adRRzSSSmlFXWF7WUEGpXIxfpcAnOLpC2nVIaWp810Bb9Wh87CsB6Iy+kJVlrA8u3+X9Gzfd0Mik8+9NPF6vbq57WJJ5N7FtC4X7ItI+vL3/awDpijbR0zgIQOdguEqMmU6kVCdiLhkX2Ri0UIuxiw88EYWMoB8Pt3yXWJ2zrJLOSBOHw4N0RppeFuGkCDkArnLJQrZ+2jgwv+ptOLWN4ZbTAPwNmUptT0KshT0AAAAASUVORK5CYII=\",\"icon32URL\": \"data:image/png;base64,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\",\"icon64URL\": \"data:image/png;base64,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\"}"); -pref("social.manifest.msnnow", "{\"builtin\": \"true\",\"origin\": \"https://now.msn.com\",\"name\": \"msnNOW\",\"workerURL\": \"https://now.msn.com/js/firefoxworker\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MomNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5RjUxOThGOTJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5RjUxOThGODJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMTVCMTdDQ0M1MkFFMjExODNDRENFQTc0Q0EwNzEyMCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ppp4JKMAAABiSURBVHjaYvz//z8DJYCJgULAAmNwJEwk2Sk/FuQzUuyCUQMGgwGM+FIitrQBintKXKCG0wVA27Cl0t9IfEUgfoDmGuwuAEkAAbLzJdE14/UC1DUwOW6ggS/ICkRiAECAAQBDhCEtt+sSkAAAAABJRU5ErkJggg==\",\"icon32URL\": \"data:image/gif;base64,R0lGODlhIAAgAMQAAABgkm+lwf///y99psDY5K/N3c/h6k+RtA9pmO/1+I+5zz+HrR9zn7/X5N/r8V+bu3+vyJ/D1oCwySB0oGCcu+Ht80CIrRBqmTB+pwAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAAAgACAAAAXAICCOZGmeaKqubOu+cCzPdG3fraDvfO//OhFwSNwJi0jfUQBpKCCRnQNCdQgMDV0iK9haBcvS4ooYIZyAAjMtUAC4YUYiwQAkDgBIAgIYJAAPAnWBDAxGAEZjAgtvYYgHCAYAFpEACoeJOowNZVZ/CAIFfRcOfQBfYIhBipsPfRADgDoTshgABzxhrG8JjCILCToBb21smEUODahIS0nOzc7MAATU1dbX1qjYBDUSOhQ4JN7g4SMS5OXp6uvs7eshADs=\",\"icon64URL\": \"data:image/gif;base64, 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\",\"sidebarURL\": \"https://now.msn.com/sidebar\",\"description\": \"See what's trending in realtime on Twitter, Facebook, Bing, YouTube and more.\",\"author\": \"Microsoft\",\"homepageURL\": \"https://now.msn.com/now-for-firefox\"}"); - - pref("social.sidebar.open", true); - pref("social.sidebar.unload_timeout_ms", 10000); - pref("social.toast-notifications.enabled", true); + // comma separated list of domain origins (e.g. https://domain.com) for + // providers that can install from their own website without user warnings. + // entries are diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-05-11 16:19:20.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-20 17:49:18.467307120 -0300 +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-06-26 22:53:37.285513294 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-06-26 22:57:20.932228108 -0300 @@ -3,69 +3,41 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -130,7 +130,7 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil , "https://www.gnu.org/software/gnuzilla/addons.html" ]; -@@ -139,10 +111,6 @@ +@@ -203,10 +175,6 @@ if (searchEngineInfo.image) { let logoElt = document.getElementById("searchEngineLogo"); logoElt.src = searchEngineInfo.image; @@ -155,9 +155,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #searchText { diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-15 19:14:45.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-20 19:55:41.962705914 -0200 -@@ -3,19 +3,12 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-06-18 08:01:12.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-06-26 22:44:10.393864883 -0300 +@@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -171,17 +171,15 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio - -# This is the default set of web based feed handlers shown in the reader -# selection UI --browser.contentHandlers.types.0.title=Google --browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s --browser.contentHandlers.types.1.title=My Yahoo! --browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s +-browser.contentHandlers.types.0.title=My Yahoo! +-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s +browser.search.order.1=DuckDuckGo HTML +browser.search.order.2=DuckDuckGo Lite +browser.search.order.3=Seeks Search # 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 -@@ -24,20 +17,10 @@ +@@ -22,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 -- cgit v1.2.3 From 0538585eab1b997d6a6177f755a65baa8c98e2dd Mon Sep 17 00:00:00 2001 From: Esteban Carnevale Date: Wed, 26 Jun 2013 22:44:14 -0300 Subject: parabola-keyring-20130627-1: updating version --- libre/parabola-keyring/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index d5a1e561d..0c0b8b373 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -15,5 +15,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('ad747cf1f710e5962aa6b0931fcb580f' - 'c1030ca1c960d2ee6cfe11d798a7b471') +md5sums=('a6795678334ece49b42f1acfa7398fc9' + 'SKIP') -- cgit v1.2.3 From ad87808bfcb62195353d77fb388d71c506e2e83d Mon Sep 17 00:00:00 2001 From: Esteban Carnevale Date: Thu, 27 Jun 2013 01:11:03 -0300 Subject: parabola-keyring-20130627-1: Update again because the keys of javierbuilder and ovruni were missing. --- libre/parabola-keyring/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 0c0b8b373..d2c38b7d6 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: André Silva pkgname=parabola-keyring -pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgver=$(LC_ALL=C date -u +%Y%m%d).1 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -15,5 +15,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('a6795678334ece49b42f1acfa7398fc9' +md5sums=('007c35459478f86484f66323bf90b1e0' 'SKIP') -- cgit v1.2.3