From 4e0f274da209abe10515d3e7d4878ba5a403b396 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sun, 11 May 2014 18:22:04 -0300 Subject: update retroshare --- pcr/retroshare/PKGBUILD | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD index 36bfeb18e..f52c614c5 100644 --- a/pcr/retroshare/PKGBUILD +++ b/pcr/retroshare/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: funkyou # Set this to true to build and install retroshare-nogui -_build_nogui=false +_build_nogui=true # Set this to true to build and install the plugins _build_linkscloud=true @@ -14,20 +14,21 @@ _build_voip=true ### Nothing to be changed below this line ### pkgname=retroshare -pkgver=0.5.4e -pkgrel=3 +pkgver=0.5.5c +pkgsvn=0.7068 +pkgrel=2 pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'mips64el') url="http://retroshare.sourceforge.net/" license=('LGPL' 'GPL') depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss') install="${pkgname}.install" -source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/RetroShare-v${pkgver}.tar.gz \ +source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/${pkgname}_${pkgver::5}-${pkgsvn}.tar.gz \ ${pkgname}.install \ ${pkgname}.desktop) -sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda' +sha256sums=('772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650' '4b50547648612e9091536205402a4da9ddea9c18c0f71e5d6cd30b2226f206d9' '70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29') @@ -36,8 +37,10 @@ sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda' [[ $_build_voip == true ]] && depends=(${depends[@]} 'speex') [[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt') +_rssrcdir="${pkgname}-${pkgver::5}/src" + build() { - local _srcdir="${srcdir}/retroshare-0.5.4/src" + local _srcdir="${srcdir}/$_rssrcdir" local _qmake='qmake-qt4' msg "Compiling OpenPGP-SDK..." @@ -63,7 +66,7 @@ build() { if [[ "$_build_voip" == "true" ]] ; then msg "Compiling VOIP plugin..." cd "${_srcdir}/plugins/VOIP" - sed -i 's/lessThan.*/true {/' VOIP.pro + #sed -i 's/lessThan.*/true {/' VOIP.pro $_qmake make fi @@ -87,14 +90,14 @@ build() { cd "${_srcdir}/rsctrl/src" make cd "${_srcdir}/retroshare-nogui/src" - sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro + #sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro $_qmake make fi } package() { - local _srcdir="${srcdir}/retroshare-0.5.4/src" + local _srcdir="${srcdir}/$_rssrcdir" # --- Install Files --- @@ -144,5 +147,5 @@ package() { # Skins cp -r "${_srcdir}/retroshare-gui/src/qss" "${pkgdir}/usr/share/RetroShare/" - find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \; + #find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \; } -- cgit v1.2.3 From 248036177b39c5aaf908d7658cd1c629efd88bf6 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 11 May 2014 22:53:04 -0300 Subject: pacman-4.1.2-6: be pedantic about quoting and use -fstack-protector-strong --- libre/pacman/PKGBUILD | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 15d16466d..4f578475b 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 202690 2013-12-24 21:35:48Z dreisner $ +# $Id: PKGBUILD 211992 2014-05-04 02:54:25Z allan $ # Maintainer: Dan McGee # Maintainer: Dave Reisner pkgname=pacman pkgver=4.1.2 -pkgrel=5.2 +pkgrel=6 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -33,7 +33,7 @@ md5sums=('063c8b0ff6bdf903dc235445525627cd' 'f0f310df411f943dbc4e2dd376c88662') build() { - cd $srcdir/$pkgname-$pkgver + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-doc \ @@ -48,47 +48,48 @@ check() { } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - make DESTDIR=$pkgdir -C contrib install + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C contrib install # install Arch specific stuff - install -dm755 $pkgdir/etc - install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf - - case "$CARCH" in + install -dm755 "$pkgdir/etc" + install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf" + + case $CARCH in i686) mycarch="i686" mychost="i686-pc-linux-gnu" - myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" + myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu" ;; x86_64) mycarch="x86_64" mychost="x86_64-unknown-linux-gnu" - myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" + myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu" ;; mips64el) mycarch="mips64el" mychost="mips64el-unknown-linux-gnu" - myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4" + myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector-strong --param=ssp-buffer-size=4" myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro" ;; esac - install -m644 $srcdir/makepkg.conf $pkgdir/etc/ + # set things correctly in the default conf file - sed -i $pkgdir/etc/makepkg.conf \ + install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc" + sed -i "$pkgdir/etc/makepkg.conf" \ -e "s|@CARCH[@]|$mycarch|g" \ -e "s|@CHOST[@]|$mychost|g" \ -e "s|@LDFLAGS[@]|$myldflags|g" \ -e "s|@CARCHFLAGS[@]|$myflags|g" - + # put bash_completion in the right location - install -dm755 ${pkgdir}/usr/share/bash-completion/completions - mv ${pkgdir}/etc/bash_completion.d/pacman \ - ${pkgdir}/usr/share/bash-completion/completions - rmdir ${pkgdir}/etc/bash_completion.d + install -dm755 "$pkgdir/usr/share/bash-completion/completions" + mv "$pkgdir/etc/bash_completion.d/pacman" "$pkgdir/usr/share/bash-completion/completions" + rmdir "$pkgdir/etc/bash_completion.d" for f in makepkg pacman-key; do ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f" -- cgit v1.2.3 From b9dd965fd2bdf4388b48181032d059a56fb4fac7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 11 May 2014 22:58:39 -0300 Subject: cups-filters-libre-1.0.53-2: poppler 0.26.0 rebuild --- libre/cups-filters-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 6bef7096c..f41ab02e0 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -4,7 +4,7 @@ pkgname=cups-filters-libre _pkgname=cups-filters pkgver=1.0.53 -pkgrel=1 +pkgrel=2 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -- cgit v1.2.3 From c6faf25856d75adaf83cf8f74baa775c1d2839dd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 11 May 2014 23:00:59 -0300 Subject: doublecmd-libre-0.5.9-2: rebuild fixes FS#40230 => https://bugs.archlinux.org/task/40230 --- libre/doublecmd-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index ad04bab90..17b1aef3f 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -1,5 +1,5 @@ # vim:set ft=sh: -# $Id: PKGBUILD 108140 2014-03-23 19:43:34Z idevolder $ +# $Id: PKGBUILD 110952 2014-05-10 14:08:05Z idevolder $ # Maintainer: BlackIkeEagle # Contributor: (sirocco AT ngs.ru) @@ -8,7 +8,7 @@ pkgbase=doublecmd-libre pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt') pkgver=0.5.9 _helpver=0.5.5 -pkgrel=1.2 +pkgrel=2 url="http://doublecmd.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') -- cgit v1.2.3 From 575127b3d909f886e87526c3e9369fe690d862c2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 11 May 2014 23:25:18 -0300 Subject: grub-1:2.02.beta2-3: remove 09_parabola config --- libre/grub/10_linux.in.patch | 31 ------------- libre/grub/PKGBUILD | 20 ++++---- .../grub-10_linux-detect-parabola-initramfs.patch | 54 ++++++++++++++++++++++ .../grub/grub-10_linux-rebrand-free-distros.patch | 31 +++++++++++++ 4 files changed, 96 insertions(+), 40 deletions(-) delete mode 100644 libre/grub/10_linux.in.patch create mode 100644 libre/grub/grub-10_linux-detect-parabola-initramfs.patch create mode 100644 libre/grub/grub-10_linux-rebrand-free-distros.patch diff --git a/libre/grub/10_linux.in.patch b/libre/grub/10_linux.in.patch deleted file mode 100644 index c9285e699..000000000 --- a/libre/grub/10_linux.in.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nur grub.orig/util/grub.d/10_linux.in grub/util/grub.d/10_linux.in ---- grub.orig/util/grub.d/10_linux.in 2014-01-11 06:07:40.750886565 -0200 -+++ grub/util/grub.d/10_linux.in 2014-01-11 06:14:19.032955542 -0200 -@@ -30,8 +30,25 @@ - - if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux --else -- OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then -+ OS="${GRUB_DISTRIBUTOR} Linux and GNU" -+ elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then -+ OS="${GRUB_DISTRIBUTOR} Linux and GNU" -+ elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then -+ OS="${GRUB_DISTRIBUTOR} GNU+Linux" -+ elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then -+ OS="${GRUB_DISTRIBUTOR} GNU+Linux" -+ elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ else -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ fi - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" - fi - diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index ecf9bade2..b7b7b80bd 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -15,7 +15,7 @@ _UNIFONT_VER="6.3.20131217" pkgname="grub" pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.02.beta2 -pkgrel=2.1 +pkgrel=3 epoch="1" url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') @@ -43,22 +43,23 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG} "grub-extras::git+git://git.sv.gnu.org/grub-extras.git#branch=master" "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz" "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig" + 'grub-10_linux-detect-parabola-initramfs.patch' 'grub-add-GRUB_COLOR_variables.patch' - '09_parabola' '60_memtest86+' 'grub.default' - '10_linux.in.patch') + 'grub-10_linux-rebrand-free-distros.patch') + md5sums=('SKIP' 'SKIP' '728b7439ac733a7c0d56049adec364c7' 'SKIP' + '945527e0de8d384166a4cf23439ae9ee' 'e506ae4a9f9f7d1b765febfa84e10d48' - '9f67330f2979a153acb32af706e0c094' 'be55eabc102f2c60b38ed35c203686d6' '52d374e0194e3f2e39ff7c92ecd58a6c' 'b23a144b7001c88734b79ed3bec491c4') -pkgver() { +_pkgver() { cd "${srcdir}/grub-${_pkgver}/" echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g' } @@ -67,6 +68,10 @@ prepare() { cd "${srcdir}/grub-${_pkgver}/" + msg "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig" + patch -Np1 -i "${srcdir}/grub-10_linux-detect-parabola-initramfs.patch" + echo + msg "Patch to enable GRUB_COLOR_* variables in grub-mkconfig" ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html patch -Np1 -i "${srcdir}/grub-add-GRUB_COLOR_variables.patch" @@ -76,7 +81,7 @@ prepare() { sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac" msg "Rebranding for some free distros" - patch -Np1 -i "${srcdir}/10_linux.in.patch" + patch -Np1 -i "${srcdir}/grub-10_linux-rebrand-free-distros.patch" echo msg "Fix mkinitcpio 'rw' FS#36275" @@ -237,9 +242,6 @@ _package_grub-common_and_bios() { rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true - msg "Install 09_parabola helper script for grub-mkconfig" - install -D -m0755 "${srcdir}/09_parabola" "${pkgdir}/etc/grub.d/09_parabola" - msg "Install extra /etc/grub.d/ files" install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" diff --git a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch new file mode 100644 index 000000000..18d9d520c --- /dev/null +++ b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch @@ -0,0 +1,54 @@ +From b470ffd22e43acc7c11231180187a720efd88de1 Mon Sep 17 00:00:00 2001 +From: Keshav Amburay +Date: Sat, 5 Apr 2014 20:40:51 -0400 +Subject: [PATCH] 10_linux: Detect Arch Linux main and fallback initramfs + images + +--- + util/grub.d/10_linux.in | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 00d1931..7d4086b 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -81,6 +81,8 @@ linux_entry () + case $type in + recovery) + title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; ++ fallback) ++ title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;; + *) + title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; + esac +@@ -180,7 +182,7 @@ while [ "x$list" != "x" ] ; do + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` +- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` ++ version=`echo $basename | sed -e "s,vmlinuz-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + +@@ -236,6 +238,18 @@ while [ "x$list" != "x" ] ; do + + linux_entry "${OS}" "${version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ ++ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then ++ initrd="initramfs-${version}-fallback.img" ++ ++ if test -n "${initrd}" ; then ++ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 ++ fi ++ ++ linux_entry "${OS}" "${version}" fallback \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ fi ++ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" +-- +1.9.1 + diff --git a/libre/grub/grub-10_linux-rebrand-free-distros.patch b/libre/grub/grub-10_linux-rebrand-free-distros.patch new file mode 100644 index 000000000..c9285e699 --- /dev/null +++ b/libre/grub/grub-10_linux-rebrand-free-distros.patch @@ -0,0 +1,31 @@ +diff -Nur grub.orig/util/grub.d/10_linux.in grub/util/grub.d/10_linux.in +--- grub.orig/util/grub.d/10_linux.in 2014-01-11 06:07:40.750886565 -0200 ++++ grub/util/grub.d/10_linux.in 2014-01-11 06:14:19.032955542 -0200 +@@ -30,8 +30,25 @@ + + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux +-else +- OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then ++ OS="${GRUB_DISTRIBUTOR} Linux and GNU" ++ elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then ++ OS="${GRUB_DISTRIBUTOR} Linux and GNU" ++ elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU+Linux" ++ elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU+Linux" ++ elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ else ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ fi + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" + fi + -- cgit v1.2.3 From 4dc53a369d9ea34ca6d6966d47e8cd667efba273 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 11 May 2014 23:33:10 -0300 Subject: ice{cat,weasel}-firebug-1.12.8-1: updating version --- libre/icecat-firebug/PKGBUILD | 8 +++----- libre/iceweasel-firebug/PKGBUILD | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libre/icecat-firebug/PKGBUILD b/libre/icecat-firebug/PKGBUILD index a6ae920fd..838440097 100644 --- a/libre/icecat-firebug/PKGBUILD +++ b/libre/icecat-firebug/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108086 2014-03-22 15:16:00Z speps $ +# $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $ # Maintainer: speps pkgname=icecat-firebug -pkgver=1.12.7 +pkgver=1.12.8 pkgrel=1 pkgdesc="IceCat plugin with tools for web development." arch=(any) @@ -12,11 +12,9 @@ groups=('icecat-addons') depends=('icecat') provides=('firebug' firefox-firebug=$pkgver) source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi") -md5sums=('4d1580a5f6cee3c24c7deedd14a60862') +md5sums=('b93528ff22c76f6c3f63f81fe5e49496') package() { - cd "$srcdir" - # extension _dest="$pkgdir/usr/lib/icecat/browser/extensions/firebug@software.joehewitt.com" find . -type d -exec install -d {} $_dest/{} \; diff --git a/libre/iceweasel-firebug/PKGBUILD b/libre/iceweasel-firebug/PKGBUILD index f57abe28d..73eb462d4 100644 --- a/libre/iceweasel-firebug/PKGBUILD +++ b/libre/iceweasel-firebug/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108086 2014-03-22 15:16:00Z speps $ +# $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $ # Maintainer: speps pkgname=iceweasel-firebug -pkgver=1.12.7 +pkgver=1.12.8 pkgrel=1 pkgdesc="Iceweasel plugin with tools for web development." arch=(any) @@ -12,11 +12,9 @@ groups=('iceweasel-addons') depends=('iceweasel-libre') provides=('firebug' firefox-firebug=$pkgver) source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi") -md5sums=('4d1580a5f6cee3c24c7deedd14a60862') +md5sums=('b93528ff22c76f6c3f63f81fe5e49496') package() { - cd "$srcdir" - # extension _dest="$pkgdir/usr/lib/iceweasel/browser/extensions/firebug@software.joehewitt.com" find . -type d -exec install -d {} $_dest/{} \; -- cgit v1.2.3 From 737ca56b4c567741c18c6ff94b76daae32446567 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 11 May 2014 23:44:22 -0300 Subject: linux-libre-grsec-3.14.3.201405101947-1: updating version --- libre/linux-libre-grsec/PKGBUILD | 8 ++++---- libre/linux-libre-grsec/config.i686 | 4 ++-- libre/linux-libre-grsec/config.x86_64 | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 5d1d2da74..a2b1c5b96 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -14,7 +14,7 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel _basekernel=3.14 _sublevel=3 _grsecver=3.0 -_timestamp=201405071928 +_timestamp=201405101947 _pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel}.${_sublevel}.${_timestamp} pkgrel=1 @@ -51,10 +51,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'fcd8398a41a7e55e44123857342fd9041ae1bdacbcf8c5099a53293c96e6fba6' - 'ca5bd99e3ee12836e2442c096fa2af7fdf9f75f750a471a0c0e981b08abdd330' + '5b47c06c61ed7c5655e31bc4ac221d4e605163b90bf3ee95a891466825597f78' 'SKIP' - '16ee96f4e9c5686f5fc72242932e872b26c5ad7c8b8c022ff2a3fe68f6c1a6f0' - 'ea3eec6e11c4feda78493c15c89defcfa482597d069b3c7c9b7bf60121d24ad7' + '0b6dbdf4d1677a39b9a0d55e8d7c66fe644fa77d769e3b673064181222b17467' + 'e3d67cfeb02e92c9fcb9ef729422e4dff938071706394d9e451a2ebe04e2c9a4' '9d2f34f1a8c514a7117b9b017a1f7312fb351f4d0b079eed102f89361534d486' 'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b' '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9' diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686 index fc977efe5..845032842 100644 --- a/libre/linux-libre-grsec/config.i686 +++ b/libre/linux-libre-grsec/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.2-1 Kernel Configuration +# Linux/x86 3.14.3-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -6221,7 +6221,7 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_DEBUG_HIGHMEM is not set CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -# CONFIG_DEBUG_STACKOVERFLOW is not set +CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_DEBUG_SHIRQ is not set diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64 index d1e29cf01..68986d57c 100644 --- a/libre/linux-libre-grsec/config.x86_64 +++ b/libre/linux-libre-grsec/config.x86_64 @@ -6002,7 +6002,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -# CONFIG_DEBUG_STACKOVERFLOW is not set +CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_DEBUG_SHIRQ is not set -- cgit v1.2.3 From 7ed6d7bc556b96d62cc514f4a79eefa71e9b3172 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 11 May 2014 23:54:26 -0300 Subject: nss-3.16.1-1: updating version --- libre/nss/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/nss/PKGBUILD b/libre/nss/PKGBUILD index 218c331b2..1344d4194 100644 --- a/libre/nss/PKGBUILD +++ b/libre/nss/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 209930 2014-04-09 10:55:26Z jgc $ +# $Id: PKGBUILD 212171 2014-05-09 18:25:02Z jgc $ # Maintainer: Jan de Groot # Maintainer (Parabola): André Silva # Contributor (Parabola): Luke Shumaker pkgname=nss -pkgver=3.16 -pkgrel=1.1 +pkgver=3.16.1 +pkgrel=1 pkgdesc="Mozilla Network Security Services, with CAcert CA certificates support" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.10.4 +_nsprver=4.10.5 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip' '!makeflags' 'staticlibs') @@ -19,7 +19,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s nss-config.in ssl-renegotiate-transitional.patch add_cacert_ca_certs.patch) -sha1sums=('981dc6ef2f1e69ec7e2b277ce27c7005e9837f95' +sha1sums=('450a88dde8c7e4533507ac8340dbf94be28a759b' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' '8a964a744ba098711b80c0d279a2993524e8eb92' -- cgit v1.2.3 From c579f1016d2a4cd154fb7f0528876e9b6c1a18d9 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 12 May 2014 00:03:34 -0300 Subject: sdl-libre-1.2.15-6: missing symbol FS#40292 => https://bugs.archlinux.org/task/40292 --- libre/sdl-libre/PKGBUILD | 11 ++++--- libre/sdl-libre/X11_KeyToUnicode.patch | 52 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 libre/sdl-libre/X11_KeyToUnicode.patch diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index 21250fa60..18356ed03 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198628 2013-10-31 13:07:39Z heftig $ +# $Id: PKGBUILD 212210 2014-05-10 21:41:06Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: dorphell @@ -8,7 +8,7 @@ pkgname=sdl-libre pkgver=1.2.15 -pkgrel=5 +pkgrel=6 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard, without nonfree riva_mmio.h file" arch=('i686' 'x86_64') url="http://www.libsdl.org" @@ -28,7 +28,8 @@ source=(https://repo.parabolagnulinux.org/other/$pkgname/SDL-libre-${pkgver}.tar sdl-1.2.14-disable-mmx.patch fix_joystick_misc_axes.diff libsdl-1.2.15-resizing.patch - sdl_x11sym.patch) + sdl_x11sym.patch + X11_KeyToUnicode.patch) mkmd5sums=('9d96df8417572a2afb781a7c4c811a85' '5c665f72b8a2adc97a91f6db6f2da79a') md5sums=('c6e53ef16fa347ed066c3d68fe93c378' @@ -36,7 +37,8 @@ md5sums=('c6e53ef16fa347ed066c3d68fe93c378' 'e5c16b7611f62c7cb25f0534eff68852' '687586a108b597a2a6b73070c1d37e51' '3dd50347d8856160a9cbd7f80383a1f8' - '148b285bccee9d21bb96db807363b962') + '148b285bccee9d21bb96db807363b962' + 'edea272dff4698470877c016d818918d') mksource() { cd SDL-$pkgver @@ -50,6 +52,7 @@ prepare() { patch -Np1 -i ../fix_joystick_misc_axes.diff patch -Np1 -i ../libsdl-1.2.15-resizing.patch patch -Np0 -i ../sdl_x11sym.patch + patch -Np1 -i ../X11_KeyToUnicode.patch } build() { diff --git a/libre/sdl-libre/X11_KeyToUnicode.patch b/libre/sdl-libre/X11_KeyToUnicode.patch new file mode 100644 index 000000000..5f0f325b1 --- /dev/null +++ b/libre/sdl-libre/X11_KeyToUnicode.patch @@ -0,0 +1,52 @@ + +# HG changeset patch +# User Sam Lantinga +# Date 1327258041 18000 +# Node ID 900a0fae90ca65cff55a70a17b9ec39d2ddccbcf +# Parent 5273dfd19a5e8c5736a0d417bd441f704c5355f8 +Fixed bug 1390 - X11_KeyToUnicode + +manuel.montezelo 2012-01-22 08:56:18 PST + +We had the following bug report at Debian: +http://bugs.debian.org/376560 + +Same one in Ubuntu: +https://bugs.launchpad.net/ubuntu/+source/libsdl1.2/+bug/66217 + +We've been including a patch since then (attached) to actually export the +symbol, since 2006. In the last release the function seems to be there, alive +and kicking. + +It's affecting other people too: +http://www.garagegames.com/community/forums/viewthread/52287 + +diff -r 5273dfd19a5e -r 900a0fae90ca src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Sat Jan 21 12:06:51 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Sun Jan 22 13:47:21 2012 -0500 +@@ -1246,8 +1246,11 @@ + * sequences (dead accents, compose key sequences) will not work since the + * state has been irrevocably lost. + */ ++extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod); ++ + Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers) + { ++ static int warning = 0; + struct SDL_VideoDevice *this = current_video; + char keybuf[32]; + int i; +@@ -1255,6 +1258,12 @@ + XKeyEvent xkey; + Uint16 unicode; + ++ if ( warning ) { ++ warning = 0; ++ fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n"); ++ fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n"); ++ } ++ + if ( !this || !SDL_Display ) { + return 0; + } + -- cgit v1.2.3 From 92306b387305e9962be2e72b85a0a187db26f3f8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 12 May 2014 00:10:04 -0300 Subject: spectrwm-libre-2.5.1-1: updating version --- libre/spectrwm-libre/PKGBUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD index c1ea8c449..2a45650fe 100644 --- a/libre/spectrwm-libre/PKGBUILD +++ b/libre/spectrwm-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106288 2014-02-26 16:09:20Z kkeen $ +# $Id: PKGBUILD 110857 2014-05-08 17:25:29Z kkeen $ # Maintainer: Kyle Keen # Contributor: Christoph Zeiler _pkgname=spectrwm pkgname=spectrwm-libre -pkgver=2.5.0 +pkgver=2.5.1 pkgrel=1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,15 @@ replaces=('spectrwm' 'scrotwm') conflicts=('spectrwm') provides=("spectrwm=$pkgver") makedepends=('libxt') -optdepends=('scrot: screenshots' 'xlockmore: great screenlocker' 'terminus-font: great font') +optdepends=('scrot: screenshots' + 'xlockmore: great screenlocker' + 'terminus-font: great font') backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ LICENSE \ baraction.sh \ spectrwm-no-preload) -md5sums=('22355256693393779b2d366d312c4577' +md5sums=('d9aec3342920e31cbe60f1032571043a' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e' '974d109ce0af39cc73936d5efd682480') -- cgit v1.2.3 From ccb16fe5fb0ed87b6207cc93ea1efea0dd628632 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 12 May 2014 00:11:20 -0300 Subject: texlive-bin-libre-2013.30973-10: poppler rebuild, fetch patch from upstream --- libre/texlive-bin-libre/PKGBUILD | 10 +-- libre/texlive-bin-libre/poppler-0.26.patch | 104 +++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 libre/texlive-bin-libre/poppler-0.26.patch diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 7d35d83e9..783aef934 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 209906 2014-04-08 07:50:23Z fyan $ +# $Id: PKGBUILD 211863 2014-04-28 15:07:05Z jgc $ # Maintainer: Rémy Oudompheng # Contributor: francois # Maintainer (Parabola): Michał Masłowski @@ -6,11 +6,11 @@ pkgname=texlive-bin-libre pkgver=2013.30973 -pkgrel=9 +pkgrel=10 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.4' +depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2' 'icu' 'harfbuzz' 'harfbuzz-icu') makedepends=('perl' 'clisp' 'ffcall') @@ -23,9 +23,11 @@ url='http://tug.org/texlive/' install="texlive.install" source=('fix-fontforge-encoding.patch' "http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz" + poppler-0.26.patch ) md5sums=('bfb9716aa00c86c08cd31e5b32edeb98' - '0a8ffd5c0002a080a4202057b1f106c6') + '0a8ffd5c0002a080a4202057b1f106c6' + '65f5eef04fdf65fe8ff2df873509c855') build() { cd "$srcdir" diff --git a/libre/texlive-bin-libre/poppler-0.26.patch b/libre/texlive-bin-libre/poppler-0.26.patch new file mode 100644 index 000000000..fde123f62 --- /dev/null +++ b/libre/texlive-bin-libre/poppler-0.26.patch @@ -0,0 +1,104 @@ +--- trunk/source/texk/web2c/luatexdir/image/epdf.h 2013/01/20 19:58:26 4559 ++++ trunk/source/texk/web2c/luatexdir/image/epdf.h 2014/01/02 15:35:31 4718 +@@ -40,21 +40,22 @@ + # include + # include + # include +-# include "Object.h" +-# include "Stream.h" +-# include "Gfx.h" +-# include "Annot.h" +-# include "Array.h" +-# include "Dict.h" +-# include "XRef.h" +-# include "Catalog.h" +-# include "Link.h" +-# include "Page.h" +-# include "GfxFont.h" +-# include "PDFDoc.h" +-# include "GlobalParams.h" +-# include "Error.h" +-# include "FileSpec.h" ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include + + extern "C" { + +@@ -81,8 +82,8 @@ + # include "utils/avlstuff.h" + # include "pdf/pdftypes.h" + +-# include "lua52/lua.h" +-# include "lua52/lauxlib.h" ++# include "lua.h" ++# include "lauxlib.h" + + /* pdfgen.w */ + extern int ten_pow[10]; +--- trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc 2013/04/05 10:54:08 4629 ++++ trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc 2014/01/02 15:35:31 4718 +@@ -65,6 +65,7 @@ + #define M_PDFRectangle "PDFRectangle" + #define M_Ref "Ref" + #define M_Stream "Stream" ++#define M_StructTreeRoot "StructTreeRoot" + #define M_XRefEntry "XRefEntry" + #define M_XRef "XRef" + +@@ -96,6 +97,7 @@ + new_poppler_userdata(PDFRectangle); + new_poppler_userdata(Ref); + new_poppler_userdata(Stream); ++new_poppler_userdata(StructTreeRoot); + new_poppler_userdata(XRef); + + //********************************************************************** +@@ -573,7 +575,11 @@ + + m_poppler_get_GOOSTRING(Catalog, getBaseURI); + m_poppler_get_GOOSTRING(Catalog, readMetadata); ++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT + m_poppler_get_poppler(Catalog, Object, getStructTreeRoot); ++#else ++m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot); ++#endif + + static int m_Catalog_findPage(lua_State * L) + { +@@ -2146,14 +2152,22 @@ + + static int m_PDFDoc_getStructTreeRoot(lua_State * L) + { ++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT + Object *obj; ++#else ++ StructTreeRoot *obj; ++#endif + udstruct *uin, *uout; + uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); + if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { + obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot(); ++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT + uout = new_Object_userdata(L); ++#else ++ uout = new_StructTreeRoot_userdata(L); ++#endif + uout->d = obj; + uout->pc = uin->pc; + uout->pd = uin->pd; -- cgit v1.2.3 From 07098cbd89606a21625cbbbba2f1d937d2ebf269 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 12 May 2014 00:24:19 -0300 Subject: xarchiver-libre-0.5.3-4: updating revision from Arch * fix desktop file FS#40318 => https://bugs.archlinux.org/task/40318 * fix deb mime type FS#40315 => https://bugs.archlinux.org/task/40315 --- libre/xarchiver-libre/PKGBUILD | 6 +++--- .../xarchiver-0.5.3-add-mime-types.patch | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index 75499428b..478f5ef6b 100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105928 2014-02-19 11:27:15Z bgyorgy $ +# $Id: PKGBUILD 111012 2014-05-12 01:13:40Z bgyorgy $ # Maintainer: Balló György # Contributor: Alexander Fehr # Contributor: Andrew Simmons @@ -7,7 +7,7 @@ _pkgname=xarchiver pkgname=xarchiver-libre pkgver=0.5.3 -pkgrel=1.1 +pkgrel=4 pkgdesc="GTK+ frontend to various command line archivers, without nonfree unrar support" arch=('i686' 'x86_64' 'mips64el') url="http://xarchiver.sourceforge.net/" @@ -34,7 +34,7 @@ md5sums=('fd390bbd2df76a5f8a007bdeae82d4aa' '812b93339f5e3332621f3c5abebfe277' '6178d7ab679b761469c880a8db991907' '35ab96d98521a0a36f3e9e9ec0969107' - 'f9119f5290caa195a56b7d3c63d9137d' + '0cee887b3c989ba2cdce9154813843fb' '6ba9f6a6dd9685d8309bd9ed4df1f339') prepare() { diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch b/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch index 4552e5b96..ec427b99a 100644 --- a/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch +++ b/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch @@ -1,9 +1,17 @@ -diff -Naur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.2/xarchiver.desktop.in ---- xarchiver-0.5.3.orig/xarchiver.desktop.in 2014-01-24 04:05:33.438561000 +0100 -+++ xarchiver-0.5.3/xarchiver.desktop.in 2014-01-24 04:44:00.625750394 +0100 -@@ -11,4 +11,4 @@ +diff -Naur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.3/xarchiver.desktop.in +--- xarchiver-0.5.3.orig/xarchiver.desktop.in 2014-05-12 01:08:12.159131913 +0000 ++++ xarchiver-0.5.3/xarchiver.desktop.in 2014-05-12 01:09:02.585526393 +0000 +@@ -4,11 +4,11 @@ + _Name=Xarchiver + _Comment=A GTK+2 only archive manager + _GenericName=Archive manager +-Exec=xarchiver ++Exec=xarchiver %f + Icon=xarchiver + Terminal=false + Type=Application X-MultipleArgs=false Categories=GTK;Archiving;Utility; StartupNotify=true -MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar; -+MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-debian-package;application/x-rpm; ++MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm; -- cgit v1.2.3 From 83af2368dd362934f3ba1d4584cc27167ac8bd8d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 12 May 2014 00:32:12 -0300 Subject: duplicity-nonprism-0.6.24-1: updating version --- nonprism/duplicity-nonprism/PKGBUILD | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/nonprism/duplicity-nonprism/PKGBUILD b/nonprism/duplicity-nonprism/PKGBUILD index 79163db90..21dfe9a47 100644 --- a/nonprism/duplicity-nonprism/PKGBUILD +++ b/nonprism/duplicity-nonprism/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105458 2014-02-08 15:39:04Z bgyorgy $ +# $Id: PKGBUILD 110919 2014-05-09 15:34:16Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Kaiting Chen # Contributor: Aaron Schaefer @@ -6,13 +6,17 @@ _pkgname=duplicity pkgname=duplicity-nonprism -pkgver=0.6.23 -pkgrel=3 +pkgver=0.6.24 +pkgrel=1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-gdata recommendation' arch=('i686' 'x86_64') url='http://www.nongnu.org/duplicity/' license=('GPL') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko' 'python2-lockfile') +makedepends=('python2-setuptools') optdepends=('lftp: FTPS backend' 'python2-boto: Amazon S3 backend' 'python2-gobject: GIO backend' @@ -20,21 +24,9 @@ optdepends=('lftp: FTPS backend' 'python2-httplib2: Ubuntu One backend' 'python2-oauthlib: Ubuntu One backend' 'rsync: rsync backend') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -source=("http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.sig} - "gpg-encode.patch") -md5sums=('ae0e84446bcf114735de1057ed53c977' - 'SKIP' - '366555c73aeebf7f15f6f37ec65176ce') - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # Fix gpg encrypted backup (FS#38838, upstream revision 961, will be fixed in 0.6.24). - patch -Np0 -i ../gpg-encode.patch -} +source=("https://launchpad.net/$_pkgname/0.6-series/$pkgver/+download/$_pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('5d4e9329a6d793880909d18b0736ff06' + 'SKIP') build() { cd "${srcdir}/${_pkgname}-${pkgver}" -- cgit v1.2.3