diff options
35 files changed, 759 insertions, 369 deletions
diff --git a/community/addinclude/PKGBUILD b/community/addinclude/PKGBUILD new file mode 100644 index 000000000..edb5f73d8 --- /dev/null +++ b/community/addinclude/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 87598 2013-04-03 23:28:26Z arodseth $ +# Maintainer: Alexander R�dseth <rodseth@gmail.com> + +pkgname=addinclude +pkgver=0.9 +pkgrel=8 +pkgdesc='Utility to add includes to C header- and sourcefiles' +arch=('x86_64' 'i686') +url='http://addinclude.roboticoverlords.org/' +license=('GPL') +makedepends=('go') +source=("http://$pkgname.roboticoverlords.org/$pkgname-$pkgver.tbz2") +sha256sums=('8d88014b4b166d808892f433ce12e3ee683101af5e31886faa52a44cc6f7b451') +options=('zipman') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + source /etc/profile.d/go.sh + go build -o "$pkgname" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -Dm755 "$pkgname" \ + "$pkgdir/usr/bin/$pkgname" + install -Dm644 "$pkgname.1.gz" \ + "$pkgdir/usr/share/man/man1/$pkgname.1.gz" + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/bumblebee/PKGBUILD b/community/bumblebee/PKGBUILD new file mode 100644 index 000000000..ce7c6231b --- /dev/null +++ b/community/bumblebee/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=bumblebee +pkgver=3.1 +pkgrel=5 +pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" +arch=('i686' 'x86_64') +depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl') +optdepends=('xf86-video-nouveau: nouveau driver' + 'nouveau-dri: 3D acceleration features fo nouveau' + 'bbswitch: switch on/off discrete card' + 'nvidia: NVIDIA kernel driver' + 'primus: faster back-end for optirun') +if [ "$CARCH" = "x86_64" ]; then + optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun' + optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun' +fi +conflicts=('nvidia-libgl') +provides=('nvidia-libgl') +url="http://www.bumblebee-project.org" +license=("GPL3") +install='bumblebee.install' +backup=('etc/bumblebee/bumblebee.conf' + 'etc/bumblebee/xorg.conf.nouveau' + 'etc/bumblebee/xorg.conf.nvidia') +source=("http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz") +md5sums=('de515ef51b1e0714c2f1b2a95f83e77e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + CONF_DRIVER_MODULE_NVIDIA=nvidia \ + CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia \ + CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg/,/usr/lib/xorg/modules \ + --prefix=/usr \ + --sysconfdir=/etc + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make install DESTDIR="$pkgdir" + + # Install systemd unit + install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" + + # Make bash_completion work + mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun" +} diff --git a/community/bumblebee/bumblebee.install b/community/bumblebee/bumblebee.install new file mode 100644 index 000000000..57aed6cc5 --- /dev/null +++ b/community/bumblebee/bumblebee.install @@ -0,0 +1,16 @@ +_notice() { + echo "Don't forget to add yourself to the 'bumblebee' group to use Bumblebee" +} + +post_upgrade() { + getent group "bumblebee" &>/dev/null || groupadd -r bumblebee +} + +post_remove() { + getent group "bumblebee" &>/dev/null && groupdel bumblebee 1>/dev/null +} + +post_install() { + post_upgrade + _notice +} diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD index f9c048453..dcafef450 100644 --- a/community/ettercap/PKGBUILD +++ b/community/ettercap/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 84410 2013-02-18 19:27:41Z jelle $ +# $Id: PKGBUILD 87630 2013-04-04 10:17:39Z jelle $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=ettercap pkgname=('ettercap' 'ettercap-gtk') -pkgver=0.7.5.3 -pkgrel=2 +pkgver=0.7.6 +pkgrel=1 arch=('i686' 'x86_64') url="http://ettercap.github.com/ettercap/" license=('GPL') +depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet') makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2') options=('!libtool' '!makeflags' '!emptydirs') -source=("http://sourceforge.net/projects/ettercap/files/ettercap/0.7.5-Assimilation/$pkgname-$pkgver.tar.gz") -md5sums=('784b5cf2493246e95943179b21f70645') +source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" "ettercap.desktop" "org.archlinux.pkexec.ettercap.policy") +md5sums=('7c5f5e1fd4002afdfd13765ef92866e1') build() { cd "${srcdir}" @@ -33,7 +34,6 @@ build() { package_ettercap() { pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" - depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet') backup=('etc/ettercap/etter.conf') conflicts=('ettercap-gtk') @@ -47,7 +47,27 @@ package_ettercap-gtk() { backup=('etc/ettercap/etter.conf') conflicts=('ettercap') provides=('ettercap') +#install='ettercap-gtk.install' + install -d $pkgdir/usr/share/polkit-1/actions/ cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build make DESTDIR="${pkgdir}" install + +# install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop" +# install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg" + + # Install policy file +# install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy" + + # We need rename the original script +# mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf" + + # Install launcher script +# echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap +#echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap +# chmod 755 ${pkgdir}/usr/bin/ettercap + } +md5sums=('7c5f5e1fd4002afdfd13765ef92866e1' + '21fe8aee8c7eb34bd5757a4de485ca06' + 'd20a6137008edd3fae01757cb193b870') diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install index 0b09f5904..100a94efe 100644 --- a/community/ettercap/ettercap-gtk.install +++ b/community/ettercap/ettercap-gtk.install @@ -1,4 +1,8 @@ post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + echo 'If you use a lightweight windowmanager, remember to run' + echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable' + echo 'graphical authentication, which may be needed for pkexec to work.' } post_upgrade() { diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop index e2345d91a..7ea54b7c7 100644 --- a/community/ettercap/ettercap.desktop +++ b/community/ettercap/ettercap.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Ettercap Comment=Nework sniffer/analyser -Exec=ettercap-gtk +Exec=ettercap Icon=ettercap Terminal=false Type=Application diff --git a/community/ettercap/org.archlinux.pkexec.ettercap.policy b/community/ettercap/org.archlinux.pkexec.ettercap.policy new file mode 100644 index 000000000..101b11a0f --- /dev/null +++ b/community/ettercap/org.archlinux.pkexec.ettercap.policy @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE policyconfig PUBLIC +"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" +"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> +<policyconfig> + +<action id="com.archlinux.pkexec.ettercap"> +<message gettext-domain="ettercap"> Authentication is required to run the Ettercap</message> +<icon_name>ettercap</icon_name> +<defaults> +<allow_any > auth_admin < /allow_any> +<allow_inactive>auth_admin</allow_inactive> +<allow_active>auth_admin</allow_active> +</defaults> +<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ettercap.elf</annotate> +<annotate key="org.freedesktop.policykit.exec.allow_gui">true< /annotate> +</action> +</policyconfig> diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 55f0fca4b..72aee9d8e 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85351 2013-03-01 10:31:49Z andrea $ +# $Id: PKGBUILD 87641 2013-04-04 13:30:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,8 +6,8 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.4.0 -pkgrel=2 +pkgver=1.5.5.1 +pkgrel=1 arch=("i686" "x86_64") url="http://gmic.sourceforge.net" license=("custom:CeCILL") @@ -15,7 +15,7 @@ makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2') #options=('!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" "opencv-buildfix.patch") -md5sums=('a686719a663b856d4a8b1611d2c90df5' +md5sums=('ec68076448166ea18d15c0a69489dd25' '120319b0d6c81c5af186abe2281b79ca') build() { @@ -23,6 +23,7 @@ build() { patch -p1 -i "${srcdir}/opencv-buildfix.patch" find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \; find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; + sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|' src/Makefile make -C src all } diff --git a/community/macchanger/PKGBUILD b/community/macchanger/PKGBUILD index 75d158809..6992f1f08 100644 --- a/community/macchanger/PKGBUILD +++ b/community/macchanger/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 82851 2013-01-25 02:08:04Z kkeen $ +# $Id: PKGBUILD 87606 2013-04-04 02:46:04Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=macchanger -pkgver=1.5.0 -pkgrel=6 +pkgver=1.6.0 +pkgrel=1 pkgdesc="A small utility to change your NIC's MAC address" arch=('i686' 'x86_64') url="http://ftp.gnu.org/gnu/macchanger" license=('GPL') source=(http://ftp.gnu.org/gnu/macchanger/${pkgname}-${pkgver}.tar.gz) -md5sums=('79b7cdaeca3d8ebafa764c4b0dd03ab7') +md5sums=('1257b18e9067a8192c9747da52aabdda') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/primus/PKGBUILD b/community/primus/PKGBUILD new file mode 100644 index 000000000..85408e472 --- /dev/null +++ b/community/primus/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Alexander Monakov <amonakov@gmail.com> + +pkgname=primus +pkgver=20130404 +pkgrel=1 +pkgdesc="Faster OpenGL offloading for Bumblebee" +arch=('i686' 'x86_64') +url="https://github.com/amonakov/primus" +license=('custom:ISC') +depends=('bumblebee') +makedepends=('git') +source=(git://github.com/amonakov/primus.git) +sha1sums=('SKIP') + +build() { + cd primus + + make +} + +package() { + cd primus + + install -D "lib/libGL.so.1" "$pkgdir/usr/lib/primus/libGL.so.1" + sed -e "s#^PRIMUS_libGL=.*#PRIMUS_libGL='/usr/\$LIB/primus'#" primusrun > primusrun.dist + install -D "primusrun.dist" "$pkgdir/usr/bin/primusrun" + + install -D "primus.bash-completion" "$pkgdir/etc/bash_completion.d/primusrun" + + gzip -9 "primusrun.1" + install -D "primusrun.1.gz" "$pkgdir/usr/share/man/man1/primusrun.1.gz" + + install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 97f40159f..70e11b45c 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86481 2013-03-18 07:55:54Z tpowa $ +# $Id: PKGBUILD 87621 2013-04-04 06:32:48Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer @@ -6,7 +6,7 @@ pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.10 _extramodules=extramodules-3.8-ARCH -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index 3e41ead74..259a37015 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167950 2012-10-04 04:38:27Z eric $ +# $Id: PKGBUILD 181377 2013-04-04 01:09:57Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=enlightenment -pkgver=1.0.11 +pkgver=1.0.12 _themever=1.0.1 pkgrel=1 pkgdesc="A fast, flexible, and very extensible Window Manager" @@ -14,7 +14,7 @@ depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \ http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz) -sha1sums=('146028c39b3148fdd3e247dfb29ef8ec6b9cf10d' +sha1sums=('d0d9533f645cd5e72392517df2b50748eaa58411' 'ae34e2df1294198795736bf953bf695aba93b710') build() { diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD index 5dd7836db..3618a80f7 100644 --- a/extra/fluxbox/PKGBUILD +++ b/extra/fluxbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178032 2013-02-13 22:22:13Z eric $ +# $Id: PKGBUILD 181689 2013-04-04 05:04:01Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fluxbox pkgver=1.3.5 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64') url="http://www.fluxbox.org" @@ -27,6 +27,8 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + sed -i 's/@EXEEXT@//g' "${pkgdir}"/usr/{bin/fluxbox-generate_menu,share/fluxbox/menu} + install -D -m644 ../fluxbox.desktop "${pkgdir}/usr/share/xsessions/fluxbox.desktop" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index e3b811c32..8d8bc6fc4 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180839 2013-03-26 18:36:41Z eric $ +# $Id: PKGBUILD 181383 2013-04-04 03:27:53Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.4.0 +pkgver=6.8.4.6 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('e79b197cc17f1053ed5ff22f2eea73e01f94aeb5' +sha1sums=('80acfe2bcc9b28c84db28a8e94bfa6180dcdd6f5' 'e143cf9d530fabf3b58023899b5cc544ba93daec') build() { diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 95cc63dfe..c5a381df5 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180806 2013-03-26 11:49:36Z foutrelis $ +# $Id: PKGBUILD 181859 2013-04-04 18:56:27Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.1.2 -pkgver=4.0.1 -pkgrel=5 +_LOver=4.0.2.2 +pkgver=4.0.2 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -74,12 +74,17 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - ${_additional_source_url}/libcdr-0.0.10.tar.bz2 + ${_additional_source_url}/libcdr-0.0.11.tar.bz2 ${_additional_source_url}/libmspub-0.0.5.tar.bz2 ${_additional_source_url}/libvisio-0.0.25.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff libreoffice-common.sh libreoffice-common.csh - librelogo.diff) + gcc48_1.diff + gcc48_2.diff + remove_unused_vars.diff + gcc48_3.diff + gcc48_4.diff + gcc48_5.diff) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 @@ -109,12 +114,12 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libcdr-0.0.10.tar.bz2 + libcdr-0.0.11.tar.bz2 libmspub-0.0.5.tar.bz2 libvisio-0.0.25.tar.bz2) -md5sums=('52c3bacdf46b4648c5697cc55b648784' - '916da8f21945895e04eebb74e60f854d' - '98477b5c9e8a7954d321dd143ac9336e' +md5sums=('2c92879fa8c50d0071c4703afb7d10bf' + '22e99e58aa32417dd7c132f40ae7654b' + '8b61fbfa6bcd18213b5744f2b8a289b0' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -144,13 +149,18 @@ md5sums=('52c3bacdf46b4648c5697cc55b648784' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' - 'bfc46d536c39b03563ab2a0e3beaf51b' + '107a3d18f637b342684b3c21eb0fcd7d' '881c4628ec5f54d47f35d5d19e335662' '92bde158f249b9b27f76f48cc65a0242' '97bf43dda273d79ff90c848ab53b0e3c' 'abcb1b0a7deaffe13ab3d7ca70becb49' '72790a4103da259a55cadd66db931d00' - 'cc07fdb40e005ad2a79ba8a6756b0ad6') + '941aab11a42c8052cc1999434ae82bcd' + 'caf426e9eefb99108adba6cf231de348' + 'c367454b402720eea064280d0dfb291b' + '69aef9ea67856714e0ad3b5600b49bd7' + '424c346c52d1a3ee7b1008cdcf89ed82' + 'aed5397524af27a8cceced54a30edf23') build() { @@ -159,11 +169,19 @@ build() { # [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh cd ${srcdir}/libreoffice-$_LOver - - # make librelogo depend on libreoffice-writer - # http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e69b35674882d8d675a677940805b187cad0bc3 - patch -Np1 -i ${srcdir}/librelogo.diff - + + # fix exttextcat build error + # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] + unset CPPFLAGS + + # git commits from 2013-03-09 with "GCC" to fix gcc 4.8 issues +# patch -Np1 -i ${srcdir}/gcc48_1.diff +# patch -Np1 -i ${srcdir}/gcc48_2.diff +# patch -Np1 -i ${srcdir}/remove_unused_vars.diff +# patch -Np1 -i ${srcdir}/gcc48_3.diff +# patch -Np1 -i ${srcdir}/gcc48_4.diff +# patch -Np1 -i ${srcdir}/gcc48_5.diff + # move external sources into place mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources for source in "${noextract[@]}"; do @@ -200,7 +218,6 @@ build() { --disable-fetch-external \ --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ --libdir=/usr/lib --mandir=/usr/share/man \ - --disable-verbose \ --with-lang="" \ --enable-crashdump \ --enable-dbus \ diff --git a/extra/libreoffice/gcc48_1.diff b/extra/libreoffice/gcc48_1.diff new file mode 100644 index 000000000..7ee6bd249 --- /dev/null +++ b/extra/libreoffice/gcc48_1.diff @@ -0,0 +1,52 @@ +From 6bea5311d70f518444fe3218cf0b6f49bd93cc34 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Fri, 08 Mar 2013 09:36:44 +0000 +Subject: Work around GCC 4.8 -Werror=unused-local-typedefs in boost + +Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856 +--- +diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk +index 2fcae8c..fde6fa6 100644 +--- a/boost/UnpackedTarball_boost.mk ++++ b/boost/UnpackedTarball_boost.mk +@@ -52,6 +52,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch + # in GCC-4.7 experimental": + boost_patches += boost_1_44_0-gthreads.patch + ++boost_patches += boost_1_44_0-gcc4.8.patch ++ + $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) + + $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) +diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch +new file mode 100644 +index 0000000..9fc603e +--- a/dev/null ++++ b/boost/boost_1_44_0-gcc4.8.patch +@@ -0,0 +1,24 @@ ++--- misc/boost_1_44_0/boost/bind/arg.hpp +++++ misc/build/boost_1_44_0/boost/bind/arg.hpp ++@@ -35,6 +35,8 @@ ++ { ++ // static assert I == is_placeholder<T>::value ++ typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ]; +++ T_must_be_placeholder dummy; (void) dummy; +++ // silence -Werror=unused-local-typedefs (GCC 4.8) ++ } ++ }; ++ ++--- misc/boost_1_44_0/boost/concept/detail/general.hpp +++++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp ++@@ -68,7 +68,9 @@ ++ # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \ ++ typedef ::boost::concepts::detail::instantiate< \ ++ &::boost::concepts::requirement_<ModelFnPtr>::failed> \ ++- BOOST_PP_CAT(boost_concept_check,__LINE__) +++ BOOST_PP_CAT(boost_concept_check,__LINE__); \ +++ BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)() +++ // silence -Werror=unused-local-typedefs (GCC 4.8) ++ ++ }} ++ +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_2.diff b/extra/libreoffice/gcc48_2.diff new file mode 100644 index 000000000..559adddfa --- /dev/null +++ b/extra/libreoffice/gcc48_2.diff @@ -0,0 +1,45 @@ +From c6cfd44717643b0630b5f8fd3262c243fdaaf239 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Fri, 08 Mar 2013 09:54:45 +0000 +Subject: Work around GCC 4.8 -Werror=format= in python3 + +...complainging that "‘PyArg_ParseTuple’ is an unrecognized format function +type." + +Change-Id: I125af6669010c4c9c1a18cc7c1a4895acc89338b +--- +diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk +index d8c0862..87adff0 100644 +--- a/python3/UnpackedTarball_python3.mk ++++ b/python3/UnpackedTarball_python3.mk +@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ + python3/python-3.3.0-ssl.patch.1 \ + python3/python-3.3.0-implicit-int.patch.1 \ + python3/python-3.3.0-ffi-clang.patch.1 \ ++ python3/python-3.3.0-gcc-4.8.patch.1 \ + )) + + ifneq ($(OS),WNT) +diff --git a/python3/python-3.3.0-gcc-4.8.patch.1 b/python3/python-3.3.0-gcc-4.8.patch.1 +new file mode 100644 +index 0000000..8fb7107 +--- a/dev/null ++++ b/python3/python-3.3.0-gcc-4.8.patch.1 +@@ -0,0 +1,15 @@ ++--- Python-3.3.0/Include/modsupport.h 2012-09-29 10:00:26.000000000 +0200 +++++ Python-3.3.0/Include/modsupport.h 2013-03-08 10:46:28.671938738 +0100 ++@@ -26,7 +26,11 @@ ++ /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */ ++ #if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 ++ PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); ++-PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3); +++PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) +++#ifdef PY_SSIZE_T_CLEAN +++ Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3) +++#endif +++ ; ++ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, ++ const char *, char **, ...); ++ PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_3.diff b/extra/libreoffice/gcc48_3.diff new file mode 100644 index 000000000..395fe7928 --- /dev/null +++ b/extra/libreoffice/gcc48_3.diff @@ -0,0 +1,46 @@ +From 52c5eb20fd96d63e17cb9cd18912030131bcc787 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Fri, 08 Mar 2013 09:59:05 +0000 +Subject: -Werror=unused-local-typedefs (GCC 4.8) + +Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db +--- +diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +index f8267c6..810470e 100644 +--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx ++++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +@@ -608,7 +608,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( + putenv(strdup(osJavaHome.getStr())); + #endif + +- typedef jint JNICALL JNI_InitArgs_Type(void *); + typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *); + rtl::OUString sSymbolCreateJava( + RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM")); +diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx +index 8c4f129..2694218 100644 +--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx ++++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx +@@ -201,8 +201,6 @@ void ClientBox::DeleteRemoved() + + if ( ! m_vRemovedEntries.empty() ) + { +- typedef std::vector< TClientBoxEntry >::iterator ITER; +- + m_vRemovedEntries.clear(); + } + +diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +index cd7df65..1eb94c9 100644 +--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx ++++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +@@ -225,7 +225,6 @@ void MasterPageObserver::Implementation::AddEventListener ( + + // Tell the new listener about all the master pages that are + // currently in use. +- typedef ::std::vector<String> StringList; + MasterPageContainer::iterator aDocumentIterator; + for (aDocumentIterator=maUsedMasterPages.begin(); + aDocumentIterator!=maUsedMasterPages.end(); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_4.diff b/extra/libreoffice/gcc48_4.diff new file mode 100644 index 000000000..4dd92c7aa --- /dev/null +++ b/extra/libreoffice/gcc48_4.diff @@ -0,0 +1,223 @@ +From 72c62e0e83598862e1c6e00e4264d7720aa94e41 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Fri, 08 Mar 2013 10:45:35 +0000 +Subject: -Werror=unused-local-typedefs (GCC 4.8) + +Change-Id: I873813e30e44712d6793bad91938eb847b55a7bb +--- +diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch +index 9fc603e..2d2beeb 100644 +--- a/boost/boost_1_44_0-gcc4.8.patch ++++ b/boost/boost_1_44_0-gcc4.8.patch +@@ -1,3 +1,45 @@ ++--- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp +++++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp ++@@ -142,7 +142,6 @@ ++ ForwardIteratorT End, ++ std::forward_iterator_tag ) const ++ { ++- typedef ForwardIteratorT input_iterator_type; ++ typedef iterator_range<ForwardIteratorT> result_type; ++ ++ first_finder_type first_finder( ++@@ -263,7 +262,6 @@ ++ ForwardIteratorT End, ++ unsigned int N) const ++ { ++- typedef ForwardIteratorT input_iterator_type; ++ typedef iterator_range<ForwardIteratorT> result_type; ++ ++ // Sanity check ++@@ -298,7 +296,6 @@ ++ ForwardIteratorT End, ++ unsigned int N) const ++ { ++- typedef ForwardIteratorT input_iterator_type; ++ typedef iterator_range<ForwardIteratorT> result_type; ++ ++ // Sanity check ++@@ -362,7 +359,6 @@ ++ unsigned int N, ++ std::random_access_iterator_tag ) ++ { ++- typedef ForwardIteratorT input_iterator_type; ++ typedef iterator_range<ForwardIteratorT> result_type; ++ ++ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) ) ++@@ -436,7 +432,6 @@ ++ unsigned int N, ++ std::random_access_iterator_tag ) ++ { ++- typedef ForwardIteratorT input_iterator_type; ++ typedef iterator_range<ForwardIteratorT> result_type; ++ ++ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) ) + --- misc/boost_1_44_0/boost/bind/arg.hpp + +++ misc/build/boost_1_44_0/boost/bind/arg.hpp + @@ -35,6 +35,8 @@ +@@ -22,3 +64,163 @@ + + }} + ++--- misc/boost_1_44_0/boost/date_time/date_parsing.hpp +++++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp ++@@ -113,7 +113,6 @@ ++ spec_str = "mdy"; ++ } ++ ++- typedef typename date_type::year_type year_type; ++ typedef typename date_type::month_type month_type; ++ unsigned pos = 0; ++ unsigned short year(0), month(0), day(0); ++@@ -159,7 +158,7 @@ ++ parse_undelimited_date(const std::string& s) { ++ int offsets[] = {4,2,2}; ++ int pos = 0; ++- typedef typename date_type::year_type year_type; +++ //typedef typename date_type::year_type year_type; ++ //typename date_type::ymd_type ymd((year_type::min)(),1,1); ++ unsigned short y = 0, m = 0, d = 0; ++ ++--- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp +++++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp ++@@ -36,7 +36,6 @@ ++ boost::io::ios_flags_saver iflags(os); ++ typedef local_date_time time_type;//::utc_time_type typename ++ typedef date_time::time_facet<time_type, CharT> custom_time_facet; ++- typedef std::time_put<CharT> std_time_facet; ++ std::ostreambuf_iterator<CharT> oitr(os); ++ ++ if(std::has_facet<custom_time_facet>(os.getloc())) { ++@@ -123,7 +122,6 @@ ++ const boost::local_time::local_time_period& p) { ++ boost::io::ios_flags_saver iflags(os); ++ typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet; ++- typedef std::time_put<CharT> std_time_facet; ++ std::ostreambuf_iterator<CharT> oitr(os); ++ if (std::has_facet<custom_facet>(os.getloc())) { ++ std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p); ++--- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp +++++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp ++@@ -47,7 +47,6 @@ ++ const ptime& p) { ++ boost::io::ios_flags_saver iflags(os); ++ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; ++- typedef std::time_put<CharT> std_ptime_facet; ++ std::ostreambuf_iterator<CharT> oitr(os); ++ if (std::has_facet<custom_ptime_facet>(os.getloc())) ++ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); ++@@ -114,7 +113,6 @@ ++ const boost::posix_time::time_period& p) { ++ boost::io::ios_flags_saver iflags(os); ++ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; ++- typedef std::time_put<CharT> std_time_facet; ++ std::ostreambuf_iterator<CharT> oitr(os); ++ if (std::has_facet<custom_ptime_facet>(os.getloc())) { ++ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); ++@@ -180,7 +178,6 @@ ++ { ++ boost::io::ios_flags_saver iflags(os); ++ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; ++- typedef std::time_put<CharT> std_ptime_facet; ++ std::ostreambuf_iterator<CharT> oitr(os); ++ if (std::has_facet<custom_ptime_facet>(os.getloc())) ++ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td); ++--- misc/boost_1_44_0/boost/date_time/string_convert.hpp +++++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp ++@@ -21,7 +21,6 @@ ++ inline ++ std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str) ++ { ++- typedef std::basic_string<InputT> input_type; ++ typedef std::basic_string<OutputT> output_type; ++ output_type result; ++ result.insert(result.begin(), inp_str.begin(), inp_str.end()); ++--- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp +++++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp ++@@ -35,7 +35,6 @@ ++ { ++ typedef std::basic_string<charT> string_type; ++ typedef std::vector<string_type> collection_type; ++- typedef std::basic_ostringstream<charT> ostream_type; ++ typedef std::ostreambuf_iterator<charT> ostream_iter_type; ++ typedef std::basic_ostringstream<charT> stringstream_type; ++ typedef std::time_put<charT> time_put_facet_type; ++@@ -85,7 +84,6 @@ ++ { ++ typedef std::basic_string<charT> string_type; ++ typedef std::vector<string_type> collection_type; ++- typedef std::basic_ostringstream<charT> ostream_type; ++ typedef std::ostreambuf_iterator<charT> ostream_iter_type; ++ typedef std::basic_ostringstream<charT> stringstream_type; ++ typedef std::time_put<charT> time_put_facet_type; ++--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp +++++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp ++@@ -39,8 +39,6 @@ ++ ++ template <typename Array, typename IdxGen, typename Call_Type> ++ static void call(Array& a, const IdxGen& idgen, Call_Type c) { ++- typedef typename Array::index_range index_range_; ++- typedef typename Array::index index_; ++ idgen_helper<N-1>::call(a,idgen[c],c); ++ } ++ }; ++@@ -50,8 +48,6 @@ ++ ++ template <typename Array, typename IdxGen, typename Call_Type> ++ static void call(Array& a, const IdxGen& idgen, Call_Type) { ++- typedef typename Array::index_range index_range_; ++- typedef typename Array::index index_; ++ a[ idgen ]; ++ } ++ }; ++--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp +++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp ++@@ -307,7 +307,6 @@ ++ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) ++ typedef impl::grammar_helper_base<GrammarT> helper_base_t; ++ typedef grammar_helper_list<GrammarT> helper_list_t; ++- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; ++ ++ helper_list_t& helpers = ++ # if !defined(__GNUC__) || (__GNUC__ > 2) ++@@ -318,6 +317,7 @@ ++ ++ # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \ ++ || defined(BOOST_INTEL_CXX_VERSION) +++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; ++ for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) ++ (*i)->undefine(self); ++ # else ++--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp +++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp ++@@ -47,7 +47,6 @@ ++ typename parser_result<self_t, ScannerT>::type ++ parse(ScannerT const& scan) const ++ { ++- typedef typename parser_result<self_t, ScannerT>::type result_t; ++ typedef typename ScannerT::value_t value_t; ++ typedef typename ScannerT::iterator_t iterator_t; ++ ++--- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp +++++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp ++@@ -140,7 +140,6 @@ ++ parse(ScannerT const& scan) const ++ { ++ typedef typename parser_result<ParserT, ScannerT>::type result_t; ++- typedef typename ScannerT::iterator_t iterator_t; ++ ++ result_t hit = this->subject().parse(scan); ++ if (!hit) ++--- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp +++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp ++@@ -49,8 +49,6 @@ ++ typename parser_result<self_t, ScannerT>::type ++ parse(ScannerT const& scan) const ++ { ++- typedef typename parser_result<self_t, ScannerT>::type result_t; ++- typedef typename ScannerT::value_t value_t; ++ typedef typename ScannerT::iterator_t iterator_t; ++ ++ iterator_t const s(scan.first); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_5.diff b/extra/libreoffice/gcc48_5.diff new file mode 100644 index 000000000..f63571039 --- /dev/null +++ b/extra/libreoffice/gcc48_5.diff @@ -0,0 +1,34 @@ +From 157ce65588ec8ef4ff8f805f7b8a64fefdd9edec Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Fri, 08 Mar 2013 11:07:11 +0000 +Subject: Work around GCC 4.8 -Werror=virtual-move-assign + +...complaining that "defaulted move assignment for ‘cppcanvas::SpriteCanvas’ +calls a non-trivial move assignment operator for virtual base +‘cppcanvas::BitmapCanvas’." + +Change-Id: I4dc92176dbec62f0ae4fa7d2842073077ecb8fc3 +--- +diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/cppcanvas/inc/cppcanvas/spritecanvas.hxx +index 59aa3da..6a606b3 100644 +--- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx ++++ b/cppcanvas/inc/cppcanvas/spritecanvas.hxx +@@ -24,6 +24,7 @@ + #include <osl/diagnose.h> + #include <basegfx/vector/b2dsize.hxx> + ++#include <boost/noncopyable.hpp> + #include <boost/shared_ptr.hpp> + + +@@ -48,7 +49,7 @@ namespace cppcanvas + + /** SpriteCanvas interface + */ +- class SpriteCanvas : public virtual BitmapCanvas ++ class SpriteCanvas : public virtual BitmapCanvas, private boost::noncopyable + { + public: + virtual bool updateScreen( bool bUpdateAll ) const = 0; +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/remove_unused_vars.diff b/extra/libreoffice/remove_unused_vars.diff new file mode 100644 index 000000000..7970b913c --- /dev/null +++ b/extra/libreoffice/remove_unused_vars.diff @@ -0,0 +1,26 @@ +From 305bf19e390aebdf2d20ea052a92f782e8d1185c Mon Sep 17 00:00:00 2001 +From: Thomas Arnhold <thomas@arnhold.org> +Date: Sun, 24 Feb 2013 17:39:08 +0000 +Subject: loplugin: unused variables + +And some fallout. + +Change-Id: I8dfc12f3566e72d79d4f9930284c92577aa485a1 +--- +(limited to 'sd/source/ui/toolpanel/controls/MasterPageObserver.cxx') + +diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +index 1d27c9d..cd7df65 100644 +--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx ++++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +@@ -226,8 +226,6 @@ void MasterPageObserver::Implementation::AddEventListener ( + // Tell the new listener about all the master pages that are + // currently in use. + typedef ::std::vector<String> StringList; +- StringList aNewMasterPages; +- StringList aRemovedMasterPages; + MasterPageContainer::iterator aDocumentIterator; + for (aDocumentIterator=maUsedMasterPages.begin(); + aDocumentIterator!=maUsedMasterPages.end(); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 9635bb17a..f79be1058 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170399 2012-11-07 01:42:13Z eric $ +# $Id: PKGBUILD 181375 2013-04-04 00:53:02Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors pkgver=3.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/" @@ -11,35 +11,28 @@ license=('GPL' 'LGPL') depends=('perl' 'sysfsutils') makedepends=('rrdtool') optdepends=('rrdtool: for logging with sensord') -backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord') +backup=('etc/sensors3.conf' 'etc/healthd.conf') options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ - sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \ - sensord.rc fancontrol.service sensord.service healthd.service \ - daemonarg.patch linux_3.0.patch) + healthd healthd.conf fancontrol.service sensord.service healthd.service \ + linux_3.0.patch lm_sensors-fancontrol.patch) sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' '035a721f20e4ad568f4fdde2d7c25d906c192458' - 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' - 'a068ac0a3115a6191a487e11422506baa922b40a' 'afaad558d2ad4732aa53b69afa23ccf37bc67ab1' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' - 'de5a46afc39a77ae8721246a0223baf21a2d4c9c' - 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' - '72a60251d1d55a67307dab4105d9f3f01a080af4' '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c' 'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51' 'a7a20eb3c799d70287e6c7968a7ab42165925293' - '34241388c4001bfb6e49b7e10da1217e29a258d6' - '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c') + '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c' + 'd3e419b4019451fb039ae3d3b8e0ec55121b9f17') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \ - -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service} + sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service} sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service - patch -p1 < ../daemonarg.patch - patch -p0 < ../linux_3.0.patch + patch -p0 -i "${srcdir}/linux_3.0.patch" + patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch" make PREFIX=/usr } @@ -48,13 +41,8 @@ package() { make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \ PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service" - install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors" - install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" - install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf" - install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" - install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service" install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service" install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service" diff --git a/extra/lm_sensors/daemonarg.patch b/extra/lm_sensors/daemonarg.patch deleted file mode 100644 index 4b80cef19..000000000 --- a/extra/lm_sensors/daemonarg.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol ---- lm_sensors-3.1.2-1/prog/pwm/fancontrol 2010-02-03 03:45:15.000000000 +0100 -+++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol 2010-03-07 01:37:09.000000000 +0100 -@@ -5,7 +5,9 @@ - # - # Version 0.70 - # --# Usage: fancontrol [CONFIGFILE] -+# Usage: fancontrol [-D] [CONFIGFILE] -+# -+# (-D causes fancontrol to 'fork' to the background after some tests) - # - # Dependencies: - # bash, egrep, sed, cut, sleep, readlink, lm_sensors :) -@@ -43,6 +45,12 @@ - #DEBUG=1 - MAX=255 - -+DAEMON=0 -+if [ "$1" = "-D" ]; then -+ DAEMON=1 -+ shift -+fi -+ - declare -i pwmval - - function LoadConfig { -@@ -303,7 +311,6 @@ - echo "File $PIDFILE exists, is fancontrol already running?" - exit 1 - fi --echo $$ > "$PIDFILE" - - # $1 = pwm file name - function pwmdisable() -@@ -475,6 +482,14 @@ - let fcvcount=$fcvcount+1 - done - -+if [ "$DAEMON" -gt 0 ]; then -+ echo "Forking..." -+ $0 $* &> /dev/null & -+ exit 0 -+fi -+ -+echo $$ > "$PIDFILE" -+ - echo 'Starting automatic fan control...' - - # main loop calling the main function at specified intervals diff --git a/extra/lm_sensors/fancontrol.rc b/extra/lm_sensors/fancontrol.rc deleted file mode 100644 index 8e98d06f2..000000000 --- a/extra/lm_sensors/fancontrol.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID -x /usr/sbin/fancontrol) -case "$1" in - start) - stat_busy "Starting fancontrol" - [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null - if [ $? -gt 0 -o -n "$PID" ]; then - stat_fail - else - add_daemon fancontrol - stat_done - fi - ;; - stop) - stat_busy "Stopping fancontrol" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fancontrol - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/lm_sensors/healthd.rc b/extra/lm_sensors/healthd.rc deleted file mode 100644 index f50f4a6f8..000000000 --- a/extra/lm_sensors/healthd.rc +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -x -o %PPID /usr/sbin/healthd) -case "${1}" in - start) - stat_busy "Starting Health Daemon" - [ -z "${PID}" ] && /usr/sbin/healthd &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - echo "${PID}" > /var/run/healthd.pid - add_daemon healthd - stat_done - fi - ;; - stop) - stat_busy "Stopping Health Daemon" - [ ! -z "${PID}" ] && kill ${PID} &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon healthd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/lm_sensors/lm_sensors-fancontrol.patch b/extra/lm_sensors/lm_sensors-fancontrol.patch new file mode 100644 index 000000000..e58891695 --- /dev/null +++ b/extra/lm_sensors/lm_sensors-fancontrol.patch @@ -0,0 +1,29 @@ +--- prog/pwm/fancontrol 2012-11-07 03:26:37.000000000 +0200 ++++ prog/pwm/fancontrol 2013-03-22 18:15:00.566696011 +0200 +@@ -297,7 +297,7 @@ + cd $DIR + + # Check for configuration change +-if [ -z "$DEVPATH" -o -z "$DEVNAME" ] ++if [ -z "$DEVPATH" ] || [ -z "$DEVNAME" ] + then + echo "Configuration is too old, please run pwmconfig again" >&2 + exit 1 +@@ -337,7 +337,7 @@ + # It didn't work, try pwmN_enable=1 pwmN=255 + echo 1 > $ENABLE 2> /dev/null + echo $MAX > $1 +- if [ `cat $ENABLE` -eq 1 -a `cat $1` -ge 190 ] ++ if [ `cat $ENABLE` -eq 1 ] && [ `cat $1` -ge 190 ] + then + # Success + return 0 +@@ -469,7 +469,7 @@ + else + # calculate the new value from temperature and settings + pwmval="(${tval}-${mint})*(${maxpwm}-${minso})/(${maxt}-${mint})+${minso}" +- if [ $pwmpval -eq 0 -o $min_fanval -eq 0 ] ++ if [ $pwmpval -eq 0 ] || [ $min_fanval -eq 0 ] + then # if fan was stopped start it using a safe value + echo $minsa > $pwmo + # Sleep while still handling signals diff --git a/extra/lm_sensors/sensord.conf b/extra/lm_sensors/sensord.conf deleted file mode 100644 index a1cf091c1..000000000 --- a/extra/lm_sensors/sensord.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sensord -# -SENSORD_ARGS="" diff --git a/extra/lm_sensors/sensord.rc b/extra/lm_sensors/sensord.rc deleted file mode 100644 index e3ef4d26d..000000000 --- a/extra/lm_sensors/sensord.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sensord - -PID=$(pidof -o %PPID /usr/sbin/sensord) -case "$1" in - start) - stat_busy "Starting sensord" - [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon sensord - stat_done - fi - ;; - stop) - stat_busy "Stopping sensord" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon sensord - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/lm_sensors/sensors.rc b/extra/lm_sensors/sensors.rc deleted file mode 100644 index 4acde2202..000000000 --- a/extra/lm_sensors/sensors.rc +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# description: sensors is used for monitoring motherboard sensor values. -# config: /etc/conf.d/lm_sensors - -# See also the lm_sensors homepage at: -# http://www2.lm-sensors.nu/~lm78/index.html - -# It uses a config file /etc/conf.d/lm_sensors that contains the modules to -# be loaded/unloaded. That file is sourced into this one. - -# The format of that file a shell script that simply defines the modules -# in order as normal shell variables with the special names: -# MODULE_1, MODULE_2, MODULE_3, etc. - -. /etc/rc.conf -. /etc/rc.d/functions - -PSENSORS=/usr/bin/sensors - -if $(grep -q sysfs /proc/mounts); then - WITHSYS=1 -else - WITHSYS=0 -fi - -if [ $WITHSYS == "0" ]; then - # If sensors isn't supported by the kernel, try loading the module... - [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null - - # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors. - if ! [ -e /proc/sys/dev/sensors ]; then - echo "lm_sensors: kernel does not have sensors support" - stat_fail - fi - - # If sensors was not already running, unload the module... - [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null -fi - -if [ -e /etc/conf.d/lm_sensors ]; then - CONFIG=/etc/conf.d/lm_sensors -elif [ -e /etc/sysconfig/lm_sensors ]; then - # Moving config to new Arch-specific location - mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors - CONFIG=/etc/conf.d/lm_sensors -fi - -case "$1" in - start) - stat_busy "Starting Up Sensors" - - if [ -r "$CONFIG" ]; then - . "$CONFIG" - modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ') - i=0 - while [ $i -lt $modules ] ; do - module=$(eval echo '$'MODULE_$i) - # echo starting module __${module}__ #debug - /sbin/modprobe $module &>/dev/null - i=$(expr $i + 1) - done - fi - - $PSENSORS -s - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon sensors - stat_done - fi - ;; - - stop) - stat_busy "Shutting Down Sensors" - - if [ -r "$CONFIG" ]; then - . "$CONFIG" - modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ') - i=$(expr $modules - 1) - while [ $i -ge 0 ] ; do - module=$(eval echo '$'MODULE_$i) - # echo stoping module __${module}__ #debug - /sbin/modprobe -r $module &>/dev/null - i=$(expr $i - 1) - done - fi - - if [ $WITHSYS == "0" ]; then - /sbin/modprobe -r i2c-proc &>/dev/null - fi - - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon sensors - stat_done - fi - ;; - - status) - $PSENSORS - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - condrestart) - [ -e /var/run/daemons/sensors ] && $0 restart || : - ;; - - *) - echo "Usage: $0 {start|stop|restart|status|condrestart}" -esac -exit 0 diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD index a2759612f..571cd7894 100644 --- a/extra/lua/PKGBUILD +++ b/extra/lua/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 173169 2012-12-12 00:31:37Z eric $ +# $Id: PKGBUILD 181843 2013-04-04 12:42:25Z bpiotrowski $ # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=lua -pkgver=5.2.1 -pkgrel=3 -pkgdesc='A powerful light-weight programming language designed for extending applications' +pkgver=5.2.2 +pkgrel=1 +pkgdesc='Powerful light-weight programming language designed for extending applications' arch=('i686' 'x86_64') url='http://www.lua.org/' depends=('readline') @@ -14,7 +14,7 @@ license=('MIT') options=('!makeflags' '!emptydirs') source=("http://www.lua.org/ftp/$pkgname-$pkgver.tar.gz" 'liblua.so.patch' 'lua.pc' 'LICENSE') -md5sums=('ae08f641b45d737d12d30291a5e5f6e3' +md5sums=('efbb645e897eae37cad4344ce8b0a614' 'bdc663c7b82ffc0b5df67611621fb625' 'e7ba6c2b695b0b84a5ea0cbff5fc9067' '0e2bd67b909b9ff673da844ca3480df2') @@ -22,7 +22,7 @@ md5sums=('ae08f641b45d737d12d30291a5e5f6e3' build() { cd $pkgname-$pkgver patch -p1 -i "$srcdir/liblua.so.patch" - [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC" + export CFLAGS="$CFLAGS -fPIC" make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc } @@ -30,7 +30,7 @@ build() { package() { cd $pkgname-$pkgver make \ - TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.$pkgver" \ + TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.5.2.1" \ INSTALL_DATA="cp -d" \ INSTALL_TOP="$pkgdir/usr" \ INSTALL_MAN="$pkgdir/usr/share/man/man1" \ diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index b64174829..b7052f01b 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178521 2013-02-25 01:06:11Z eric $ +# $Id: PKGBUILD 181379 2013-04-04 01:34:05Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.15.1 +pkgver=1.15.3 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64') @@ -17,8 +17,8 @@ conflicts=('mpg321') provides=('mpg321') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('824003a25f22dde5a03031cb658b6d6a160e8740' - 'ae0a4dfa3ca194641df2a6f5d165883f5a2a7093') +sha1sums=('915eb8782106a62b103a1171364571d69cb64e25' + '90614c85da88f965d9aa3165c111b6eeba711903') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,4 +30,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -m755 scripts/conplay "${pkgdir}/usr/bin/conplay" } diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 14044f911..6f9202026 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 177586 2013-02-07 18:35:35Z dan $ +# $Id: PKGBUILD 181849 2013-04-04 14:34:55Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade -pkgver=9.1.8 +pkgver=9.1.9 _majorver=${pkgver%.*} pkgrel=1 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" @@ -47,5 +47,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('54783b516880a586dcd7c07992d8c0b3') -sha256sums=('1d88f9dda24062dbfcc09aca9a316981f2aa93322613b853cf32d7a431b44c6d') +md5sums=('6b5ea53dde48fcd79acfc8c196b83535') +sha256sums=('28a533e181009308722e8b3c51f1ea7224ab910c380ac1a86f07118667602dd8') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index be2977ecf..0d250f2c2 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177590 2013-02-07 18:51:10Z dan $ +# $Id: PKGBUILD 181847 2013-04-04 14:20:11Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.2.3 +pkgver=9.2.4 _majorver=${pkgver%.*} pkgrel=1 arch=('i686' 'x86_64') @@ -14,14 +14,14 @@ source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar postgresql-run-socket.patch postgresql.pam postgresql.logrotate postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir) -md5sums=('59f42a93695b0186ed5eb03c2653a7d4' +md5sums=('6ee5bb53b97da7c6ad9cb0825d3300dd' '75c579eed03ffb2312631f0b649175b4' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137' '89b48774b0dae7c37fbb0e907c3c1db8' '1c5a1f99e8e93776c593c468e2612985' '505e0e4abfc746cae9558584d471a03c') -sha256sums=('c4f5a63290c0c32d8d9899edee8188d0c8ab124a7199b154fac75e62eec35f7f' +sha256sums=('d97dd918a88a4449225998f46aafa85216a3f89163a3411830d6890507ffae93' '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' diff --git a/extra/xfce4-weather-plugin/PKGBUILD b/extra/xfce4-weather-plugin/PKGBUILD index ccf61bee6..c3f8b294c 100644 --- a/extra/xfce4-weather-plugin/PKGBUILD +++ b/extra/xfce4-weather-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178297 2013-02-19 15:32:54Z foutrelis $ +# $Id: PKGBUILD 181854 2013-04-04 14:49:51Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Suzy Williams <suzanne.williams3@verizon.net> pkgname=xfce4-weather-plugin pkgver=0.8.3 -pkgrel=2 +pkgrel=3 pkgdesc="A weather plugin for the Xfce4 panel" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin" @@ -14,12 +14,16 @@ depends=('xfce4-panel' 'libxml2' 'libsoup' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.8/$pkgname-$pkgver.tar.bz2) -sha256sums=('40a6a22be7653b15a47174a430da89040f178695b48e5e01e77990050f715ce4') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.8/$pkgname-$pkgver.tar.bz2 + fix-color-parsing-when-reading-config-file.patch) +sha256sums=('40a6a22be7653b15a47174a430da89040f178695b48e5e01e77990050f715ce4' + 'dbf1f938e656293daeac4c3ab55061c5f61d8e29e470453b4e956081ca4722c7') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix-color-parsing-when-reading-config-file.patch" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfce4-weather-plugin/fix-color-parsing-when-reading-config-file.patch b/extra/xfce4-weather-plugin/fix-color-parsing-when-reading-config-file.patch new file mode 100644 index 000000000..916492f00 --- /dev/null +++ b/extra/xfce4-weather-plugin/fix-color-parsing-when-reading-config-file.patch @@ -0,0 +1,22 @@ +From 462e85dfd54e9a3bdf6c330c602a6545bccce585 Mon Sep 17 00:00:00 2001 +From: Harald Judt <h.judt@gmx.at> +Date: Wed, 20 Feb 2013 14:25:09 +0000 +Subject: Fix color parsing when reading config file. + +This turned out to be a stupid copy & paste mistake. +--- +diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c +index 710c33c..4a2e3c3 100644 +--- a/panel-plugin/weather.c ++++ b/panel-plugin/weather.c +@@ -884,7 +884,7 @@ xfceweather_read_config(XfcePanelPlugin *plugin, + + value = xfce_rc_read_entry(rc, "scrollbox_color", NULL); + if (value) +- gdk_color_parse("#rrrrggggbbbb", &(data->scrollbox_color)); ++ gdk_color_parse(value, &(data->scrollbox_color)); + + data->scrollbox_use_color = + xfce_rc_read_bool_entry(rc, "scrollbox_use_color", FALSE); +-- +cgit v0.9.1 |