diff options
27 files changed, 877 insertions, 133 deletions
diff --git a/elementary/elementary-gtk-theme/PKGBUILD b/elementary/elementary-gtk-theme/PKGBUILD new file mode 100644 index 000000000..64f4a4511 --- /dev/null +++ b/elementary/elementary-gtk-theme/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: paterbrown <paterbrown at silberhelme dot de> +# Contributor: Daniel Milde <info@milde.cz> + +pkgname=elementary-gtk-theme +_pkgname=egtk +pkgver=2.1 +pkgrel=5 +pkgdesc="The official elementary GTK theme designed to be smooth, attractive, fast, and usable." +arch=('any') +url="https://launchpad.net/egtk" +license=('GPL2') +depends=('gtk-engine-murrine') +optdepends=('elementary-icons: the elementary icon theme' + 'nautilus-elementary-bzr: the fork of Nautilus for simplicity') +source=(http://launchpad.net/egtk/2.0/${pkgver}/+download/${_pkgname}.zip) +md5sums=('f685d659c72271944ca2e76d638ca2ed') +install=elementary-gtk-theme.install + +build () { + mkdir -p ${pkgdir}/usr/share/themes + cp -r ${srcdir}/${_pkgname} ${pkgdir}/usr/share/themes/elementary + + # remove unnecessary files + rm -rf ${pkgdir}/usr/share/themes/elementary/debian + rm -rf ${pkgdir}/usr/share/themes/elementary/.bzr +} + diff --git a/elementary/elementary-gtk-theme/elementary-gtk-theme.install b/elementary/elementary-gtk-theme/elementary-gtk-theme.install new file mode 100644 index 000000000..66264ead4 --- /dev/null +++ b/elementary/elementary-gtk-theme/elementary-gtk-theme.install @@ -0,0 +1,10 @@ +pkgname=elementary-gtk-theme + +post_install() { + echo -e "\033[1;34mIf you prefer the light panel then follow this instruction:\033[0m" + echo -e "change '\033[1;32minclude "Apps/panel-dark.rc"\033[0m' to '\033[1;32minclude "Apps/panel.rc"\033[0m' in '/usr/share/themes/elementary/gtk-2.0/gtkrc'" +} + +post_upgrade() { + post_install $1 +} diff --git a/elementary/elementary-icons/PKGBUILD b/elementary/elementary-icons/PKGBUILD new file mode 100644 index 000000000..b56c16d8b --- /dev/null +++ b/elementary/elementary-icons/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: paterbrown <paterbrown at silberhelme dot de> +# Contributor: Josip <josipponjavic at gmail dot com> + +pkgname=elementary-icons +_pkgname=elementary-icon-theme +pkgver=2.7.1 +pkgrel=1 +pkgdesc="The elementary icons is an icon theme designed to be smooth, sexy, clear, and efficient." +arch=('any') +url="https://launchpad.net/elementaryicons" +license=('GPL3') +depends=('librsvg') +source=(http://launchpad.net/elementaryicons/2.0/${pkgver}/+download/${_pkgname}-${pkgver}.tar.gz) +md5sums=('fc4580641089a09cbcf7df38ebddd807') + +build() { + cd ${srcdir}/${_pkgname}/elementary/panel/22 + for i in audio*-panel.svg; do ln -s "$i" "${i%-panel.svg}.svg"; done + cd ${srcdir}/${_pkgname}/elementary-mono-dark/panel/22 + for i in audio*-panel.svg; do ln -s "$i" "${i%-panel.svg}.svg"; done + mkdir -p ${pkgdir}/usr/share/icons + cp -r ${srcdir}/${_pkgname}/elementary ${pkgdir}/usr/share/icons + cp -r ${srcdir}/${_pkgname}/elementary-mono-dark ${pkgdir}/usr/share/icons +} diff --git a/elementary/postler/PKGBUILD b/elementary/postler/PKGBUILD new file mode 100644 index 000000000..55b523f82 --- /dev/null +++ b/elementary/postler/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Kosava <kosava@archlinux.us> + +pkgname=postler +pkgver=0.1.1 +pkgrel=2 +pkgdesc="Postler is simple desktop mail client built in vala" +arch=('i686' 'x86_64') +url="https://launchpad.net/postler" +license=('GPL') +depends=('libwebkit' 'libunique' 'libcanberra' 'libnotify') +makedepends=('vala-010' 'intltool' 'librsvg' 'gettext' 'python2' 'msmtp') +optdepends=('dexter: provides contact completion' + 'lynx: enables HTML to text conversion' + 'libindicate: raise flags on dbus for other components of the desktop') +install="postler.install" +source=(http://git.xfce.org/apps/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 $pkgname.install) +md5sums=('02e502c9f4a4b92e4ace32d9e268f06d' + '7541710086c2b4f45da7268c137ed708') + +build() { + cd $srcdir/$pkgname-$pkgver + export VALAC="/opt/vala-0.10/bin/valac" + msg "Patching the buildscript to use python2..." + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|g" waf + ./waf configure --prefix=/usr --disable-libindicate + ./waf build + ./waf --destdir=$pkgdir install +} diff --git a/elementary/postler/postler.install b/elementary/postler/postler.install new file mode 100644 index 000000000..709ad81f2 --- /dev/null +++ b/elementary/postler/postler.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/elementary/vala-010/PKGBUILD b/elementary/vala-010/PKGBUILD new file mode 100644 index 000000000..7712f99c4 --- /dev/null +++ b/elementary/vala-010/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Alessio Sergi <asergi at archlinux dot us> + +pkgname=vala-010 +_pkgname=vala +pkgver=0.10.4 +pkgrel=1 +pkgdesc="Compiler for the GObject type system (0.10 branch)" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Vala" +license=('LGPL2.1') +depends=('glib2') +makedepends=('libxslt') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/0.10/${_pkgname}-${pkgver}.tar.bz2) +sha256sums=('4d23bd8b904ec59537ed5bcf44064104ccc41d639a3386cbc62d91f6bf0301c4') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + ./configure --prefix=/opt/vala-0.10 \ + --enable-vapigen + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # make it nice + install -d -m755 ${pkgdir}/usr/bin + ln -s /opt/vala-0.10/bin/{vala-0.10,valac-0.10,vala-gen-introspect-0.10,vapicheck-0.10,vapigen-0.10} ${pkgdir}/usr/bin/ +} + diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index b29567abf..2d2aba652 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: William Rea <sillywilly@gmail.com> pkgname=audacious-plugins-libre -pkgver=2.4.4 -pkgrel=3 +pkgver=2.5.1 +pkgrel=2 pkgdesc='Plugins for Audacious without unfree plugins' arch=('i686' 'x86_64') url='http://audacious-media-player.org/' @@ -74,8 +74,7 @@ build() { --disable-adplug \ --disable-psf \ $extraopts \ - --disable-projectm # no support for projectm-2.0.1, cf. FS#21344 - # would require libvisual-projectm in make/optdeps + make } @@ -83,4 +82,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('df761a2d07e2ad1221c5fe61fa32dcb0') +md5sums=('510b325eb3b13621b6f0e6745f6d0961') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index b2af0eaf1..89f6755fb 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Figue <ffigue at gmail> # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> -# Contrubutor (Parabola): vando <facundo@esdebian.org> +# Contributor (Parabola): vando <facundo@esdebian.org> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> @@ -20,7 +20,7 @@ pkgname=icecat pkgver=4.0.1 -pkgrel=1 +pkgrel=2 _xulver=2.0.1 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') @@ -28,9 +28,9 @@ url="http://www.gnu.org/software/gnuzilla/" license=('GPL2' 'MPL' 'LGPL') depends=("xulrunner=${_xulver}" 'desktop-file-utils') makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') -provides=('firefox') +provides=("firefox=${pkgver}") conflicts=('firefox') -replaces=("firefox=${pkgver}") +replaces=('firefox') install=icecat.install source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz mozconfig diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index dd0d5b045..a6a3abecb 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,8 +5,8 @@ # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2011.06.3 -pkgrel=1.1 +pkgver=2011.06.4 +pkgrel=2 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64') url="http://parabolagnulinux.org" @@ -22,11 +22,11 @@ optdepends=('bridge-utils: Network bridging support' install=initscripts.install source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" 'wireless.conf.d') +md5sums=('df73e4c4043d4eaf6502ca6738c549aa' + '027576534885b8d5dded9be546057b12') package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } -md5sums=('cbd4320b6b1790f8c1fd80917650a566' - '027576534885b8d5dded9be546057b12') diff --git a/libre/kernel26-libre/get_configs b/libre/kernel26-libre/get_configs deleted file mode 100755 index 624ea1048..000000000 --- a/libre/kernel26-libre/get_configs +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -source PKGBUILD - -pkgname=${pkgname/-libre/} -KERNEL_VERSION=${2:-${_basekernel}-ARCH} -from=${1:-core} - -for pkgarch in ${arch[@]}; do - wget -nc "http://mirrors.kernel.org/archlinux/$from/os/${pkgarch}/${pkgname}-headers-${pkgver}-${pkgrel}-${pkgarch}.pkg.tar.xz" - tar -xOf "${pkgname}-headers-${pkgver}-${pkgrel}-${pkgarch}.pkg.tar.xz" usr/src/linux-${KERNEL_VERSION}/.config > config.${pkgarch} -done - -sed -i "s/-ARCH/-LIBRE/" config.* - -exit 0 - diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD new file mode 100644 index 000000000..c6e4ab588 --- /dev/null +++ b/libre/libquicktime-libre/PKGBUILD @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Mateusz Herych <heniekk@gmail.com> + +pkgname=libquicktime-libre +_pkgname=libquicktime +pkgver=1.2.2 +pkgrel=3 +pkgdesc="A library for reading and writing quicktime files (no unfree faac support)." +arch=('i686' 'x86_64') +license=('GPL') +url="http://libquicktime.sourceforge.net/" +depends=('gtk2' 'ffmpeg' 'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz) +sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436') +provides=("$_pkgname=$pkgver") +conflicts=($_pkgname) +replaces=($_pkgname) + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr \ + --enable-gpl \ + --with-ffmpeg \ + --with-x264 \ + --without-doxygen + make +} + +package() { + cd $srcdir/$_pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 238fa973b..c3b4a0830 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,59 +1,77 @@ -# $Id$ +# $Id: PKGBUILD 128080 2011-06-21 18:32:19Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> -# Maintainer for Parabola GNU/Linux: Omar Botta <omarbotta@gnulinuxlibre.net> -pkgname=mplayer-libre -pkgver=33159 +_pkgbase=mplayer +pkgbase=mplayer-libre +pkgname=('mplayer-libre' 'mencoder-libre') +pkgver=33690 pkgrel=1 -pkgdesc="A movie player for linux. Libre version without faac." arch=('i686' 'x86_64') -depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' - 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'libvdpau' - 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'speex' 'fribidi' 'desktop-file-utils') +makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' +'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' +'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig') license=('GPL') url="http://www.mplayerhq.hu/" -makedepends=('unzip' 'mesa' 'live-media' 'yasm' 'git') -backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -source=(ftp://ftp.archlinux.org/other/${pkgname%-libre}/${pkgname%-libre}-${pkgver}.tar.xz mplayer.desktop mplayer.png) -provides=("mplayer=$pkgver") -conflicts=('mplayer') -replaces=('mplayer') -md5sums=('caedcdc1e50b5575c38c2a85f9c53afc' - '647b9f4ab5284a7fef3f84f992214e77' - 'd00874ccc644b7f43d6ef1c942fcef28') +options=(!buildflags !emptydirs !distcc) +source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop) +md5sums=('7efa332d381a1461f8518730f8c52e4d' + 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { - # Custom CFLAGS break the mplayer build - unset CFLAGS LDFLAGS - - cd ${srcdir}/${pkgname%-libre} - - ./configure --prefix=/usr \ - --enable-runtime-cpudetection \ - --disable-gui \ - --disable-arts \ - --disable-liblzo \ - --enable-speex \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - --disable-esd \ - --disable-mga \ - --disable-faac \ - --enable-xvmc \ - --language=all \ - --confdir=/etc/mplayer - - [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak - - make - make -j1 DESTDIR=${pkgdir} install - install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/ - install -dm755 ${pkgdir}/usr/share/mplayer/ - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf - rm -rf ${pkgdir}/usr/share/mplayer/font - #desktop file FS#14770 - install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop - install -Dm644 ${srcdir}/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png + cd ${srcdir}/${_pkgbase} + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-gui \ + --disable-arts \ + --disable-liblzo \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --enable-xvmc \ + --language=all \ + --confdir=/etc/mplayer + [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak + + make +} + +package_mplayer-libre() { + pkgdesc="A movie player for linux (no unfree faac support)" + install=mplayer.install + backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') + depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' + 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' + 'libjpeg' 'faad2' 'libxvmc' 'schroedinger') + provides=("mplayer=$pkgver") + replaces=('mplayer') + conflicts=('mplayer') + + cd ${srcdir}/${_pkgbase} + + make DESTDIR=${pkgdir} install-mplayer install-mplayer-man + install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/ + install -dm755 ${pkgdir}/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf + rm -rf ${pkgdir}/usr/share/mplayer/font + #desktop file FS#14770 + install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop + install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png +} + +package_mencoder-libre() { + pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)" + depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' + 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger') + provides=("mencoder=$pkgver") + replaces=('mencoder') + conflicts=('mencoder') + + cd ${srcdir}/${_pkgbase} + make DESTDIR=${pkgdir} install-mencoder install-mencoder-man + find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; } diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop index e3229d042..07acea13f 100644 --- a/libre/mplayer-libre/mplayer.desktop +++ b/libre/mplayer-libre/mplayer.desktop @@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器 Comment[pl]=Odtwarzaj filmy i muzykę Icon=mplayer TryExec=mplayer -Exec=mplayer -really-quiet %F +Exec=mplayer %F Terminal=false NoDisplay=true Categories=GTK;AudioVideo;Audio;Video;Player;TV; diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index dfdc56f09..71c50694b 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ +# $Id: PKGBUILD 126847 2011-06-07 19:50:19Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=pacman -pkgver=3.5.2 -pkgrel=1.1 +pkgver=3.5.3 +pkgrel=1 pkgdesc="A library-based package manager with dependency support" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base') @@ -18,11 +18,13 @@ options=(!libtool) source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf pacman.conf.x86_64 + pacman.conf.mips64el makepkg.conf) -md5sums=('b4f1fdbc17100923071ebe8fe9377be5' +md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' 'c7e6dbee04b7c492febea4366519b91d' '8809642ed398d2b9b98c5974b8b5e348' - 'a8684989d3dfad5a6e1bcf95af3e571b') + '3b2e740853e3d1463885675809d4c6ff' + 'be10d3d2e533515a0470237761415568') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -45,13 +47,22 @@ package() { install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf mycarch="i686" mychost="i686-pc-linux-gnu" - myflags="-march=i686 " + myflags="-march=i686 -mtune=generic -O2 -pipe" + myldflags="-Wl,--hash-style=gnu -Wl,--as-needed" ;; x86_64) install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf mycarch="x86_64" mychost="x86_64-unknown-linux-gnu" - myflags="-march=x86-64 " + myflags="-march=x86-64 -mtune=generic -O2 -pipe" + myldflags="-Wl,--hash-style=gnu -Wl,--as-needed" + ;; + mips64el) + install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf + mycarch="mips64el" + mychost="mips64el-unknown-linux-gnu" + myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop" + myldflags="" ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ @@ -59,6 +70,7 @@ package() { 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" # install completion files diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf index a655e935f..bfa971b7b 100644 --- a/libre/pacman/makepkg.conf +++ b/libre/pacman/makepkg.conf @@ -29,9 +29,9 @@ CHOST="@CHOST@" #-- Exclusive: will only run on @CARCH@ # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" +CFLAGS="@CARCHFLAGS@" +CXXFLAGS="@CARCHFLAGS@" +LDFLAGS="@LDFLAGS@" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el new file mode 100644 index 000000000..caee508fd --- /dev/null +++ b/libre/pacman/pacman.conf.mips64el @@ -0,0 +1,86 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl -C - -f %u > %o +#CleanMethod = KeepInstalled +Architecture = mips64el + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload +#CheckSpace + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +Include = /etc/pacman.d/mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD index 251d44d72..af613dc74 100644 --- a/libre/pacman/rePKGBUILD +++ b/libre/pacman/rePKGBUILD @@ -1,39 +1,30 @@ -# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgname=pacman -pkgver=3.5.2 -pkgrel=1.2 -_pkgrel=1 -pkgdesc="A library-based package manager with dependency support" -arch=('i686' 'x86_64') -url="http://www.archlinux.org/pacman/" -license=('GPL') -groups=('base') -depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist-libre') -optdepends=('fakeroot: for makepkg usage as normal user' - 'curl: for rankmirrors usage') -backup=(etc/pacman.conf etc/makepkg.conf) -install=pacman.install -options=(!libtool !strip) -source=(http://repo.parabolagnulinux.org/core/os/$CARCH/$pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz - pacman.conf - pacman.conf.x86_64 - makepkg.conf) - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' +# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> +source PKGBUILD +CARCH=x86_64 +unset build package md5sums source +_repo=core +source=(PKGBUILD + http://mirrors.kernel.org/archlinux/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT + # files for pkg modifications + pacman.conf + pacman.conf.x86_64 + ) +options=(!strip) build() { cd "${srcdir}/" - rm .{INSTALL,PKGINFO} $pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz + rm .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT + # put actions for package modifications below this line } package() { + cd ${srcdir} cp -a ./* ${pkgdir} - rm $pkgdir/etc/pacman.conf $pkgdir/{pacman.conf{,.x86_64},makepkg.conf} + rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}} + +# No need to repackage for mips64el case "$CARCH" in i686) install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf @@ -44,4 +35,5 @@ package() { esac } -# vim: set ts=2 sw=2 et: + +# vim:set ts=2 sw=2 et: diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD index 4a5cb737e..b319676c4 100644 --- a/libre/unarchiver/PKGBUILD +++ b/libre/unarchiver/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Cedric Girard <girard.cedric@gmail.com> pkgname=unarchiver pkgver=2.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686') url="http://wakaba.c3.cx/s/apps/unarchiver.html" diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index 8262e03be..f04ec2f47 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -4,7 +4,7 @@ pkgbasename=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=3 +pkgrel=7 pkgdesc="A GTK+ based IRC client without non-free browser reference" arch=('i686' 'x86_64') url="http://www.xchat.org/" @@ -12,23 +12,27 @@ provides=("xchat=$pkgver") replaces=('xchat') conflicts=('xchat') license=('GPL') -depends=('gtk2' 'openssl' 'dbus-glib') +depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify') makedepends=('tcl' 'perl' 'python2') -optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' \ +optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' 'python2: for python plugin') options=('!libtool') changelog=ChangeLog -source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz remove-non-free-suggestion.patch) -md5sums=('9a11f13121ff0af787bba3b014378e58' - '47c665961f11a803e9a12007811a04c9') -sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' - '05e673aa44813ddac8aabb251d5f0124efde91a2') - - +source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz + xchat-2.8.8-libnotify07.patch + xchat-2.8.8-link-against-libnotify.patch + remove-non-free-suggestion.patch + no-firefox.patch) build() { cd "${srcdir}/${pkgbasename}-${pkgver}" - patch -p1 < ../remove-non-free-suggestion.patch + patch -Np1 -i ${srcdir}/remove-non-free-suggestion.patch + patch -Np1 -i ${srcdir}/no-firefox.patch + patch -Np1 -i ${srcdir}/xchat-2.8.8-libnotify07.patch + patch -Np1 -i ${srcdir}/xchat-2.8.8-link-against-libnotify.patch + autoconf + autoheader + ./configure --prefix=/usr --sysconfdir=/etc --enable-openssl --enable-dbus \ --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static make @@ -39,3 +43,8 @@ package() { make DESTDIR="${pkgdir}" install } +md5sums=('9a11f13121ff0af787bba3b014378e58' + '8f0ba48dc3d151cd9b4fbef3255e8c95' + '805893e0d8f7c9713d703f34b6bb4b89' + 'd0968310982fa9e30d43dd43536b7387' + 'ba11c3e889509d1b46307d6ebf74509c') diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch new file mode 100644 index 000000000..7fb5190de --- /dev/null +++ b/libre/xchat-libre/no-firefox.patch @@ -0,0 +1,11 @@ +--- xchat-2.8.8/src/fe-gtk/fe-gtk.c_orig 2011-06-02 04:25:03.386077554 +0200 ++++ xchat-2.8.8/src/fe-gtk/fe-gtk.c 2011-06-02 04:25:14.959410608 +0200 +@@ -956,7 +956,7 @@ + } + + /* everything failed, what now? just try firefox */ +- if (try_browser ("firefox", NULL, url)) ++ if (try_browser ("icecat", NULL, url)) + return; + + /* fresh out of ideas... */ diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch index 8b0f4e41f..943daff60 100644 --- a/libre/xchat-libre/remove-non-free-suggestion.patch +++ b/libre/xchat-libre/remove-non-free-suggestion.patch @@ -6,7 +6,7 @@ diff -urN xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c static char defaultconf_urlhandlers[] = - "NAME Open Link in Opera\n" "CMD !opera -remote 'openURL(%s)'\n\n"; -+ "NAME Open Link in Web Browser\n" "CMD !icecat 'openURL(%s)'\n\n"; ++ "NAME Open Link in Web Browser\n" "CMD !icecat '%s'\n\n"; #ifdef USE_SIGACTION /* Close and open log files on SIGUSR1. Usefull for log rotating */ diff --git a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch new file mode 100644 index 000000000..95d429542 --- /dev/null +++ b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch @@ -0,0 +1,25 @@ +diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c +--- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 2010-11-15 17:32:15.708325783 -0500 ++++ xchat-2.8.8/src/fe-gtk/plugin-tray.c 2010-11-15 18:05:17.322141789 -0500 +@@ -125,8 +125,9 @@ static void *nn_mod = NULL; + /* prototypes */ + static gboolean (*nn_init) (char *); + static void (*nn_uninit) (void); +-static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon); +-static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach); ++/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an ++ * extra NULL argument will be fine */ ++static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy); + static gboolean (*nn_show) (void *noti, GError **error); + static void (*nn_set_timeout) (void *noti, gint timeout); + +@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title, + goto bad; + if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit)) + goto bad; +- if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon)) +- goto bad; + if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new)) + goto bad; + if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show)) + diff --git a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch new file mode 100644 index 000000000..6dad938ea --- /dev/null +++ b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch @@ -0,0 +1,344 @@ +From: Christopher Aillon <caillon@redhat.com> +Date: Thu, 7 Apr 2011 19:34:14 -0700 +Subject: [PATCH] Link directly against libnotify + +Dynamically loading the library isn't ideal since the soname +can change silently on us. Additionally, notify-send is +shipped as part of libnotify, so we aren't actually bringing +in a new dependency. Since we'd need to patch the source and +rebuild for new sonames anyway, there's little benefit to +dynamically loading libnotify. + +Plus, this has the benefit of cleaning up the code, as well as +ensuring we'll catch any future soname changes sooner. + +https://bugzilla.redhat.com/show_bug.cgi?id=693362 +https://sourceforge.net/tracker/?func=detail&aid=3280223&group_id=239&atid=100239 +--- + configure.in | 23 +++++++ + src/fe-gtk/plugin-tray.c | 144 ++++++++++------------------------------------- + 2 files changed, 55 insertions(+), 112 deletions(-) + +diff -p -U8 xchat-2.8.8/configure.in.libnotifyso4 xchat-2.8.8/configure.in +--- xchat-2.8.8/configure.in.libnotifyso4 2010-05-29 23:01:16.000000000 -0700 ++++ xchat-2.8.8/configure.in 2011-04-07 19:27:00.448137113 -0700 +@@ -34,16 +34,17 @@ AH_VERBATIM([PREFIX],[#undef PREFIX]) + AH_VERBATIM([XCHATLIBDIR],[#undef XCHATLIBDIR]) + AH_VERBATIM([XCHATSHAREDIR],[#undef XCHATSHAREDIR]) + AH_VERBATIM([SOCKS],[#undef SOCKS]) + AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY]) + dnl AH_VERBATIM([USE_GNOME],[#undef USE_GNOME]) + AH_VERBATIM([USE_SHM],[#undef USE_SHM]) + AH_VERBATIM([USE_GTKSPELL],[#undef USE_GTKSPELL]) + AH_VERBATIM([USE_LIBSEXY],[#undef USE_LIBSEXY]) ++AH_VERBATIM([USE_LIBNOTIFY],[#undef USE_LIBNOTIFY]) + AH_VERBATIM([USE_IPV6],[#undef USE_IPV6]) + AH_VERBATIM([USE_MMX],[#undef USE_MMX]) + AH_VERBATIM([USE_OPENSSL],[#undef USE_OPENSSL]) + AH_VERBATIM([USE_PLUGIN],[#undef USE_PLUGIN]) + AH_VERBATIM([USE_XFT],[#undef USE_XFT]) + AH_VERBATIM([USE_XLIB],[#undef USE_XLIB]) + AH_VERBATIM([USE_SIGACTION],[#undef USE_SIGACTION]) + AH_VERBATIM([USING_FREEBSD],[#undef USING_FREEBSD]) +@@ -126,16 +127,20 @@ AC_ARG_ENABLE(tcl, + AC_ARG_ENABLE(plugin, + [ --disable-plugin disable plugin support], + plugin=$enableval, plugin=yes) + + AC_ARG_ENABLE(dbus, + [ --disable-dbus disable DBUS support], + dbus=$enableval, dbus=yes) + ++AC_ARG_ENABLE(libnotify, ++[ --disable-libnotify disable libnotify support], ++ libnotify=$enableval, libnotify=yes) ++ + AC_ARG_ENABLE(mmx, + [ --disable-mmx disable MMX assembly routines], + mmx=$enableval, mmx=yes) + + AC_ARG_ENABLE(shm, + [ --enable-shm enable use of XShm for fast tinting (default: no)], + shm=$enableval, shm=no) + +@@ -482,16 +487,32 @@ if test "x$dbus" = "xyes" ; then + + DBUS_SERVICES_DIR="$DATADIR/dbus-1/services" + AC_SUBST(DBUS_SERVICES_DIR) + AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) + fi + fi + + dnl ********************************************************************* ++dnl ** LIBNOTIFY ******************************************************** ++dnl ********************************************************************* ++ ++if test "x$libnotify" = "xyes" ; then ++ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4, [], [ ++ AC_MSG_RESULT(no) ++ libnotify=no ++ ]) ++ if test "$libnotify" != "no" ; then ++ GUI_LIBS="$GUI_LIBS $LIBNOTIFY_LIBS" ++ GUI_CFLAGS="$GUI_CFLAGS $LIBNOTIFY_CFLAGS" ++ AC_DEFINE(USE_LIBNOTIFY) ++ fi ++fi ++ ++dnl ********************************************************************* + dnl ** SPELL ************************************************************ + dnl ********************************************************************* + + if test "$spell" = "gtkspell" ; then + PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, [], [ + AC_MSG_RESULT(no) + spell=no + ]) +@@ -519,16 +540,17 @@ if test "$spell" = "static" ; then + fi + + dnl ********************************************************************* + dnl ** CONDITIONALS ***************************************************** + dnl ********************************************************************* + + AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes") + AM_CONDITIONAL(USE_LIBSEXY, test "x$spell" = "xstatic") ++AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes") + AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes") + AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes") + AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes") + AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes") + AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes") + AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes") + AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes") + AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno") +@@ -807,16 +829,17 @@ echo mmx tinting ......... : $mmx\ spell + echo XShm tinting ........ : $shm\ plugin interface ...... : $plugin + if test "$xft" = no; then + echo text backend ........ : pango\ nls/gettext ........... : $USE_NLS + else + echo text backend ........ : xft\ nls/gettext ........... : $USE_NLS + fi + echo openssl support ..... : $openssl\ ipv6 support .......... : $ipv6 + echo dbus support ........ : $dbus\ msproxy ntlm \(ISA\) .... : $have_ntlm ++echo libnotify support ... : $libnotify + echo + echo The binary will be installed in $prefix/bin + echo + + if test "$gtkfe" = no; then + echo Warning: The GTK \(GUI\) frontend will not be built. + echo + fi +diff -p -U8 xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 xchat-2.8.8/src/fe-gtk/plugin-tray.c +--- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 2011-04-07 17:57:27.524307905 -0700 ++++ xchat-2.8.8/src/fe-gtk/plugin-tray.c 2011-04-07 19:18:33.429475719 -0700 +@@ -10,17 +10,27 @@ + #include "../common/fe.h" + #include "../common/util.h" + #include "fe-gtk.h" + #include "pixmaps.h" + #include "maingui.h" + #include "menu.h" + #include <gtk/gtk.h> + +-#define LIBNOTIFY ++#ifdef USE_LIBNOTIFY ++#include <libnotify/notify.h> ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++#if NOTIFY_CHECK_VERSION(0,7,0) ++#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c) ++#else ++#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c,d) ++#endif ++#endif + + typedef enum /* current icon status */ + { + TS_NONE, + TS_MESSAGE, + TS_HIGHLIGHT, + TS_FILEOFFER, + TS_CUSTOM /* plugin */ +@@ -112,90 +122,16 @@ tray_count_networks (void) + + void + fe_tray_set_tooltip (const char *text) + { + if (sticon) + gtk_status_icon_set_tooltip (sticon, text); + } + +-#ifdef LIBNOTIFY +- +-/* dynamic access to libnotify.so */ +- +-static void *nn_mod = NULL; +-/* prototypes */ +-static gboolean (*nn_init) (char *); +-static void (*nn_uninit) (void); +-/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an +- * extra NULL argument will be fine */ +-static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy); +-static gboolean (*nn_show) (void *noti, GError **error); +-static void (*nn_set_timeout) (void *noti, gint timeout); +- +-static void +-libnotify_cleanup (void) +-{ +- if (nn_mod) +- { +- nn_uninit (); +- g_module_close (nn_mod); +- nn_mod = NULL; +- } +-} +- +-static gboolean +-libnotify_notify_new (const char *title, const char *text, GtkStatusIcon *icon) +-{ +- void *noti; +- +- if (!nn_mod) +- { +- nn_mod = g_module_open ("libnotify", G_MODULE_BIND_LAZY); +- if (!nn_mod) +- { +- nn_mod = g_module_open ("libnotify.so.1", G_MODULE_BIND_LAZY); +- if (!nn_mod) +- return FALSE; +- } +- +- if (!g_module_symbol (nn_mod, "notify_init", (gpointer)&nn_init)) +- goto bad; +- if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit)) +- goto bad; +- if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new)) +- goto bad; +- if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show)) +- goto bad; +- if (!g_module_symbol (nn_mod, "notify_notification_set_timeout", (gpointer)&nn_set_timeout)) +- goto bad; +- if (!nn_init (PACKAGE_NAME)) +- goto bad; +- } +- +- text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); +- title = strip_color (title, -1, STRIP_ALL); +- noti = nn_new (title, text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL); +- g_free ((char *)title); +- g_free ((char *)text); +- +- nn_set_timeout (noti, prefs.input_balloon_time*1000); +- nn_show (noti, NULL); +- g_object_unref (G_OBJECT (noti)); +- +- return TRUE; +- +-bad: +- g_module_close (nn_mod); +- nn_mod = NULL; +- return FALSE; +-} +- +-#endif +- + void + fe_tray_set_balloon (const char *title, const char *text) + { + #ifndef WIN32 + const char *argv[8]; + const char *path; + char time[16]; + WinStatus ws; +@@ -208,52 +144,36 @@ fe_tray_set_balloon (const char *title, + /* bit 1 of flags means "no balloons unless hidden/iconified" */ + if (ws != WS_HIDDEN && (prefs.gui_tray_flags & 2)) + return; + + /* FIXME: this should close the current balloon */ + if (!text) + return; + +-#ifdef LIBNOTIFY +- /* try it via libnotify.so */ +- if (libnotify_notify_new (title, text, sticon)) +- return; /* success */ +-#endif ++#ifdef USE_LIBNOTIFY ++ NotifyNotification *notification; ++ char *notify_text, *notify_title; + +- /* try it the crude way */ +- path = g_find_program_in_path ("notify-send"); +- if (path) +- { +- sprintf(time, "%d000",prefs.input_balloon_time); +- argv[0] = path; +- argv[1] = "-i"; +- argv[2] = "gtk-dialog-info"; +- if (access (XCHATSHAREDIR"/pixmaps/xchat.png", R_OK) == 0) +- argv[2] = XCHATSHAREDIR"/pixmaps/xchat.png"; +- argv[3] = "-t"; +- argv[4] = time; +- argv[5] = title; +- text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); +- argv[6] = text; +- argv[7] = NULL; +- xchat_execv (argv); +- g_free ((char *)path); +- g_free ((char *)text); +- } +- else +- { +- /* show this error only once */ +- static unsigned char said_it = FALSE; +- if (!said_it) +- { +- said_it = TRUE; +- fe_message (_("Cannot find 'notify-send' to open balloon alerts.\nPlease install libnotify."), FE_MSG_ERROR); +- } +- } ++ if (!notify_is_initted()) ++ notify_init(PACKAGE_NAME); ++ ++ notify_text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); ++ notify_title = strip_color (title, -1, STRIP_ALL); ++ ++ notification = XC_NOTIFY_NEW (notify_title, notify_text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL); ++ ++ g_free ((char *)notify_title); ++ g_free ((char *)notify_text); ++ ++ notify_notification_set_timeout (notification, prefs.input_balloon_time*1000); ++ notify_notification_show (notification, NULL); ++ ++ g_object_unref (notification); ++#endif + #endif + } + + static void + tray_set_balloonf (const char *text, const char *format, ...) + { + va_list args; + char *buf; +@@ -840,13 +760,13 @@ tray_plugin_init (xchat_plugin *plugin_h + return 1; /* return 1 for success */ + } + + int + tray_plugin_deinit (xchat_plugin *plugin_handle) + { + #ifdef WIN32 + tray_cleanup (); +-#elif defined(LIBNOTIFY) +- libnotify_cleanup (); ++#elif defined(USE_LIBNOTIFY) ++ notify_uninit (); + #endif + return 1; + } + diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index df53ec0cb..a7f25c7bb 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Parabola Project <dev@list.parabolagnulinux.org> pkgname=your-freedom pkgver=$(LC_ALL=C date -u +%Y%m%d) -pkgrel=3 +pkgrel=1 pkgdesc="This package conflicts with every unfree package known to date." arch=('any') url="https://parabolagnulinux.org" diff --git a/~fauno/distccd-zeroconf/PKGBUILD b/~fauno/distccd-zeroconf/PKGBUILD new file mode 100644 index 000000000..2faf6acb3 --- /dev/null +++ b/~fauno/distccd-zeroconf/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 59085 2009-11-20 06:29:43Z giovanni $ +# Maintainer: Judd Vinet <jvinet@zeroflux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=distcc-zeroconf +_pkgname=distcc +pkgver=3.1 +pkgrel=1 +pkgdesc="A distributed C, C++, Obj C compiler with zeroconf support" +arch=('i686' 'x86_64') +url="http://code.google.com/p/distcc/" +license=('GPL') +depends=('gcc' 'popt' 'avahi') +makedepends=('gtk2' 'pkgconfig') +optdepends=('gtk2: for distccmon-gnome') +provides=('distcc') +conflicts=('distcc') +replaces=('distcc') +backup=(etc/conf.d/distccd) +options=(!distcc) +source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2 + distccd + distccd.conf.d) +md5sums=('a1a9d3853df7133669fffec2a9aab9f3' + '1c918474372c09304772c20c4de484fa' + '89aaf6e9072092e283465a14e83f0f94') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --with-gtk \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --disable-Werror + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd + install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.d/distccd + + install -d ${pkgdir}/usr/lib/${_pkgname}/bin + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cc + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/gcc + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/g++ + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cpp + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/c++ +} diff --git a/~fauno/distccd-zeroconf/distccd b/~fauno/distccd-zeroconf/distccd new file mode 100755 index 000000000..4702d6820 --- /dev/null +++ b/~fauno/distccd-zeroconf/distccd @@ -0,0 +1,38 @@ +#!/bin/bash + +[ -f /etc/conf.d/distccd ] && . /etc/conf.d/distccd + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/distccd` +case "$1" in + start) + stat_busy "Starting distcc Daemon" + [ -z "$PID" ] && /usr/bin/distccd --daemon ${DISTCC_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon distccd + stat_done + fi + ;; + stop) + stat_busy "Stopping distcc Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon distccd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/~fauno/distccd-zeroconf/distccd.conf.d b/~fauno/distccd-zeroconf/distccd.conf.d new file mode 100644 index 000000000..8f90cb503 --- /dev/null +++ b/~fauno/distccd-zeroconf/distccd.conf.d @@ -0,0 +1,8 @@ +# +# Parameters to be passed to distccd +# +# You must explicitly add IPs (or subnets) that are allowed to connect, +# using the --allow switch. See the distccd manpage for more info. +# +DISTCC_ARGS="--user nobody --allow 127.0.0.1" + |