From 48fd6f021f6c1a27a52753d556e15892bbccb436 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Tue, 17 Jan 2012 04:01:13 +0000 Subject: [PATCH] updated on Tue Jan 17 04:01:13 UTC 2012 --- amaya/PKGBUILD | 28 +- apparmor/PKGBUILD | 54 +- bochs-with-debugger/PKGBUILD | 4 +- broadcom-wl-ck/PKGBUILD | 2 +- doublecmd-gtk-ppa/PKGBUILD | 11 +- doublecmd-gtk2-bin-nightly/PKGBUILD | 11 +- .../doublecmd-gtk2-bin-nightly.install | 23 - ez-setup/PKGBUILD | 4 +- gradel/PKGBUILD | 28 +- gradel/extra/gradel.desktop | 18 - hodoku-build/PKGBUILD | 7 +- ldc-git/PKGBUILD | 6 +- lilypond-devel/PKGBUILD | 13 +- lilypond-devel/python2.patch | 13 - nvidia-ck/PKGBUILD | 2 +- pacman-color/PKGBUILD | 12 +- ...-color-3.5.4.patch => pacman-color-4.0.1.patch} | 728 +++++++++++---------- pg-python/PKGBUILD | 6 +- pkgbrowser/PKGBUILD | 6 +- pm-utils-screen-lock/PKGBUILD | 4 +- pm-utils-screen-lock/video-lock-screen | 4 +- samsutools/PKGBUILD | 2 + th08/PKGBUILD | 47 +- th08/th08.sh | 68 +- tp_smapi/PKGBUILD | 36 +- tp_smapi/tp_smapi.install | 4 +- 26 files changed, 549 insertions(+), 592 deletions(-) delete mode 100644 doublecmd-gtk2-bin-nightly/doublecmd-gtk2-bin-nightly.install delete mode 100644 gradel/extra/gradel.desktop delete mode 100644 lilypond-devel/python2.patch rename pacman-color/{pacman-color-3.5.4.patch => pacman-color-4.0.1.patch} (64%) rewrite th08/th08.sh (66%) diff --git a/amaya/PKGBUILD b/amaya/PKGBUILD index 83f93fb2e..8a280eb22 100644 --- a/amaya/PKGBUILD +++ b/amaya/PKGBUILD @@ -5,12 +5,12 @@ # Contributor: Sergej Pupykin pkgname=amaya pkgver=11.3.1 -pkgrel=11 +pkgrel=12 pkgdesc="W3C's WYSIWYG HTML Editor" arch=('i686' 'x86_64') url="http://www.w3.org/Amaya/" license=('W3C') -depends=('wxgtk' 'libgl' 'raptor1' 'libxt') +depends=('wxgtk' 'mesa' 'raptor1') makedepends=('chrpath') options=('!makeflags') install=$pkgname.install @@ -48,32 +48,16 @@ build() { fi mkdir WX; cd WX - if [ "$CARCH" = "x86_64" ] ; then - [ $NOEXTRACT -eq 1 ] || cp ../../Mesa/configs/linux-x86-64 \ - ../../Mesa/configs/current - else - [ $NOEXTRACT -eq 1 ] || cp ../../Mesa/configs/linux-x86 \ - ../../Mesa/configs/current - fi + rm $srcdir/Amaya$pkgver/Mesa/Makefile # to use system's mesa ../configure --prefix=/usr/share --exec=/usr/share \ --datadir=/usr/share --enable-system-raptor --enable-system-wx - make + make } package() { cd $srcdir/Amaya$pkgver/Amaya/WX - - install -d $pkgdir/usr/bin make prefix=$pkgdir/usr/share install - - ln -f -s ../share/Amaya/wx/bin/amaya $pkgdir/usr/bin/amaya -# install -Dm644 $srcdir/Amaya$pkgver/Amaya/amaya/COPYRIGHT \ -# $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT - - mkdir -p $pkgdir/usr/share/Amaya/lib - cp -a $srcdir/Amaya$pkgver/Amaya/WX/Mesa/lib/libGL.so.1* $pkgdir/usr/share/Amaya/lib/ - cp -a $srcdir/Amaya$pkgver/Amaya/WX/Mesa/lib/libGLU.so.1* $pkgdir/usr/share/Amaya/lib/ - chrpath -r /usr/share/Amaya/lib $pkgdir/usr/share/Amaya/wx/bin/amaya_bin - chrpath -r /usr/share/Amaya/lib $pkgdir/usr/share/Amaya/wx/bin/print + install -Dm755 $pkgdir/usr/share/Amaya/wx/bin/amaya $pkgdir/usr/bin/amaya + rm $pkgdir/usr/share/Amaya/wx/bin/amaya } diff --git a/apparmor/PKGBUILD b/apparmor/PKGBUILD index e21fa6153..6f185fdef 100644 --- a/apparmor/PKGBUILD +++ b/apparmor/PKGBUILD @@ -1,31 +1,39 @@ # Contributor: Thomas Mudrunka -# Maintainer: Thomas Mudrunka +# Maintainer: Thomas Mudrunka # You can also contact me on http://blog.harvie.cz/ +# Maintainer: Max Fierke pkgbase=apparmor pkgname=apparmor true && pkgname=(apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam) - -pkgver=2.6.1 +pkgver=2.7.0 pkgrel=1 -arch=(i686 x86_64) -license=(GPL) -url='https://launchpad.net/apparmor' -groups=(apparmor) -makedepends=(swig perl python2 ruby perl-locale-gettext perl-rpc-xml wxgtk audit) -optdepends=('kernel26>=2.6.36: kernel with AppArmor support' -'linux: kernel with AppArmor support') - +arch=('i686' 'x86_64') +license=('GPL') +url='http://wiki.apparmor.net/index.php/Main_Page' +groups=('apparmor') +makedepends=('swig' 'perl' 'python2' 'ruby' 'perl-locale-gettext' 'perl-rpc-xml' 'wxgtk' 'audit') +optdepends=('linux-hardened: kernel with AppArmor, SELinux, Grsecurity/PAX, and TOMOYO support') pacman -Qi apparmor-libapparmor &>/dev/null && true && pkgname=(${pkgname[*]} apparmor-profile-editor apparmor-dbus) && depends=(${depends[*]} apparmor-libapparmor) && msg "Building with libapparmor dependent packages..." -bigver="$(echo $pkgver | cut -d . -f -2)" -source=("http://launchpad.net/apparmor/$bigver/$pkgver/+download/apparmor-$pkgver.tar.gz" +bigver="$(echo ${pkgver} | cut -d . -f -2)" +source=("http://launchpad.net/apparmor/${bigver}/${pkgver}/+download/apparmor-$pkgver.tar.gz" "apparmor") -md5sums=('e2dabce946cb8258834f90f0a6c87726' -'01585dcac048c8d8ed09c11d26ca81b2') + +md5sums=('9cc38779a43004dbc7f09932fa848366' + '01585dcac048c8d8ed09c11d26ca81b2') +sha1sums=('9428e466e242b9381ac152dafb58d488c8a01921' + 'edc7159f97fe7c3ae0d12c64986c12b4905af41e') +sha256sums=('ff8a2f49f902faa78e502590c65d3850fb9a2a3453bef0dc1f99e947c52fc60f' + '81503d1bdd8bda4de51ebe607a3f2e747da064c9dbc7a9bd01793c0d75679fc5') +sha384sums=('badb2852546ecf4a9bf2969a6689be3da839bea7f4b06dbc8f5946a0869bbc859b1d70427e0a12318adc98127ca157c1' + 'e5a13544a206f5854cc06bb3b21afe4f55617b335d2402889919455fad7d0f65dd0a1e61d5fcc121e32091d58b8e0eb0') +sha512sums=('7573d1e99f0214f26add021b2492c19b3fd340a8b5f964ce6759a026a947f4281564264b8daa14ec30cb0817d05473e8b48a9fc24bcd93e5b4c59d9a6b99ba7d' + '9e74a99653977cdcabd84899aa3f462ae0e649f990320a920ced37466e98eca8351957015a325de7672a9d20980e729fadf6d5c9c9d90b284ca27e45c47445b1') + #Configuration core_perl_dir='/usr/bin/core_perl' @@ -56,7 +64,7 @@ package_apparmor-parser() { package_apparmor-libapparmor() { pkgdesc='AppArmor library' makedepends=(swig perl python2 ruby) - provides=(apparmor-lib libapparmor apparmor-perl apparmor-python apparmor-ruby) + provides=('apparmor-lib' 'libapparmor' 'apparmor-perl' 'apparmor-python' 'apparmor-ruby') ( cd "${srcroot}/libraries/libapparmor"; msg2 "${PWD##*/}" ./autogen.sh ./configure --prefix=/usr --with-perl --with-python --with-ruby @@ -69,10 +77,10 @@ package_apparmor-libapparmor() { package_apparmor-utils() { pkgdesc='AppArmor userspace utilities' - depends=(perl perl-locale-gettext perl-term-readkey perl-file-tail perl-rpc-xml) + depends=('perl' 'perl-locale-gettext' 'perl-term-readkey' 'perl-file-tail' 'perl-rpc-xml') optdepends=('perl: many apparmor utilities' 'perl-rpc-xml: more utilities') - provides=(apparmor-notify); - install=('apparmor.install'); + provides=('apparmor-notify'); + install='apparmor.install' ( cd "${srcroot}/utils"; msg2 "${PWD##*/}" make make install DESTDIR=${pkgdir} @@ -91,7 +99,7 @@ package_apparmor-profiles() { package_apparmor-profile-editor() { pkgdesc='AppArmor profile editor using WxWidgets (or WxGTK)' - depends=(apparmor-libapparmor wxgtk audit) + depends=('apparmor-libapparmor' 'wxgtk' 'audit') ( cd "${srcroot}/deprecated/management/profile-editor"; msg2 "${PWD##*/}" ./macros/autogen.sh ./configure --prefix=/usr @@ -102,7 +110,7 @@ package_apparmor-profile-editor() { package_apparmor-dbus() { pkgdesc='AppArmor DBUS API' - depends=(apparmor-libapparmor) + depends=('apparmor-libapparmor') ( cd "${srcroot}/deprecated/management/apparmor-dbus"; msg2 "${PWD##*/}" ./autogen.sh ./configure --prefix=/usr @@ -113,7 +121,7 @@ package_apparmor-dbus() { package_apparmor-applet() { pkgdesc='AppArmor Applet for Gnome' - depends=(apparmor-libapparmor) + depends=('apparmor-libapparmor') #FIXME: can't build this: ( cd "${srcroot}/deprecated/management/applets/apparmorapplet-gnome"; msg2 "${PWD##*/}" ./autogen.sh @@ -125,7 +133,7 @@ package_apparmor-applet() { package_apparmor-pam() { pkgdesc='AppArmor PAM library' - depends=(apparmor-libapparmor) + depends=('apparmor-libapparmor') ( cd "${srcroot}/changehat/pam_apparmor"; msg2 "${PWD##*/}" make make install DESTDIR=${pkgdir} diff --git a/bochs-with-debugger/PKGBUILD b/bochs-with-debugger/PKGBUILD index 53c9e0fdf..e63df0d27 100755 --- a/bochs-with-debugger/PKGBUILD +++ b/bochs-with-debugger/PKGBUILD @@ -17,7 +17,7 @@ sha256sums=('8d3f2ccd8fc3df2aff7ea370afc521cadd4a4f545faf6b0421013453ce3ea26e') sha512sums=('79e0bdfeecf499c37fb30194a85d4074316b0a9b8b89580d94e91f0e278f6b60354e2e509e4606eb38100a5fc2e88267a5106eb6c7cbcd1fc1a6453463f717e2') build() { - cd ${srcdir}/${_pkgrealname}-${pkgver} + cd "${srcdir}/${_pkgrealname}-${pkgver}" LIBS=-lpthread ./configure \ --prefix=/usr \ --enable-debugger \ @@ -26,7 +26,7 @@ build() { } package() { - cd ${srcdir}/${_pkgrealname}-${pkgver} + cd "${srcdir}/${_pkgrealname}-${pkgver}" make prefix=${startdir}/pkg/usr install } diff --git a/broadcom-wl-ck/PKGBUILD b/broadcom-wl-ck/PKGBUILD index 74fde49b8..433c50dd9 100644 --- a/broadcom-wl-ck/PKGBUILD +++ b/broadcom-wl-ck/PKGBUILD @@ -4,7 +4,7 @@ pkgname=broadcom-wl-ck pkgver=5.100.82.112 -pkgrel=7 +pkgrel=8 _pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver for linux-ck.' pkgdesc="${_pkgdesc}" arch=('i686' 'x86_64') diff --git a/doublecmd-gtk-ppa/PKGBUILD b/doublecmd-gtk-ppa/PKGBUILD index 567ac36c6..10d4c6842 100644 --- a/doublecmd-gtk-ppa/PKGBUILD +++ b/doublecmd-gtk-ppa/PKGBUILD @@ -4,10 +4,10 @@ pkgname=doublecmd-gtk-ppa _pkgname=${pkgname%-ppa} -pkgver=0.5.2 -_pkgver=4191 +pkgver=0.5.3.1 +_pkgver=4263 pkgrel=1 -_pkgsuf=M~natty +_pkgsuf=M~oneiric pkgdesc="Double Commander is a cross platform open source file manager with two panels side by side. It is inspired by Total Commander and features some new ideas." arch=('i686' 'x86_64') url='http://doublecmd.sourceforge.net' @@ -23,17 +23,18 @@ options=('!strip') case ${CARCH} in i686) _bldarch='i386' - md5sums=('5f98ccf086e0a29ad1670b65b768ef26') + md5sums=('0b2a25f7503a5043916446149cdab3f6') ;; x86_64) _bldarch='amd64' - md5sums=('34903a33089e95fa3915a3c0ad24687f') + md5sums=('fcb99d4b3878e93dc886cbf40fc2bbd4') ;; esac _url=https://launchpad.net/~alexx2000/+archive/doublecmd/+files source=(${_url}/${_pkgname}_${pkgver}-${_pkgver}${_pkgsuf}_${_bldarch}.deb) +#https://launchpad.net/~alexx2000/+archive/doublecmd/+build/3022534/+files/doublecmd-gtk_0.5.2-4191M~oneiric_i386.deb build() { msg2 "Extracting files..." cd "$srcdir" diff --git a/doublecmd-gtk2-bin-nightly/PKGBUILD b/doublecmd-gtk2-bin-nightly/PKGBUILD index 6af129b08..716673251 100644 --- a/doublecmd-gtk2-bin-nightly/PKGBUILD +++ b/doublecmd-gtk2-bin-nightly/PKGBUILD @@ -1,8 +1,8 @@ pkgname=doublecmd-gtk2-bin-nightly -pkgver=0.5.2 +pkgver=0.5.3.1 _pkgver=beta -pkgrel=2 +pkgrel=1 pkgdesc="Double Commander is a cross platform open source file manager with two panels side by side. It is inspired by Total Commander and features some new ideas." arch=('i686') url='http://doublecmd.sourceforge.net' @@ -12,18 +12,19 @@ provides=('doublecmd') conflicts=('doublecmd-svn' 'doublecmd-ppa') replaces=('doublecmd' 'doublecmd-svn') license=('GPL2') -install=doublecmd-gtk2-bin-nightly.install source=('doublecmd.desktop') md5sums=('da7d4b1403dcb2ee52c83d32c82caf7a') + + case ${CARCH} in i686) source=(${source[@]} "http://downloads.sourceforge.net/project/doublecmd/DC%20for%20Linux%2032%20bit/Double%20Commander%20${pkgver}%20beta/doublecmd-${pkgver}.gtk2.i386.tar.xz") - md5sums=(${md5sums[@]} '5cf801d0a844543816e7806b71ec7143') + md5sums=(${md5sums[@]} '3a3c6c7d822e3c84473ddacd8c35b21f') ;; x86_64) source=(${source[@]} "http://downloads.sourceforge.net/project/doublecmd/DC%20for%20Linux%2064%20bit/Double%20Commander%20${pkgver}%20beta/doublecmd-${pkgver}.gtk2.x86_64.tar.xz") - md5sums=(${md5sums[@]} '8c996631f75b866d5e93c1bf1eeba20e') + md5sums=(${md5sums[@]} 'c787ed46a0b4f7d77151d7c1548f7df7') ;; esac diff --git a/doublecmd-gtk2-bin-nightly/doublecmd-gtk2-bin-nightly.install b/doublecmd-gtk2-bin-nightly/doublecmd-gtk2-bin-nightly.install deleted file mode 100644 index d1fe7cd58..000000000 --- a/doublecmd-gtk2-bin-nightly/doublecmd-gtk2-bin-nightly.install +++ /dev/null @@ -1,23 +0,0 @@ -pkgname=doublecmd-gtk2-bin-nightly - -post_install() { - case ${HOSTTYPE} in - x86_64) - ln -s /lib/libpcre.so.0 /lib/libpcre.so.3 - ;; - esac - # echo "Before using doublecmd, copy /opt/doublecmd/multiarc.ini to your HOME/.config/doublecmd/" -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - case ${HOSTTYPE} in - x86_64) - rm /lib/libpcre.so.3 - ;; - esac -} - diff --git a/ez-setup/PKGBUILD b/ez-setup/PKGBUILD index 014631cfa..4820a9e61 100644 --- a/ez-setup/PKGBUILD +++ b/ez-setup/PKGBUILD @@ -15,11 +15,11 @@ sha256sums=('303c5b17d552d1e3fb0505d80549f8579f557e13d8dc90e5ecef3c07d7f58642') sha512sums=('4e66d17fd410217e964dcd177a208ea64ef79e3910fc524b6e6627e56e674e6d41761f2e33d8e0ae34096a7485804fa05157415b4d072eb61ff35d3996b563e9') build() { - cd $srcdir/$_realname-$pkgver + cd "$srcdir/$_realname-$pkgver" python setup.py build } package() { - cd $srcdir/$_realname-$pkgver + cd "$srcdir/$_realname-$pkgver" python setup.py install --root=$pkgdir } diff --git a/gradel/PKGBUILD b/gradel/PKGBUILD index 70ee15465..01cd797a7 100644 --- a/gradel/PKGBUILD +++ b/gradel/PKGBUILD @@ -1,29 +1,33 @@ -# GradeL: Installer: Arch -# Contributor: Chris Giles +# Contributor: Xavion pkgname=gradel -pkgver=0.11.2 +pkgver=0.12.2 pkgrel=1 pkgdesc="A gradebook program for teachers" arch=("i686" "x86_64") url="http://${pkgname}.sourceforge.net/" license=("GPL") -depends=("gambas2") +depends=("gambas2-runtime" "gambas2-gb-qt" "gambas2-gb-qt-ext" "gambas2-gb-form" "gambas2-gb-net" "gambas2-gb-net-curl") +makedepends=("gambas2-devel") options=(!emptydirs) - source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-src.tar.gz) -sha1sums=('ce946dc19b8951ab923a082e6959d3fe2630b75e') build() { - cd ${srcdir}/${pkgname}-${pkgver}/ + cd "${srcdir}"/${pkgname}-${pkgver}/ # Variables - export DESTDIR=${pkgdir} + export DESTDIR="${pkgdir}" + + sh ./compile.sh +} - # Build - sh ./compile.sh || return 1 - sh ./install.sh || return 1 +package() { + cd "${srcdir}"/${pkgname}-${pkgver}/ + + sh ./install.sh # Desktop - install -D ${startdir}/extra/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -D ${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop } + +sha1sums=('ad3ae11636137961052ace908e85049b6c578072') diff --git a/gradel/extra/gradel.desktop b/gradel/extra/gradel.desktop deleted file mode 100644 index f52f24728..000000000 --- a/gradel/extra/gradel.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Name=GradeL -GenericName=A gradebook program for teachers -Comment=A gradebook program for teachers -#Version=0.1 -Type=Application -Categories=KDE;Qt;Education;DataVisualization -Terminal=false -Encoding=UTF-8 -Icon=gradel -Exec=gradel -#ServiceTypes=inode/directory -#Actions=Create; -#X-KDE-Submenu= -#X-KDE-Priority=TopLevel -#X-KDE-Icon=tgz -X-KDE-StartupNotify=true -#X-DCOP-ServiceType=Unique diff --git a/hodoku-build/PKGBUILD b/hodoku-build/PKGBUILD index 147f147a5..67e1bb6bb 100644 --- a/hodoku-build/PKGBUILD +++ b/hodoku-build/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Auguste Pop pkgname=hodoku-build -pkgver=2.1.1 -pkgrel=2 +pkgver=2.1.2 +pkgrel=1 pkgdesc="A sudoku helper written in Java" arch=('any') url=('http://hodoku.sourceforge.net') @@ -17,10 +17,9 @@ _PKGCLASS=HoDoKu source=("http://downloads.sourceforge.net/project/$_PKGNAME/$_PKGNAME/${_PKGNAME}_${pkgver}/$_PKGNAME-${pkgver//./-}-src.zip" "$_PKGNAME.sh" "$_PKGNAME.desktop") -md5sums=('c257b941d219ca3ae84c3bd6237e9a5e' +md5sums=('63251f5a4bed060c0f39d95cb28222a1' 'd29a1647df264d1379ae48783ff2eb38' '557ca158902fddf06cbda7c7c9480c08') - build() { cd "$srcdir/$_PKGCLASS" diff --git a/ldc-git/PKGBUILD b/ldc-git/PKGBUILD index d508b7ef0..a3d0f43fb 100644 --- a/ldc-git/PKGBUILD +++ b/ldc-git/PKGBUILD @@ -17,7 +17,7 @@ _gitroot=https://github.com/ldc-developers/ldc.git _gitname=ldc build() { - cd $srcdir + cd "$srcdir" msg "Connecting to GIT repository $_gitroot..." @@ -41,6 +41,6 @@ build() { } package() { - cd $srcdir/$_gitname/build - make DESTDIR="$pkgdir" install || return 1 + cd "$srcdir/$_gitname/build" + make DESTDIR="$pkgdir" install } diff --git a/lilypond-devel/PKGBUILD b/lilypond-devel/PKGBUILD index 71807a019..1ae541eca 100644 --- a/lilypond-devel/PKGBUILD +++ b/lilypond-devel/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrick McCarty pkgname=lilypond-devel -pkgver=2.15.24 +pkgver=2.15.26 pkgrel=1 pkgdesc="An automated music engraving system (development version)" arch=('i686' 'x86_64') @@ -19,10 +19,8 @@ optdepends=('netpbm: building HTML documentation' provides=("lilypond=$pkgver") conflicts=('lilypond' 'lilypond-git') install=$pkgname.install -source=(http://download.linuxaudio.org/lilypond/sources/v2.15/lilypond-$pkgver.tar.gz - python2.patch) -sha256sums=('368be680ce2305ca3fa35aba63a62c75f6babd3ecfb46b94f81d1dadc43e1c18' - '80f5be4313d08bd481d0dd04e767ebb79d1b99b05fb373b5d4cb96cdbb5cf4b4') +source=(http://download.linuxaudio.org/lilypond/sources/v2.15/lilypond-$pkgver.tar.gz) +sha256sums=('6cb9140a60b3ca9fa7dac83a84ba11e95bd430061d24c523e88adc8beb45e922') build() { cd "$srcdir/lilypond-$pkgver" @@ -33,9 +31,10 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - patch -p1 -i "$srcdir/python2.patch" + export PYTHON="python2" + export PYTHON_CONFIG="python2-config" - PYTHON="python2" ./autogen.sh --prefix=/usr + ./configure --prefix=/usr make all } diff --git a/lilypond-devel/python2.patch b/lilypond-devel/python2.patch deleted file mode 100644 index f7a9967a4..000000000 --- a/lilypond-devel/python2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 -index 9cb66d7..b688191 100644 ---- a/stepmake/aclocal.m4 -+++ b/stepmake/aclocal.m4 -@@ -972,7 +972,7 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ - fi - ]) - -- AC_CHECK_PROGS(PYTHON_CONFIG, python-config, no) -+ AC_CHECK_PROGS(PYTHON_CONFIG, python2-config python-config, no) - - if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then - # Clean out junk: http://bugs.python.org/issue3290 diff --git a/nvidia-ck/PKGBUILD b/nvidia-ck/PKGBUILD index e1be61b8a..91ae22cc1 100644 --- a/nvidia-ck/PKGBUILD +++ b/nvidia-ck/PKGBUILD @@ -6,7 +6,7 @@ pkgname=nvidia-ck pkgver=290.10 _extramodules=extramodules-3.2-ck _kernver="$(cat /lib/modules/${_extramodules}/version)" -pkgrel=2 +pkgrel=3 _pkgdesc="nVidia drivers for linux-ck." pkgdesc="$_pkgdesc" arch=('i686' 'x86_64') diff --git a/pacman-color/PKGBUILD b/pacman-color/PKGBUILD index 179c179ff..82cbe400f 100644 --- a/pacman-color/PKGBUILD +++ b/pacman-color/PKGBUILD @@ -2,18 +2,18 @@ # Contributor: vogo pkgname=pacman-color -pkgver=3.5.4 +pkgver=4.0.1 pkgrel=1 pkgdesc="A color patched command-line frontend for libalpm (Pacman)" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" license=('GPL') -depends=('pacman>=3.5' 'pacman<3.6') +depends=('pacman>=4.0' 'pacman<4.1') backup=('etc/pacman.d/color.conf') source=("http://mirrors.kernel.org/archlinux/other/pacman/pacman-${pkgver}.tar.gz" "${pkgname}-${pkgver}.patch" 'color.conf') -md5sums=('2dd3a85d55ee3dd89abd349aa837447c' - 'a99d2c644ac4d43340f52c223c1efef1' +md5sums=('76bd88eff8cd94bc9899faa091822dc1' + '56398908f07e829a526964fd466d85e5' '47665f5054196c20ba0dd280a8d4c5e1') build() { @@ -24,11 +24,11 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --disable-doc - make ${MAKEFLAGS} + make } package() { - # install pacman-color & color.conf + # install pacman-color && color.conf install -Dm755 "pacman-${pkgver}/src/pacman/.libs/pacman" "${pkgdir}/usr/bin/pacman-color" install -Dm644 'color.conf' "${pkgdir}/etc/pacman.d/color.conf" } diff --git a/pacman-color/pacman-color-3.5.4.patch b/pacman-color/pacman-color-4.0.1.patch similarity index 64% rename from pacman-color/pacman-color-3.5.4.patch rename to pacman-color/pacman-color-4.0.1.patch index 610051d06..38a848a59 100644 --- a/pacman-color/pacman-color-3.5.4.patch +++ b/pacman-color/pacman-color-4.0.1.patch @@ -1,41 +1,44 @@ -diff -Naur a/src/pacman/callback.c b/src/pacman/callback.c ---- a/src/pacman/callback.c 2011-08-09 02:15:07.000000000 +0300 -+++ b/src/pacman/callback.c 2011-08-10 13:41:09.980308632 +0300 -@@ -219,16 +219,16 @@ +diff -Npaur a/src/pacman/callback.c b/src/pacman/callback.c +--- a/src/pacman/callback.c 2011-11-15 17:07:16.000000000 +0200 ++++ b/src/pacman/callback.c 2011-11-22 00:34:58.246461928 +0200 +@@ -221,16 +221,16 @@ void cb_event(alpm_event_t event, void * printf(_("generating %s with %s... "), (char *)data1, (char *)data2); break; - case PM_TRANS_EVT_DELTA_PATCH_DONE: + case ALPM_EVENT_DELTA_PATCH_DONE: - printf(_("success!\n")); + color_printf(COLOR_GREEN_ALL, _("success!\n")); break; - case PM_TRANS_EVT_DELTA_PATCH_FAILED: + case ALPM_EVENT_DELTA_PATCH_FAILED: - printf(_("failed.\n")); + color_printf(COLOR_RED_ALL, _("failed.\n")); break; - case PM_TRANS_EVT_SCRIPTLET_INFO: - printf("%s", (char*)data1); + case ALPM_EVENT_SCRIPTLET_INFO: + printf("%s", (char *)data1); break; - case PM_TRANS_EVT_RETRIEVE_START: -- printf(_(":: Retrieving packages from %s...\n"), (char*)data1); -+ color_printf(COLOR_DOUBLECOLON, _(":: Retrieving packages from %s...\n"), (char*)data1); + case ALPM_EVENT_RETRIEVE_START: +- printf(_(":: Retrieving packages from %s...\n"), (char *)data1); ++ color_printf(COLOR_DOUBLECOLON, _(":: Retrieving packages from %s...\n"), (char *)data1); break; - case PM_TRANS_EVT_DISKSPACE_START: + case ALPM_EVENT_DISKSPACE_START: if(config->noprogressbar) { -@@ -257,11 +257,11 @@ - { +@@ -264,14 +264,14 @@ void cb_question(alpm_question_t event, switch(event) { - case PM_TRANS_CONV_INSTALL_IGNOREPKG: -- *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), -+ *response = yesno(COLOR_DOUBLECOLON, _(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), - alpm_pkg_get_name(data1)); + case ALPM_QUESTION_INSTALL_IGNOREPKG: + if(!config->op_s_downloadonly) { +- *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), ++ *response = yesno(COLOR_DOUBLECOLON, _(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), + alpm_pkg_get_name(data1)); + } else { + *response = 1; + } break; - case PM_TRANS_CONV_REPLACE_PKG: + case ALPM_QUESTION_REPLACE_PKG: - *response = yesno(_(":: Replace %s with %s/%s?"), + *response = yesno(COLOR_DOUBLECOLON, _(":: Replace %s with %s/%s?"), alpm_pkg_get_name(data1), (char *)data3, alpm_pkg_get_name(data2)); -@@ -270,12 +270,12 @@ +@@ -280,12 +280,12 @@ void cb_question(alpm_question_t event, /* data parameters: target package, local package, conflict (strings) */ /* print conflict only if it contains new information */ if(strcmp(data1, data3) == 0 || strcmp(data2, data3) == 0) { @@ -50,7 +53,7 @@ diff -Naur a/src/pacman/callback.c b/src/pacman/callback.c (char *)data1, (char *)data2, (char *)data3, -@@ -292,13 +292,13 @@ +@@ -302,13 +302,13 @@ void cb_question(alpm_question_t event, (char *)alpm_pkg_get_name(i->data)); count++; } @@ -67,158 +70,195 @@ diff -Naur a/src/pacman/callback.c b/src/pacman/callback.c "Do you want to skip the above package for this upgrade?", "Do you want to skip the above packages for this upgrade?", count)); -@@ -310,7 +310,7 @@ +@@ -320,7 +320,7 @@ void cb_question(alpm_question_t event, alpm_list_t *providers = (alpm_list_t *)data1; - int count = alpm_list_count(providers); - char *depstring = alpm_dep_compute_string((pmdepend_t *)data2); -- printf(_(":: There are %d providers available for %s:\n"), count, -+ color_printf(COLOR_DOUBLECOLON, _(":: There are %d providers available for %s:\n"), count, + size_t count = alpm_list_count(providers); + char *depstring = alpm_dep_compute_string((alpm_depend_t *)data2); +- printf(_(":: There are %zd providers available for %s:\n"), count, ++ color_printf(COLOR_DOUBLECOLON, _(":: There are %zd providers available for %s:\n"), count, depstring); free(depstring); select_display(providers); -@@ -319,7 +319,7 @@ +@@ -329,7 +329,7 @@ void cb_question(alpm_question_t event, break; - case PM_TRANS_CONV_LOCAL_NEWER: + case ALPM_QUESTION_LOCAL_NEWER: if(!config->op_s_downloadonly) { - *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), + *response = yesno(COLOR_DOUBLECOLON, _(":: %s-%s: local version is newer. Upgrade anyway?"), alpm_pkg_get_name(data1), alpm_pkg_get_version(data1)); } else { -@@ -327,7 +327,7 @@ +@@ -337,7 +337,7 @@ void cb_question(alpm_question_t event, } break; - case PM_TRANS_CONV_CORRUPTED_PKG: -- *response = yesno(_(":: File %s is corrupted. Do you want to delete it?"), -+ *response = yesno(COLOR_DOUBLECOLON, _(":: File %s is corrupted. Do you want to delete it?"), - (char *)data1); + case ALPM_QUESTION_CORRUPTED_PKG: +- *response = yesno(_(":: File %s is corrupted (%s).\n" ++ *response = yesno(COLOR_DOUBLECOLON, _(":: File %s is corrupted (%s).\n" + "Do you want to delete it?"), + (char *)data1, + alpm_strerror(*(enum _alpm_errno_t *)data2)); +@@ -347,7 +347,7 @@ void cb_question(alpm_question_t event, + alpm_pgpkey_t *key = data1; + char created[12]; + strftime(created, 12, "%Y-%m-%d", localtime(&(key->created))); +- *response = yesno(_(":: Import PGP key %s, \"%s\", created %s?"), ++ *response = yesno(COLOR_DOUBLECOLON, _(":: Import PGP key %s, \"%s\", created %s?"), + key->fingerprint, key->uid, created); + } break; - } -@@ -451,8 +451,9 @@ +@@ -481,8 +481,9 @@ void cb_progress(alpm_progress_t event, } - printf("(%*ld/%*ld) %ls%-*s", digits, (unsigned long)current, - digits, (unsigned long)howmany, wcstr, padwid, ""); + color_printf(COLOR_BLUE_ALL, "(%*ld/%*ld)", digits, (unsigned long)current, -+ digits, (unsigned long)howmany); ++ digits, (unsigned long)howmany); + printf(" %ls%-*s", wcstr, padwid, ""); free(wcstr); -diff -Naur a/src/pacman/package.c b/src/pacman/package.c ---- a/src/pacman/package.c 2011-02-28 19:13:17.000000000 +0200 -+++ b/src/pacman/package.c 2011-08-10 13:41:09.980308632 +0300 -@@ -92,47 +92,47 @@ +diff -Npaur a/src/pacman/package.c b/src/pacman/package.c +--- a/src/pacman/package.c 2011-10-21 18:50:07.000000000 +0300 ++++ b/src/pacman/package.c 2011-11-22 00:34:58.247461928 +0200 +@@ -41,7 +41,7 @@ + * @param deps a list with items of type alpm_depend_t + * @return a string list, must be freed + */ +-static void deplist_display(const char *title, ++static void deplist_display(const colordata_t *colors_title, const char *title, + alpm_list_t *deps) + { + alpm_list_t *i, *text = NULL; +@@ -49,7 +49,7 @@ static void deplist_display(const char * + alpm_depend_t *dep = alpm_list_getdata(i); + text = alpm_list_add(text, alpm_dep_compute_string(dep)); } +- list_display(title, text); ++ list_display(colors_title, title, text); + FREELIST(text); + } + +@@ -102,65 +102,65 @@ void dump_pkg_full(alpm_pkg_t *pkg, int /* actual output */ + if(from == PKG_FROM_SYNCDB) { +- string_display(_("Repository :"), +- alpm_db_get_name(alpm_pkg_get_db(pkg))); ++ color_string_display(COLOR_WHITE_ALL, _("Repository :"), ++ COLOR_MAGENTA_ALL, alpm_db_get_name(alpm_pkg_get_db(pkg))); + } - string_display(_("Name :"), alpm_pkg_get_name(pkg)); - string_display(_("Version :"), alpm_pkg_get_version(pkg)); - string_display(_("URL :"), alpm_pkg_get_url(pkg)); - list_display(_("Licenses :"), alpm_pkg_get_licenses(pkg)); - list_display(_("Groups :"), alpm_pkg_get_groups(pkg)); -- list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); -- list_display(_("Depends On :"), depstrings); +- deplist_display(_("Provides :"), alpm_pkg_get_provides(pkg)); +- deplist_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); - list_display_linebreak(_("Optional Deps :"), alpm_pkg_get_optdepends(pkg)); + color_string_display(COLOR_WHITE_ALL, _("Name :"), COLOR_WHITE_ALL, alpm_pkg_get_name(pkg)); + color_string_display(COLOR_WHITE_ALL, _("Version :"), COLOR_GREEN_ALL, alpm_pkg_get_version(pkg)); + color_string_display(COLOR_WHITE_ALL, _("URL :"), COLOR_CYAN_ALL, alpm_pkg_get_url(pkg)); + list_display(COLOR_WHITE_ALL, _("Licenses :"), alpm_pkg_get_licenses(pkg)); + list_display(COLOR_WHITE_ALL, _("Groups :"), alpm_pkg_get_groups(pkg)); -+ list_display(COLOR_WHITE_ALL, _("Provides :"), alpm_pkg_get_provides(pkg)); -+ list_display(COLOR_WHITE_ALL, _("Depends On :"), depstrings); ++ deplist_display(COLOR_WHITE_ALL, _("Provides :"), alpm_pkg_get_provides(pkg)); ++ deplist_display(COLOR_WHITE_ALL, _("Depends On :"), alpm_pkg_get_depends(pkg)); + list_display_linebreak(COLOR_WHITE_ALL, _("Optional Deps :"), alpm_pkg_get_optdepends(pkg)); - if(level > 0 || level < -1) { + if(extra || from == PKG_FROM_LOCALDB) { - list_display(_("Required By :"), requiredby); + list_display(COLOR_WHITE_ALL, _("Required By :"), requiredby); } -- list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); -- list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); -+ list_display(COLOR_WHITE_ALL, _("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); -+ list_display(COLOR_WHITE_ALL, _("Replaces :"), alpm_pkg_get_replaces(pkg)); - if(level < 0) { -- printf(_("Download Size : %6.2f K\n"), -+ color_printf(COLOR_WHITE_COLON, _("Download Size : %6.2f K\n"), - (double)alpm_pkg_get_size(pkg) / 1024.0); - } - if(level == 0) { -- printf(_("Compressed Size: %6.2f K\n"), -+ color_printf(COLOR_WHITE_COLON, _("Compressed Size: %6.2f K\n"), - (double)alpm_pkg_get_size(pkg) / 1024.0); +- deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); +- deplist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); ++ deplist_display(COLOR_WHITE_ALL, _("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); ++ deplist_display(COLOR_WHITE_ALL, _("Replaces :"), alpm_pkg_get_replaces(pkg)); + + size = humanize_size(alpm_pkg_get_size(pkg), 'K', &label); + if(from == PKG_FROM_SYNCDB) { +- printf(_("Download Size : %6.2f %s\n"), size, label); ++ color_printf(COLOR_WHITE_COLON, _("Download Size : %6.2f %s\n"), size, label); + } else if(from == PKG_FROM_FILE) { +- printf(_("Compressed Size: %6.2f %s\n"), size, label); ++ color_printf(COLOR_WHITE_COLON, _("Compressed Size: %6.2f %s\n"), size, label); } -- printf(_("Installed Size : %6.2f K\n"), -+ color_printf(COLOR_WHITE_COLON, _("Installed Size : %6.2f K\n"), - (double)alpm_pkg_get_isize(pkg) / 1024.0); + size = humanize_size(alpm_pkg_get_isize(pkg), 'K', &label); +- printf(_("Installed Size : %6.2f %s\n"), size, label); ++ color_printf(COLOR_WHITE_COLON, _("Installed Size : %6.2f %s\n"), size, label); + - string_display(_("Packager :"), alpm_pkg_get_packager(pkg)); - string_display(_("Architecture :"), alpm_pkg_get_arch(pkg)); - string_display(_("Build Date :"), bdatestr); + string_display(COLOR_WHITE_ALL, _("Packager :"), alpm_pkg_get_packager(pkg)); + string_display(COLOR_WHITE_ALL, _("Architecture :"), alpm_pkg_get_arch(pkg)); + string_display(COLOR_WHITE_ALL, _("Build Date :"), bdatestr); - if(level > 0) { + if(from == PKG_FROM_LOCALDB) { - string_display(_("Install Date :"), idatestr); - string_display(_("Install Reason :"), reason); + string_display(COLOR_WHITE_ALL, _("Install Date :"), idatestr); + string_display(COLOR_WHITE_ALL, _("Install Reason :"), reason); } - if(level >= 0) { + if(from == PKG_FROM_FILE || from == PKG_FROM_LOCALDB) { - string_display(_("Install Script :"), + string_display(COLOR_WHITE_ALL, _("Install Script :"), alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No")); } - /* MD5 Sum for sync package */ - if(level < 0) { + if(from == PKG_FROM_SYNCDB) { - string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg)); +- string_display(_("SHA256 Sum :"), alpm_pkg_get_sha256sum(pkg)); +- string_display(_("Signatures :"), + string_display(COLOR_WHITE_ALL, _("MD5 Sum :"), alpm_pkg_get_md5sum(pkg)); ++ string_display(COLOR_WHITE_ALL, _("SHA256 Sum :"), alpm_pkg_get_sha256sum(pkg)); ++ string_display(COLOR_WHITE_ALL, _("Signatures :"), + alpm_pkg_get_base64_sig(pkg) ? _("Yes") : _("None")); + } + if(from == PKG_FROM_FILE) { + alpm_siglist_t siglist; + int err = alpm_pkg_check_pgp_signature(pkg, &siglist); + if(err && alpm_errno(config->handle) == ALPM_ERR_SIG_MISSING) { +- string_display(_("Signatures :"), _("None")); ++ string_display(COLOR_WHITE_ALL, _("Signatures :"), _("None")); + } else if(err) { +- string_display(_("Signatures :"), ++ string_display(COLOR_WHITE_ALL, _("Signatures :"), + alpm_strerror(alpm_errno(config->handle))); + } else { + signature_display(_("Signatures :"), &siglist); + } + alpm_siglist_cleanup(&siglist); } - string_display(_("Description :"), alpm_pkg_get_desc(pkg)); + string_display(COLOR_WHITE_ALL, _("Description :"), alpm_pkg_get_desc(pkg)); /* Print additional package info if info flag passed more than once */ - if(level > 1) { -@@ -153,7 +153,7 @@ - if(pkg == NULL) { - return; - } -- string_display(_("Repository :"), treename); -+ color_string_display(COLOR_WHITE_ALL, _("Repository :"), COLOR_MAGENTA_ALL, treename); - /* invert the level since we are a sync package */ - dump_pkg_full(pkg, -level); - } -@@ -204,7 +204,7 @@ + if(from == PKG_FROM_LOCALDB && extra) { +@@ -219,7 +219,7 @@ void dump_pkg_backups(alpm_pkg_t *pkg) { alpm_list_t *i; - const char *root = alpm_option_get_root(); + const char *root = alpm_option_get_root(config->handle); - printf(_("Backup Files:\n")); + color_printf(COLOR_WHITE_ALL, _("Backup Files:\n")); if(alpm_pkg_get_backup(pkg)) { /* package has backup files, so print them */ for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) { -@@ -241,7 +241,8 @@ - for(i = pkgfiles; i; i = alpm_list_next(i)) { - filestr = alpm_list_getdata(i); - if(!quiet){ -- fprintf(stdout, "%s %s%s\n", pkgname, root, filestr); -+ color_fprintf(stdout, COLOR_WHITE_ALL, "%s", pkgname); -+ fprintf(stdout, " %s%s\n", root, filestr); +@@ -252,7 +252,8 @@ void dump_pkg_files(alpm_pkg_t *pkg, int + for(i = 0; i < pkgfiles->count; i++) { + const alpm_file_t *file = pkgfiles->files + i; + if(!quiet) { +- printf("%s %s%s\n", pkgname, root, file->name); ++ color_printf(COLOR_WHITE_ALL, "%s", pkgname); ++ printf(" %s%s\n", root, file->name); } else { - fprintf(stdout, "%s%s\n", root, filestr); + printf("%s%s\n", root, file->name); } -diff -Naur a/src/pacman/pacman.c b/src/pacman/pacman.c ---- a/src/pacman/pacman.c 2011-05-16 18:32:35.000000000 +0300 -+++ b/src/pacman/pacman.c 2011-08-10 13:41:09.980308632 +0300 -@@ -222,11 +222,22 @@ +diff -Npaur a/src/pacman/pacman.c b/src/pacman/pacman.c +--- a/src/pacman/pacman.c 2011-10-21 18:40:57.000000000 +0300 ++++ b/src/pacman/pacman.c 2011-11-22 00:34:58.247461928 +0200 +@@ -221,11 +221,23 @@ static void usage(int op, const char * c */ static void version(void) { -- printf("\n"); -- printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); -- printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2011 Pacman Development Team\n"); -- printf("\\ '-. '-' '-' '-' Copyright (C) 2002-2006 Judd Vinet\n"); -- printf(" '--'\n"); + color_printf(COLOR_YELLOW_ALL, " .--. "); + printf(" "); + color_printf(COLOR_RED_ALL, " .---. "); @@ -235,10 +275,15 @@ diff -Naur a/src/pacman/pacman.c b/src/pacman/pacman.c + printf(" "); + color_printf(COLOR_RED_ALL, "|.-.-.|"); + printf(" Colored by vogo \n"); + printf("\n"); +- printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); +- printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2011 Pacman Development Team\n"); +- printf("\\ '-. '-' '-' '-' Copyright (C) 2002-2006 Judd Vinet\n"); +- printf(" '--'\n"); printf(_(" This program may be freely redistributed under\n" " the terms of the GNU General Public License.\n")); printf("\n"); -@@ -1327,6 +1338,7 @@ +@@ -799,6 +811,7 @@ int main(int argc, char *argv[]) /* init config data */ config = config_new(); @@ -246,38 +291,40 @@ diff -Naur a/src/pacman/pacman.c b/src/pacman/pacman.c /* disable progressbar if the output is redirected */ if(!isatty(1)) { -@@ -1435,17 +1447,17 @@ +@@ -900,18 +913,18 @@ int main(int argc, char *argv[]) if(config->verbose > 0) { alpm_list_t *i; -- printf("Root : %s\n", alpm_option_get_root()); +- printf("Root : %s\n", alpm_option_get_root(config->handle)); - printf("Conf File : %s\n", config->configfile); -- printf("DB Path : %s\n", alpm_option_get_dbpath()); +- printf("DB Path : %s\n", alpm_option_get_dbpath(config->handle)); - printf("Cache Dirs: "); -+ string_display(COLOR_WHITE_ALL, "Root :", alpm_option_get_root()); ++ string_display(COLOR_WHITE_ALL, "Root :", alpm_option_get_root(config->handle)); + string_display(COLOR_WHITE_ALL, "Conf File :", config->configfile); -+ string_display(COLOR_WHITE_ALL, "DB Path :", alpm_option_get_dbpath()); ++ string_display(COLOR_WHITE_ALL, "DB Path :", alpm_option_get_dbpath(config->handle)); + color_printf(COLOR_WHITE_ALL, "Cache Dirs: "); - for(i = alpm_option_get_cachedirs(); i; i = alpm_list_next(i)) { - printf("%s ", (char*)alpm_list_getdata(i)); + for(i = alpm_option_get_cachedirs(config->handle); i; i = alpm_list_next(i)) { + printf("%s ", (char *)alpm_list_getdata(i)); } printf("\n"); -- printf("Lock File : %s\n", alpm_option_get_lockfile()); -- printf("Log File : %s\n", alpm_option_get_logfile()); +- printf("Lock File : %s\n", alpm_option_get_lockfile(config->handle)); +- printf("Log File : %s\n", alpm_option_get_logfile(config->handle)); +- printf("GPG Dir : %s\n", alpm_option_get_gpgdir(config->handle)); - list_display("Targets :", pm_targets); -+ string_display(COLOR_WHITE_ALL, "Lock File :", alpm_option_get_lockfile()); -+ string_display(COLOR_WHITE_ALL, "Log File :", alpm_option_get_logfile()); ++ string_display(COLOR_WHITE_ALL, "Lock File :", alpm_option_get_lockfile(config->handle)); ++ string_display(COLOR_WHITE_ALL, "Log File :", alpm_option_get_logfile(config->handle)); ++ string_display(COLOR_WHITE_ALL, "GPG Dir :", alpm_option_get_gpgdir(config->handle)); + list_display(COLOR_WHITE_ALL, "Targets :", pm_targets); } /* Log commandline */ -diff -Naur a/src/pacman/query.c b/src/pacman/query.c ---- a/src/pacman/query.c 2011-05-16 18:35:40.000000000 +0300 -+++ b/src/pacman/query.c 2011-08-10 13:41:09.980308632 +0300 -@@ -260,7 +260,9 @@ - pmpkg_t *pkg = alpm_list_getdata(i); +diff -Npaur a/src/pacman/query.c b/src/pacman/query.c +--- a/src/pacman/query.c 2011-10-21 18:40:57.000000000 +0300 ++++ b/src/pacman/query.c 2011-11-22 00:34:58.248461928 +0200 +@@ -266,7 +266,9 @@ static int query_search(alpm_list_t *tar + alpm_pkg_t *pkg = alpm_list_getdata(i); - if (!config->quiet) { + if(!config->quiet) { - printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + color_printf(COLOR_MAGENTA_ALL, "local/"); + color_printf(COLOR_WHITE_ALL, "%s ", alpm_pkg_get_name(pkg)); @@ -285,8 +332,8 @@ diff -Naur a/src/pacman/query.c b/src/pacman/query.c } else { printf("%s", alpm_pkg_get_name(pkg)); } -@@ -277,16 +279,11 @@ - if (!config->quiet) { +@@ -275,16 +277,11 @@ static int query_search(alpm_list_t *tar + if(!config->quiet) { if((grp = alpm_pkg_get_groups(pkg)) != NULL) { alpm_list_t *k; - printf(" ("); @@ -304,19 +351,19 @@ diff -Naur a/src/pacman/query.c b/src/pacman/query.c } /* we need a newline and initial indent first */ -@@ -320,7 +317,8 @@ - packages = alpm_grp_get_pkgs(grp); +@@ -315,7 +312,8 @@ static int query_group(alpm_list_t *targ - for(p = packages; p; p = alpm_list_next(p)) { -- printf("%s %s\n", grpname, alpm_pkg_get_name(alpm_list_getdata(p))); -+ color_printf(COLOR_BLUE_ALL, "%s ", grpname); -+ color_printf(COLOR_WHITE_ALL, "%s\n", alpm_pkg_get_name(alpm_list_getdata(p))); + for(p = grp->packages; p; p = alpm_list_next(p)) { + alpm_pkg_t *pkg = alpm_list_getdata(p); +- printf("%s %s\n", grp->name, alpm_pkg_get_name(pkg)); ++ color_printf(COLOR_BLUE_ALL, "%s ", grp->name); ++ color_printf(COLOR_WHITE_ALL, "%s\n", alpm_pkg_get_name(pkg)); } } } else { -@@ -332,8 +330,8 @@ - const alpm_list_t *p, *packages = alpm_grp_get_pkgs(grp); - for(p = packages; p; p = alpm_list_next(p)) { +@@ -327,8 +325,8 @@ static int query_group(alpm_list_t *targ + const alpm_list_t *p; + for(p = grp->packages; p; p = alpm_list_next(p)) { if(!config->quiet) { - printf("%s %s\n", grpname, - alpm_pkg_get_name(alpm_list_getdata(p))); @@ -325,38 +372,37 @@ diff -Naur a/src/pacman/query.c b/src/pacman/query.c } else { printf("%s\n", alpm_pkg_get_name(alpm_list_getdata(p))); } -@@ -481,7 +479,8 @@ +@@ -478,7 +476,8 @@ static int display(alpm_pkg_t *pkg) if(!config->op_q_info && !config->op_q_list && !config->op_q_changelog && !config->op_q_check) { - if (!config->quiet) { + if(!config->quiet) { - printf("%s %s\n", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + color_printf(COLOR_WHITE_ALL, "%s ", alpm_pkg_get_name(pkg)); + color_printf(COLOR_GREEN_ALL, "%s\n", alpm_pkg_get_version(pkg)); } else { printf("%s\n", alpm_pkg_get_name(pkg)); } -diff -Naur a/src/pacman/remove.c b/src/pacman/remove.c ---- a/src/pacman/remove.c 2011-02-28 19:13:17.000000000 +0200 -+++ b/src/pacman/remove.c 2011-08-10 13:41:09.980308632 +0300 -@@ -106,7 +106,7 @@ - case PM_ERR_PKG_INVALID_ARCH: +diff -Npaur a/src/pacman/remove.c b/src/pacman/remove.c +--- a/src/pacman/remove.c 2011-10-21 18:40:57.000000000 +0300 ++++ b/src/pacman/remove.c 2011-11-22 00:34:58.248461928 +0200 +@@ -111,14 +111,14 @@ int pacman_remove(alpm_list_t *targets) + case ALPM_ERR_PKG_INVALID_ARCH: for(i = data; i; i = alpm_list_next(i)) { char *pkg = alpm_list_getdata(i); - printf(_(":: package %s does not have a valid architecture\n"), pkg); + color_printf(COLOR_DOUBLECOLON, _(":: package %s does not have a valid architecture\n"), pkg); } break; - case PM_ERR_UNSATISFIED_DEPS: -@@ -114,7 +114,7 @@ - pmdepmissing_t *miss = alpm_list_getdata(i); - pmdepend_t *dep = alpm_miss_get_dep(miss); - char *depstring = alpm_dep_compute_string(dep); -- printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), -+ color_printf(COLOR_DOUBLECOLON, _(":: %s: requires %s\n"), alpm_miss_get_target(miss), - depstring); + case ALPM_ERR_UNSATISFIED_DEPS: + for(i = data; i; i = alpm_list_next(i)) { + alpm_depmissing_t *miss = alpm_list_getdata(i); + char *depstring = alpm_dep_compute_string(miss->depend); +- printf(_(":: %s: requires %s\n"), miss->target, depstring); ++ color_printf(COLOR_DOUBLECOLON, _(":: %s: requires %s\n"), miss->target, depstring); free(depstring); } -@@ -137,7 +137,7 @@ + break; +@@ -140,7 +140,7 @@ int pacman_remove(alpm_list_t *targets) holdpkg = 1; } } @@ -365,19 +411,19 @@ diff -Naur a/src/pacman/remove.c b/src/pacman/remove.c retval = 1; goto cleanup; } -@@ -157,7 +157,7 @@ +@@ -160,7 +160,7 @@ int pacman_remove(alpm_list_t *targets) /* print targets and ask user confirmation */ - display_targets(pkglist, 0); + display_targets(); printf("\n"); - if(yesno(_("Do you want to remove these packages?")) == 0) { + if(yesno(NULL, _("Do you want to remove these packages?")) == 0) { retval = 1; goto cleanup; } -diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c ---- a/src/pacman/sync.c 2011-07-25 17:52:36.000000000 +0300 -+++ b/src/pacman/sync.c 2011-08-10 13:41:09.980308632 +0300 -@@ -102,7 +102,7 @@ +diff -Npaur a/src/pacman/sync.c b/src/pacman/sync.c +--- a/src/pacman/sync.c 2011-11-15 16:29:05.000000000 +0200 ++++ b/src/pacman/sync.c 2011-11-22 00:34:58.249461928 +0200 +@@ -103,7 +103,7 @@ static int sync_cleandb(const char *dbpa /* We have a database that doesn't match any syncdb. * Ask the user if he wants to remove it. */ if(!found) { @@ -386,27 +432,27 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c continue; } -@@ -124,8 +124,8 @@ +@@ -126,8 +126,8 @@ static int sync_cleandb_all(void) int ret = 0; - dbpath = alpm_option_get_dbpath(); + dbpath = alpm_option_get_dbpath(config->handle); - printf(_("Database directory: %s\n"), dbpath); - if(!yesno(_("Do you want to remove unused repositories?"))) { + color_printf(COLOR_WHITE_COLON, _("Database directory: %s\n"), dbpath); + if(!yesno(NULL, _("Do you want to remove unused repositories?"))) { - return(0); + return 0; } /* The sync dbs were previously put in dbpath/ but are now in dbpath/sync/. -@@ -148,7 +148,7 @@ +@@ -155,7 +155,7 @@ static int sync_cleancache(int level) int ret = 0; - for(i = alpm_option_get_cachedirs(); i; i = alpm_list_next(i)) { -- printf(_("Cache directory: %s\n"), (char*)alpm_list_getdata(i)); -+ color_printf(COLOR_WHITE_COLON, _("Cache directory: %s\n"), (char*)alpm_list_getdata(i)); + for(i = cachedirs; i; i = alpm_list_next(i)) { +- printf(_("Cache directory: %s\n"), (char *)alpm_list_getdata(i)); ++ color_printf(COLOR_WHITE_COLON, _("Cache directory: %s\n"), (char *)alpm_list_getdata(i)); } if(!config->cleanmethod) { -@@ -157,19 +157,19 @@ +@@ -164,19 +164,19 @@ static int sync_cleancache(int level) } if(level == 1) { @@ -420,25 +466,25 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c } - if(!yesno(_("Do you want to remove all other packages from cache?"))) { + if(!yesno(NULL, _("Do you want to remove all other packages from cache?"))) { - return(0); + return 0; } printf(_("removing old packages from cache...\n")); } else { - if(!noyes(_("Do you want to remove ALL files from cache?"))) { + if(!noyes(NULL, _("Do you want to remove ALL files from cache?"))) { - return(0); + return 0; } printf(_("removing all files from cache...\n")); -@@ -212,7 +212,7 @@ - * files here that aren't valid packages. we also don't need a full +@@ -226,7 +226,7 @@ static int sync_cleancache(int level) * load of the package, just the metadata. */ - if(alpm_pkg_load(path, 0, &localpkg) != 0 || localpkg == NULL) { -- if(yesno(_("File %s does not seem to be a valid package, remove it?"), path)) { -+ if(yesno(NULL, _("File %s does not seem to be a valid package, remove it?"), path)) { + if(alpm_pkg_load(config->handle, path, 0, 0, &localpkg) != 0 + || localpkg == NULL) { +- if(yesno(_("File %s does not seem to be a valid package, remove it?"), ++ if(yesno(NULL, _("File %s does not seem to be a valid package, remove it?"), + path)) { if(localpkg) { alpm_pkg_free(localpkg); - } -@@ -306,9 +306,9 @@ +@@ -321,9 +321,9 @@ static void print_installed(alpm_db_t *d if(lpkg) { const char *lpkgver = alpm_pkg_get_version(lpkg); if(strcmp(lpkgver,pkgver) == 0) { @@ -450,10 +496,10 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c } } } -@@ -341,8 +341,9 @@ - pmpkg_t *pkg = alpm_list_getdata(j); +@@ -356,8 +356,9 @@ static int sync_search(alpm_list_t *sync + alpm_pkg_t *pkg = alpm_list_getdata(j); - if (!config->quiet) { + if(!config->quiet) { - printf("%s/%s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + color_printf(COLOR_MAGENTA_ALL, "%s/", alpm_db_get_name(db)); @@ -462,8 +508,8 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c } else { printf("%s", alpm_pkg_get_name(pkg)); } -@@ -358,16 +359,11 @@ - if (!config->quiet) { +@@ -365,16 +366,11 @@ static int sync_search(alpm_list_t *sync + if(!config->quiet) { if((grp = alpm_pkg_get_groups(pkg)) != NULL) { alpm_list_t *k; - printf(" ("); @@ -481,9 +527,9 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c } print_installed(db_local, pkg); -@@ -402,8 +398,8 @@ +@@ -409,8 +405,8 @@ static int sync_group(int level, alpm_li /* get names of packages in group */ - for(k = alpm_grp_get_pkgs(grp); k; k = alpm_list_next(k)) { + for(k = grp->packages; k; k = alpm_list_next(k)) { if(!config->quiet) { - printf("%s %s\n", grpname, - alpm_pkg_get_name(alpm_list_getdata(k))); @@ -492,21 +538,21 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c } else { printf("%s\n", alpm_pkg_get_name(alpm_list_getdata(k))); } -@@ -421,8 +417,8 @@ +@@ -427,8 +423,8 @@ static int sync_group(int level, alpm_li if(level > 1) { - for(k = alpm_grp_get_pkgs(grp); k; k = alpm_list_next(k)) { -- printf("%s %s\n", grpname, + for(k = grp->packages; k; k = alpm_list_next(k)) { +- printf("%s %s\n", grp->name, - alpm_pkg_get_name(alpm_list_getdata(k))); -+ color_printf(COLOR_BLUE_ALL, "%s ", grpname); ++ color_printf(COLOR_BLUE_ALL, "%s ", grp->name); + color_printf(COLOR_WHITE_ALL, "%s\n", alpm_pkg_get_name(alpm_list_getdata(k))); } } else { /* print grp names only, no package names */ -@@ -559,8 +555,9 @@ - pmpkg_t *pkg = alpm_list_getdata(j); +@@ -546,8 +542,9 @@ static int sync_list(alpm_list_t *syncs, + alpm_pkg_t *pkg = alpm_list_getdata(j); - if (!config->quiet) { + if(!config->quiet) { - printf("%s %s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + color_printf(COLOR_MAGENTA_ALL, "%s ", alpm_db_get_name(db)); @@ -515,7 +561,7 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c print_installed(db_local, pkg); printf("\n"); } else { -@@ -640,7 +637,7 @@ +@@ -630,7 +627,7 @@ static int process_group(alpm_list_t *db if(config->print == 0) { @@ -524,46 +570,47 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c group); select_display(pkgs); char *array = malloc(count); -@@ -756,7 +753,7 @@ +@@ -747,7 +744,7 @@ static int sync_trans(alpm_list_t *targe } if(config->op_s_upgrade) { - printf(_(":: Starting full system upgrade...\n")); + color_printf(COLOR_DOUBLECOLON, _(":: Starting full system upgrade...\n")); - alpm_logaction("starting full system upgrade\n"); - if(alpm_sync_sysupgrade(config->op_s_upgrade >= 2) == -1) { - pm_fprintf(stderr, PM_LOG_ERROR, "%s\n", alpm_strerrorlast()); -@@ -774,7 +771,7 @@ - case PM_ERR_PKG_INVALID_ARCH: + alpm_logaction(config->handle, "starting full system upgrade\n"); + if(alpm_sync_sysupgrade(config->handle, config->op_s_upgrade >= 2) == -1) { + pm_printf(ALPM_LOG_ERROR, "%s\n", alpm_strerror(alpm_errno(config->handle))); +@@ -773,14 +770,14 @@ int sync_prepare_execute(void) + case ALPM_ERR_PKG_INVALID_ARCH: for(i = data; i; i = alpm_list_next(i)) { char *pkg = alpm_list_getdata(i); - printf(_(":: package %s does not have a valid architecture\n"), pkg); + color_printf(COLOR_DOUBLECOLON, _(":: package %s does not have a valid architecture\n"), pkg); } break; - case PM_ERR_UNSATISFIED_DEPS: -@@ -782,7 +779,7 @@ - pmdepmissing_t *miss = alpm_list_getdata(i); - pmdepend_t *dep = alpm_miss_get_dep(miss); - char *depstring = alpm_dep_compute_string(dep); -- printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), -+ color_printf(COLOR_DOUBLECOLON, _(":: %s: requires %s\n"), alpm_miss_get_target(miss), - depstring); + case ALPM_ERR_UNSATISFIED_DEPS: + for(i = data; i; i = alpm_list_next(i)) { + alpm_depmissing_t *miss = alpm_list_getdata(i); + char *depstring = alpm_dep_compute_string(miss->depend); +- printf(_(":: %s: requires %s\n"), miss->target, depstring); ++ color_printf(COLOR_DOUBLECOLON, _(":: %s: requires %s\n"), miss->target, depstring); free(depstring); } -@@ -795,9 +792,9 @@ - const char *reason = alpm_conflict_get_reason(conflict); + break; +@@ -789,11 +786,11 @@ int sync_prepare_execute(void) + alpm_conflict_t *conflict = alpm_list_getdata(i); /* only print reason if it contains new information */ - if(strcmp(package1, reason) == 0 || strcmp(package2, reason) == 0) { -- printf(_(":: %s and %s are in conflict\n"), package1, package2); -+ color_printf(COLOR_DOUBLECOLON, _(":: %s and %s are in conflict\n"), package1, package2); + if(conflict->reason->mod == ALPM_DEP_MOD_ANY) { +- printf(_(":: %s and %s are in conflict\n"), ++ color_printf(COLOR_DOUBLECOLON, _(":: %s and %s are in conflict\n"), + conflict->package1, conflict->package2); } else { -- printf(_(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); -+ color_printf(COLOR_DOUBLECOLON, _(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); + char *reason = alpm_dep_compute_string(conflict->reason); +- printf(_(":: %s and %s are in conflict (%s)\n"), ++ color_printf(COLOR_DOUBLECOLON, _(":: %s and %s are in conflict (%s)\n"), + conflict->package1, conflict->package2, reason); + free(reason); } - } - break; -@@ -827,9 +824,9 @@ +@@ -826,9 +823,9 @@ int sync_prepare_execute(void) int confirm; if(config->op_s_downloadonly) { @@ -575,16 +622,16 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c } if(!confirm) { goto cleanup; -@@ -851,7 +848,7 @@ - alpm_fileconflict_get_ctarget(conflict)); +@@ -848,7 +845,7 @@ int sync_prepare_execute(void) + conflict->file, conflict->target, conflict->ctarget); break; - case PM_FILECONFLICT_FILESYSTEM: + case ALPM_FILECONFLICT_FILESYSTEM: - printf(_("%s: %s exists in filesystem\n"), + color_printf(COLOR_WHITE_COLON, _("%s: %s exists in filesystem\n"), - alpm_fileconflict_get_target(conflict), - alpm_fileconflict_get_file(conflict)); + conflict->target, conflict->file); break; -@@ -869,7 +866,7 @@ + } +@@ -867,7 +864,7 @@ int sync_prepare_execute(void) break; } /* TODO: stderr? */ @@ -593,16 +640,16 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c retval = 1; goto cleanup; } -@@ -918,7 +915,7 @@ +@@ -915,7 +912,7 @@ int pacman_sync(alpm_list_t *targets) if(config->op_s_sync) { /* grab a fresh package list */ - printf(_(":: Synchronizing package databases...\n")); + color_printf(COLOR_DOUBLECOLON, _(":: Synchronizing package databases...\n")); - alpm_logaction("synchronizing package lists\n"); + alpm_logaction(config->handle, "synchronizing package lists\n"); if(!sync_synctree(config->op_s_sync, sync_dbs)) { - return(1); -@@ -967,9 +964,9 @@ + return 1; +@@ -968,9 +965,9 @@ int pacman_sync(alpm_list_t *targets) alpm_list_t *tmp = NULL; if(config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) { alpm_list_free(tmp); @@ -615,61 +662,10 @@ diff -Naur a/src/pacman/sync.c b/src/pacman/sync.c ":: and upgrade these packages now?"))) { FREELIST(targs); targs = packages; -diff -Naur a/src/pacman/upgrade.c b/src/pacman/upgrade.c ---- a/src/pacman/upgrade.c 2011-02-28 19:13:17.000000000 +0200 -+++ b/src/pacman/upgrade.c 2011-08-10 13:41:09.980308632 +0300 -@@ -99,7 +99,7 @@ - case PM_ERR_PKG_INVALID_ARCH: - for(i = data; i; i = alpm_list_next(i)) { - char *pkg = alpm_list_getdata(i); -- printf(_(":: package %s does not have a valid architecture\n"), pkg); -+ color_printf(COLOR_DOUBLECOLON, _(":: package %s does not have a valid architecture\n"), pkg); - } - break; - case PM_ERR_UNSATISFIED_DEPS: -@@ -111,7 +111,7 @@ - /* TODO indicate if the error was a virtual package or not: - * :: %s: requires %s, provided by %s - */ -- printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), -+ color_printf(COLOR_DOUBLECOLON, _(":: %s: requires %s\n"), alpm_miss_get_target(miss), - depstring); - free(depstring); - } -@@ -124,9 +124,9 @@ - const char *reason = alpm_conflict_get_reason(conflict); - /* only print reason if it contains new information */ - if(strcmp(package1, reason) == 0 || strcmp(package2, reason) == 0) { -- printf(_(":: %s and %s are in conflict\n"), package1, package2); -+ color_printf(COLOR_DOUBLECOLON, _(":: %s and %s are in conflict\n"), package1, package2); - } else { -- printf(_(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); -+ color_printf(COLOR_DOUBLECOLON, _(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); - } - } - break; -@@ -156,7 +156,7 @@ - display_targets(alpm_trans_get_remove(), 0); - display_targets(alpm_trans_get_add(), 1); - printf("\n"); -- int confirm = yesno(_("Proceed with installation?")); -+ int confirm = yesno(NULL, _("Proceed with installation?")); - if(!confirm) { - trans_release(); - return(retval); -@@ -178,7 +178,7 @@ - alpm_fileconflict_get_ctarget(conflict)); - break; - case PM_FILECONFLICT_FILESYSTEM: -- printf(_("%s: %s exists in filesystem\n"), -+ color_printf(COLOR_WHITE_COLON, _("%s: %s exists in filesystem\n"), - alpm_fileconflict_get_target(conflict), - alpm_fileconflict_get_file(conflict)); - break; -diff -Naur a/src/pacman/util.c b/src/pacman/util.c ---- a/src/pacman/util.c 2011-08-10 02:59:21.000000000 +0300 -+++ b/src/pacman/util.c 2011-08-10 13:41:09.983641966 +0300 -@@ -49,6 +49,20 @@ +diff -Npaur a/src/pacman/util.c b/src/pacman/util.c +--- a/src/pacman/util.c 2011-11-21 05:24:39.000000000 +0200 ++++ b/src/pacman/util.c 2011-11-22 00:34:58.250461929 +0200 +@@ -48,6 +48,20 @@ #include "conf.h" #include "callback.h" @@ -688,10 +684,10 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c + +static colortab_t colortab; - int trans_init(pmtransflag_t flags) + int trans_init(alpm_transflag_t flags, int check_valid) { -@@ -438,10 +452,10 @@ - return(len); +@@ -472,10 +486,10 @@ static size_t string_length(const char * + return len; } -void string_display(const char *title, const char *string) @@ -703,15 +699,15 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c } if(string == NULL || string[0] == '\0') { printf(_("None")); -@@ -453,14 +467,14 @@ - printf("\n"); +@@ -608,14 +622,14 @@ int table_display(const char *title, con + return 0; } -void list_display(const char *title, const alpm_list_t *list) +void list_display(const colordata_t *colors_title, const char *title, const alpm_list_t *list) { const alpm_list_t *i; - int len = 0; + size_t len = 0; if(title) { len = string_length(title) + 1; @@ -720,15 +716,14 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c } if(!list) { -@@ -494,14 +508,14 @@ +@@ -649,13 +663,13 @@ void list_display(const char *title, con } } -void list_display_linebreak(const char *title, const alpm_list_t *list) +void list_display_linebreak(const colordata_t *colors_title, const char *title, const alpm_list_t *list) { - const alpm_list_t *i; - int len = 0; + size_t len = 0; if(title) { len = string_length(title) + 1; @@ -737,34 +732,47 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c } if(!list) { -@@ -562,21 +576,21 @@ - - if(install) { - pm_asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); -- list_display(str, targets); -+ list_display(COLOR_YELLOW_ALL, str, targets); - free(str); - printf("\n"); - -- printf(_("Total Download Size: %.2f MB\n"), mbdlsize); -+ color_printf(COLOR_WHITE_COLON, _("Total Download Size: %.2f MB\n"), mbdlsize); - if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { -- printf(_("Total Installed Size: %.2f MB\n"), mbisize); -+ color_printf(COLOR_WHITE_COLON, _("Total Installed Size: %.2f MB\n"), mbisize); +@@ -872,11 +886,11 @@ static void _display_targets(alpm_list_t + alpm_list_t *header = create_verbose_header(show_dl_size); + if(table_display(str, header, rows) != 0) { + /* fallback to list display if table wouldn't fit */ +- list_display(str, names); ++ list_display(COLOR_YELLOW_ALL, str, names); } + alpm_list_free(header); } else { - pm_asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); -- list_display(str, targets); -+ list_display(COLOR_RED_ALL, str, targets); - free(str); - printf("\n"); - -- printf(_("Total Removed Size: %.2f MB\n"), mbisize); -+ color_printf(COLOR_WHITE_COLON, _("Total Removed Size: %.2f MB\n"), mbisize); +- list_display(str, names); ++ list_display(COLOR_YELLOW_ALL, str, names); } + printf("\n"); + +@@ -891,21 +905,21 @@ static void _display_targets(alpm_list_t - FREELIST(targets); -@@ -685,7 +699,7 @@ + if(dlsize > 0 || config->op_s_downloadonly) { + size = humanize_size(dlsize, 'M', &label); +- printf(_("Total Download Size: %.2f %s\n"), size, label); ++ color_printf(COLOR_WHITE_COLON, _("Total Download Size: %.2f %s\n"), size, label); + } + if(!config->op_s_downloadonly) { + if(isize > 0) { + size = humanize_size(isize, 'M', &label); +- printf(_("Total Installed Size: %.2f %s\n"), size, label); ++ color_printf(COLOR_WHITE_COLON, _("Total Installed Size: %.2f %s\n"), size, label); + } + if(rsize > 0 && isize == 0) { + size = humanize_size(rsize, 'M', &label); +- printf(_("Total Removed Size: %.2f %s\n"), size, label); ++ color_printf(COLOR_WHITE_COLON, _("Total Removed Size: %.2f %s\n"), size, label); + } + /* only show this net value if different from raw installed size */ + if(isize > 0 && rsize > 0) { + size = humanize_size(isize - rsize, 'M', &label); +- printf(_("Net Upgrade Size: %.2f %s\n"), size, label); ++ color_printf(COLOR_WHITE_COLON, _("Net Upgrade Size: %.2f %s\n"), size, label); + } + } + } +@@ -1101,7 +1115,7 @@ void display_new_optdepends(alpm_pkg_t * alpm_list_t *optdeps = alpm_list_diff(new,old,str_cmp); if(optdeps) { printf(_("New optional dependencies for %s\n"), alpm_pkg_get_name(newpkg)); @@ -773,7 +781,7 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c } alpm_list_free(optdeps); } -@@ -695,7 +709,7 @@ +@@ -1111,7 +1125,7 @@ void display_optdepends(alpm_pkg_t *pkg) alpm_list_t *optdeps = alpm_pkg_get_optdepends(pkg); if(optdeps) { printf(_("Optional dependencies for %s\n"), alpm_pkg_get_name(pkg)); @@ -782,7 +790,7 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c } } -@@ -703,9 +717,9 @@ +@@ -1119,9 +1133,9 @@ static void display_repo_list(const char { const char *prefix= " "; @@ -795,7 +803,7 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c } void select_display(const alpm_list_t *pkglist) -@@ -923,7 +937,7 @@ +@@ -1340,7 +1354,7 @@ int select_question(int count) /* presents a prompt and gets a Y/N answer */ @@ -804,7 +812,7 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c { char response[32]; FILE *stream; -@@ -939,7 +953,7 @@ +@@ -1356,7 +1370,7 @@ static int question(short preset, char * fflush(stdout); fflush(stderr); @@ -813,8 +821,8 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c if(preset) { fprintf(stream, " %s ", _("[Y/n]")); -@@ -970,25 +984,25 @@ - return(0); +@@ -1387,25 +1401,25 @@ static int question(short preset, char * + return 0; } -int yesno(char *fmt, ...) @@ -828,7 +836,7 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c + ret = question(colors, 1, fmt, args); va_end(args); - return(ret); + return ret; } -int noyes(char *fmt, ...) @@ -842,22 +850,22 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c + ret = question(colors, 0, fmt, args); va_end(args); - return(ret); -@@ -1050,22 +1064,40 @@ + return ret; +@@ -1454,22 +1468,42 @@ int pm_vasprintf(char **string, alpm_log ret = vasprintf(&msg, format, args); /* print a prefix to the message */ - switch(level) { -- case PM_LOG_ERROR: +- case ALPM_LOG_ERROR: - pm_asprintf(string, _("error: %s"), msg); - break; -- case PM_LOG_WARNING: +- case ALPM_LOG_WARNING: - pm_asprintf(string, _("warning: %s"), msg); - break; -- case PM_LOG_DEBUG: +- case ALPM_LOG_DEBUG: - pm_asprintf(string, "debug: %s", msg); - break; -- case PM_LOG_FUNCTION: +- case ALPM_LOG_FUNCTION: - pm_asprintf(string, "function: %s", msg); - break; - default: @@ -865,55 +873,57 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c - break; + if(isatty(fileno(stdout))) { + switch(level) { -+ case PM_LOG_DEBUG: -+ asprintf(string, "debug: %s", msg); ++ case ALPM_LOG_ERROR: ++ pm_asprintf(string, "%s%s%s%s", colortab.red, _("error: "), colortab.none, msg); + break; -+ case PM_LOG_ERROR: -+ asprintf(string, "%s%s%s%s", colortab.red, _("error: "), colortab.none, msg); ++ case ALPM_LOG_WARNING: ++ pm_asprintf(string, "%s%s%s%s", colortab.yellow, _("warning: "), colortab.none, msg); + break; -+ case PM_LOG_WARNING: -+ asprintf(string, "%s%s%s%s", colortab.yellow, _("warning: "), colortab.none, msg); ++ case ALPM_LOG_DEBUG: ++ pm_asprintf(string, "debug: %s", msg); + break; -+ case PM_LOG_FUNCTION: -+ asprintf(string, _("function: %s"), msg); ++ case ALPM_LOG_FUNCTION: ++ pm_asprintf(string, "function: %s", msg); + break; + default: ++ pm_asprintf(string, "%s", msg); + break; + } + } else { + switch(level) { -+ case PM_LOG_DEBUG: -+ asprintf(string, "debug: %s", msg); ++ case ALPM_LOG_ERROR: ++ pm_asprintf(string, _("error: %s"), msg); + break; -+ case PM_LOG_ERROR: -+ asprintf(string, _("error: %s"), msg); ++ case ALPM_LOG_WARNING: ++ pm_asprintf(string, _("warning: %s"), msg); + break; -+ case PM_LOG_WARNING: -+ asprintf(string, _("warning: %s"), msg); ++ case ALPM_LOG_DEBUG: ++ pm_asprintf(string, "debug: %s", msg); + break; -+ case PM_LOG_FUNCTION: -+ asprintf(string, _("function: %s"), msg); ++ case ALPM_LOG_FUNCTION: ++ pm_asprintf(string, "function: %s", msg); + break; + default: ++ pm_asprintf(string, "%s", msg); + break; + } } free(msg); -@@ -1100,10 +1132,10 @@ +@@ -1504,10 +1538,10 @@ int pm_vfprintf(FILE *stream, alpm_logle /* print a prefix to the message */ switch(level) { - case PM_LOG_ERROR: + case ALPM_LOG_ERROR: - fprintf(stream, _("error: ")); + color_fprintf(stream, COLOR_RED_ALL, _("error: ")); break; - case PM_LOG_WARNING: + case ALPM_LOG_WARNING: - fprintf(stream, _("warning: ")); + color_fprintf(stream, COLOR_YELLOW_ALL, _("warning: ")); break; - case PM_LOG_DEBUG: + case ALPM_LOG_DEBUG: fprintf(stream, "debug: "); -@@ -1142,4 +1174,310 @@ +@@ -1546,4 +1580,310 @@ char *strndup(const char *s, size_t n) } #endif @@ -1015,7 +1025,7 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c + + fp = fopen(file, "r"); + if(fp == NULL) { -+ pm_printf(PM_LOG_ERROR, _("config file %s could not be read.\n"), file); ++ pm_printf(ALPM_LOG_ERROR, _("config file %s could not be read.\n"), file); + return 1; + } + while(fgets(line, PATH_MAX, fp)) { @@ -1036,47 +1046,47 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c + strtrim(ptr); + + if(key == NULL) { -+ pm_printf(PM_LOG_ERROR, _("config file %s, line %d: syntax error in config file- missing key.\n"), ++ pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: syntax error in config file- missing key.\n"), + file, linenum); + return 1; + } + if(strcmp(key, "Red") == 0) { + if(_set_color_sequence(ptr, colortab->red)) { -+ pm_printf(PM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), ++ pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), + file, linenum, ptr); + } + } else if(strcmp(key, "Green") == 0) { + if(_set_color_sequence(ptr, colortab->green)) { -+ pm_printf(PM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), ++ pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), + file, linenum, ptr); + } + } else if(strcmp(key, "Yellow") == 0) { + if(_set_color_sequence(ptr, colortab->yellow)) { -+ pm_printf(PM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), ++ pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), + file, linenum, ptr); + } + } else if(strcmp(key, "Blue") == 0) { + if(_set_color_sequence(ptr, colortab->blue)) { -+ pm_printf(PM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), ++ pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), + file, linenum, ptr); + } + } else if(strcmp(key, "Magenta") == 0) { + if(_set_color_sequence(ptr, colortab->magenta)) { -+ pm_printf(PM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), ++ pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), + file, linenum, ptr); + } + } else if(strcmp(key, "Cyan") == 0) { + if(_set_color_sequence(ptr, colortab->cyan)) { -+ pm_printf(PM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), ++ pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), + file, linenum, ptr); + } + } else if(strcmp(key, "White") == 0) { + if(_set_color_sequence(ptr, colortab->white)) { -+ pm_printf(PM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), ++ pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: color '%s' not recognized.\n"), + file, linenum, ptr); + } + } else { -+ pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"), ++ pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"), + file, linenum, key); + return(1); + } @@ -1224,12 +1234,12 @@ diff -Naur a/src/pacman/util.c b/src/pacman/util.c + { SEP_ANY, COLOR_END } }; + /* vim: set ts=2 sw=2 noet: */ -diff -Naur a/src/pacman/util.h b/src/pacman/util.h ---- a/src/pacman/util.h 2011-06-01 22:45:38.000000000 +0300 -+++ b/src/pacman/util.h 2011-08-10 13:41:09.983641966 +0300 -@@ -39,6 +39,48 @@ - /* update speed for the fill_progress based functions */ - #define UPDATE_SPEED_SEC 0.2f +diff -Npaur a/src/pacman/util.h b/src/pacman/util.h +--- a/src/pacman/util.h 2011-10-21 18:43:49.000000000 +0300 ++++ b/src/pacman/util.h 2011-11-22 00:34:58.250461929 +0200 +@@ -45,6 +45,48 @@ typedef struct _pm_target_t { + int is_explicit; + } pm_target_t; +/* pacman-color */ +typedef enum _separator_t { @@ -1273,23 +1283,25 @@ diff -Naur a/src/pacman/util.h b/src/pacman/util.h +int color_vfprintf(FILE* stream, const colordata_t* colors, const char* format, va_list args) __attribute__((format(printf,3,0))); +void color_string_display(const colordata_t* colors_title, const char* title, const colordata_t* colors_string, const char* string); + - int trans_init(pmtransflag_t flags); + void trans_init_error(void); + int trans_init(alpm_transflag_t flags, int check_valid); int trans_release(void); - int needs_root(void); -@@ -51,9 +93,9 @@ +@@ -59,11 +101,11 @@ char *strtoupper(char *str); char *strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); alpm_list_t *strsplit(const char *str, const char splitchar); -void string_display(const char *title, const char *string); ++void string_display(const colordata_t *colors_title, const char *title, const char *string); + double humanize_size(off_t bytes, const char target_unit, const char **label); + int table_display(const char *title, const alpm_list_t *header, const alpm_list_t *rows); -void list_display(const char *title, const alpm_list_t *list); -void list_display_linebreak(const char *title, const alpm_list_t *list); -+void string_display(const colordata_t *colors_title, const char *title, const char *string); +void list_display(const colordata_t *colors_title, const char *title, const alpm_list_t *list); +void list_display_linebreak(const colordata_t *colors_title, const char *title, const alpm_list_t *list); - void display_targets(const alpm_list_t *pkgs, int install); + void signature_display(const char *title, alpm_siglist_t *siglist); + void display_targets(void); int str_cmp(const void *s1, const void *s2); - void display_new_optdepends(pmpkg_t *oldpkg, pmpkg_t *newpkg); -@@ -62,8 +104,8 @@ +@@ -73,8 +115,8 @@ void print_packages(const alpm_list_t *p void select_display(const alpm_list_t *pkglist); int select_question(int count); int multiselect_question(char *array, int count); @@ -1297,6 +1309,6 @@ diff -Naur a/src/pacman/util.h b/src/pacman/util.h -int noyes(char *fmt, ...); +int yesno(const colordata_t *colors, char *fmt, ...); +int noyes(const colordata_t *colors, char *fmt, ...); - int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); - int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) __attribute__((format(printf,3,4))); + + int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...); diff --git a/pg-python/PKGBUILD b/pg-python/PKGBUILD index b9e48f286..435b2556c 100644 --- a/pg-python/PKGBUILD +++ b/pg-python/PKGBUILD @@ -15,15 +15,15 @@ sha256sums=('d9f1d8bea63f9edaa454bf41eb74a440f3c15f0c750176ee2c1b98290f8e897b') sha512sums=('85dc2b03bd99d53e20ab0c788d9dd808545c2484bfa5ba155d4c2691a4e0f4bcfba0b964297e9678806564b12fbef40862b7ef9ab34846f0cb1d256d27be2798') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure make } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } diff --git a/pkgbrowser/PKGBUILD b/pkgbrowser/PKGBUILD index 9851d62ec..0ca448518 100644 --- a/pkgbrowser/PKGBUILD +++ b/pkgbrowser/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: kachelaqa pkgname='pkgbrowser' -pkgver=0.7 +pkgver=0.8 pkgrel=1 pkgdesc='A utility for browsing pacman databases and the AUR' arch=('i686' 'x86_64') url='http://code.google.com/p/pkgbrowser/' license=('GPL2') -depends=('pacman<4' 'python2-pyqt') +depends=('pacman>=4' 'python2-pyqt') install="$pkgname.install" source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz") @@ -21,4 +21,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums=('e1d0af5222ac8defcae27069ce45edf7') +md5sums=('aa2a34a7ef4049363357c5b88b4106f7') diff --git a/pm-utils-screen-lock/PKGBUILD b/pm-utils-screen-lock/PKGBUILD index c6648a91f..62453359d 100644 --- a/pm-utils-screen-lock/PKGBUILD +++ b/pm-utils-screen-lock/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: Byron Clark pkgname=pm-utils-screen-lock -pkgver=0.0.6 +pkgver=0.0.7 pkgrel=1 pkgdesc="Lock the screen on suspend/hibernate" url="http://byron.theclarkfamily.name/" @@ -8,7 +8,7 @@ license=('MIT') arch=('any') depends=('pm-utils') source=('video-lock-screen') -md5sums=('9c6dd31717885393fa3147f693da29a6') +md5sums=('8632f3eec6be35dfb70f8ed7975d45df') build() { install -D -m 0755 $srcdir/video-lock-screen $pkgdir/usr/lib/pm-utils/sleep.d/00lock-screen diff --git a/pm-utils-screen-lock/video-lock-screen b/pm-utils-screen-lock/video-lock-screen index 27a7c2bab..eb89315a2 100644 --- a/pm-utils-screen-lock/video-lock-screen +++ b/pm-utils-screen-lock/video-lock-screen @@ -5,7 +5,7 @@ lock_screen() { ## based on "/usr/bin/xflock4" if ps auxc | grep x[s]creensaver > /dev/null 2>&1; then - XLOCK="xscreensaver-command -lock" + XLOCK="xscreensaver-command -lock" elif ps auxc | grep gnome-[s]creensaver > /dev/null 2>&1; then XLOCK="gnome-screensaver-command --lock" elif ps auxc | grep startkde > /dev/null 2>&1; then @@ -36,7 +36,7 @@ lock_screen() } case "$1" in - resume|thaw) + hibernate|suspend) lock_screen ;; esac diff --git a/samsutools/PKGBUILD b/samsutools/PKGBUILD index d56a5e71b..7ef504151 100644 --- a/samsutools/PKGBUILD +++ b/samsutools/PKGBUILD @@ -1,3 +1,5 @@ +# Submitter: thotypous +# Maintainer WorMzy Tykashi pkgname="samsutools" pkgver="20080730" pkgrel=3 diff --git a/th08/PKGBUILD b/th08/PKGBUILD index 852d5bf7d..90473feab 100644 --- a/th08/PKGBUILD +++ b/th08/PKGBUILD @@ -3,7 +3,7 @@ pkgname=th08 pkgver=0.03 -pkgrel=2 +pkgrel=3 pkgdesc="The eighth game of the Touhou Project series, Imperishable Night trial version (via wine). Easy upgrade to full version." arch=(i686 x86_64) url="http://www16.big.or.jp/~zun/html/th08top.html" @@ -15,13 +15,11 @@ makedepends=() [ "$CARCH" = i686 ] && makedepends=(lha) [ "$CARCH" = x86_64 ] && makedepends=(bin32-lha) optdepends=('timidity++: to get MIDI background music') -source=(th08.sh th08.desktop license http://dl.dropbox.com/u/22186524/files/th08.cfg http://dl.dropbox.com/u/22186524/files/th08.png http://mirror0.fuzzy2.com/zun/eiya_tr003.lzh) -#source=(th07.sh th07.desktop license http://www.fileden.com/files/2010/12/31/3049394//th07.png http://www.fileden.com/files/2010/12/31/3049394//th07.cfg http://www16.big.or.jp/~zun/data/soft/youmu_tr011.lzh) +source=(th08.sh th08.desktop license http://dl.dropbox.com/u/22186524/files/th08.png http://mirror0.fuzzy2.com/zun/eiya_tr003.lzh) install=${pkgname}.install -md5sums=('d5c39c974c6a84f7b9999225583b7b17' +md5sums=('8eb909dd8b016ca81ac498c77876b693' '8849405deb2bc3954c720468be36e8c4' '5de1cb787942308b7620f93a176367d9' -'54cbce4bb3f47387413d857a0590184b' 'c6cea48ee3d175b01d512f06481f8063' 'c42647202a695bd1fdd2d88ce6615d53') @@ -29,25 +27,24 @@ noextract=() options=(!strip) build() { - cd $srcdir/ - lha e eiya_tr003.lzh - cd eiya - find -type d|grep -v '\(html\|^.$\)'|xargs -I dir mv "dir" th08man - ls *.txt|grep -v '^[rc]'|xargs -I file mv file info.txt - cd .. - install -d -m755 $pkgdir/usr/share/ - cp -R eiya $pkgdir/usr/share/$pkgname - mv $pkgdir/usr/share/$pkgname/th08tr.exe $pkgdir/usr/share/$pkgname/th08.exe - cp th08.cfg $pkgdir/usr/share/$pkgname/th08.cfg - find $pkgdir/usr/share/th08 -type d -exec chmod 755 "{}" \; - find $pkgdir/usr/share/th08 -type f -exec chmod 644 "{}" \; - install -d -m755 $pkgdir/usr/bin - install -m755 th08.sh $pkgdir/usr/bin/$pkgname - install -d -m755 $pkgdir/usr/share/applications - install -d -m755 $pkgdir/usr/share/pixmaps - install -d -m755 $pkgdir/usr/share/licenses/$pkgname - install -m755 th08.desktop $pkgdir/usr/share/applications - install -m755 th08.png $pkgdir/usr/share/pixmaps/th08.png - install -m755 license $pkgdir/usr/share/licenses/$pkgname/license + cd $srcdir/ + lha e eiya_tr003.lzh + cd eiya + find -type d|grep -v '\(html\|^.$\)'|xargs -I dir mv "dir" th08man + ls *.txt|grep -v '^[rc]'|xargs -I file mv file info.txt + cd .. + install -d -m755 $pkgdir/usr/share/ + cp -R eiya $pkgdir/usr/share/$pkgname + mv $pkgdir/usr/share/$pkgname/th08tr.exe $pkgdir/usr/share/$pkgname/th08.exe + find $pkgdir/usr/share/th08 -type d -exec chmod 755 "{}" \; + find $pkgdir/usr/share/th08 -type f -exec chmod 644 "{}" \; + install -d -m755 $pkgdir/usr/bin + install -m755 th08.sh $pkgdir/usr/bin/$pkgname + install -d -m755 $pkgdir/usr/share/applications + install -d -m755 $pkgdir/usr/share/pixmaps + install -d -m755 $pkgdir/usr/share/licenses/$pkgname + install -m755 th08.desktop $pkgdir/usr/share/applications + install -m755 th08.png $pkgdir/usr/share/pixmaps/th08.png + install -m755 license $pkgdir/usr/share/licenses/$pkgname/license } diff --git a/th08/th08.sh b/th08/th08.sh dissimilarity index 66% index 901b3e3f3..4fe6c5b4d 100644 --- a/th08/th08.sh +++ b/th08/th08.sh @@ -1,31 +1,37 @@ -#!/bin/bash -export WINEPREFIX="$HOME/.th08/wine" -export WINEDLLOVERRIDES="mshtml=" - -if [ ! -d "$HOME"/.th08 ] ; then - mkdir -p "$HOME"/.th08/wine || exit 1 - cp -r /usr/share/th08/th08.cfg "$HOME"/.th08 || exit 1 - ln -s /usr/share/th08/th08.exe "$HOME"/.th08/th08.exe || exit 1 - ln -s /usr/share/th08/custom.exe "$HOME"/.th08/custom.exe || exit 1 - ln -s /usr/share/th08/th08tr.dat "$HOME"/.th08/th08tr.dat || exit 1 -fi -if [ "" != "`whereis timidity|grep '/usr/bin'`" ] ; then - if [ "" == "`ps -A|grep timidity`" ] ; then - timidity -iA & - myins="true" - fi -fi -#mv ~/.th08/th08.cfg ~/.th08/th08.cfg.old -#base64 <~/.th08/th08.cfg.old |sed 's/.\(....\)$/I\1/'|base64 -d>~/.th08/th08.cfg -#rm ~/.th08/th08.cfg.old -cd ~/.th08 -if [ -e "$HOME"/.th08/th08e.exe ]; then - wine "$HOME"/.th08/th08e.exe "$@" -fi -if [ ! -e "$HOME"/.th08/th08e.exe ]; then - wine "$HOME"/.th08/th08.exe "$@" -fi -if [ "true" == "$myins" ] ; then - killall timidity -fi - +#!/bin/bash + +export WINEPREFIX="$HOME/.th08/wine" +export WINEDLLOVERRIDES="mshtml=" + +if [ ! -d "$HOME"/.th08 ] ; then + mkdir -p "$HOME"/.th08/wine || exit 1 + ln -s /usr/share/th08/th08.exe "$HOME"/.th08/th08.exe || exit 1 + ln -s /usr/share/th08/custom.exe "$HOME"/.th08/custom.exe || exit 1 + ln -s /usr/share/th08/th08tr.dat "$HOME"/.th08/th08tr.dat || exit 1 +fi +if [ ! -f "$HOME"/.th08/th08.cfg ] ; then + echo "AAABAAIABAD//////////wMAAAABAAgAWAJYAgIDAAIBAQAAAgAAZFAAAAAAAAAAAAAAAAAAAAABCAAA"|base64 -d >~/.th08/th08.cfg +fi +if [ "" != "`whereis timidity|grep '/usr/bin'`" ] ; then + if [ "" == "`ps -A|grep timidity`" ] ; then + timidity -iA & + myins="true" + fi +fi +# this sed is to make sure directinput is always activaded. +# the controls can be a bit unresponsive without it +mv ~/.th08/th08.cfg ~/.th08/th08.cfg.bak +base64 th08.cfg.bak -w 0|sed 's/.\(...\)$/C\1/'|base64 -d>~/.th08/th08.cfg +rm ~/.th08/th08.cfg.bak + +cd ~/.th08 +if [ -e "$HOME"/.th08/th08e.exe ]; then + wine "$HOME"/.th08/th08e.exe "$@" +fi +if [ ! -e "$HOME"/.th08/th08e.exe ]; then + wine "$HOME"/.th08/th08.exe "$@" +fi +if [ "true" == "$myins" ] ; then + killall timidity +fi + diff --git a/tp_smapi/PKGBUILD b/tp_smapi/PKGBUILD index 8aa9d266d..ead83de0d 100644 --- a/tp_smapi/PKGBUILD +++ b/tp_smapi/PKGBUILD @@ -7,22 +7,26 @@ # Contributor: Ignas Anikevicius _pkgname=tp_smapi -_kernext= -_kernver=${_kernver:-$(uname -r)} -_extramodules=extramodules-${_kernver%.*}-ARCH -[[ ! -d /lib/modules/$_extramodules ]] && _extramodules=$_kernver + +# make the AUR parser think the following lines are comments +# to bypass the buggy parser check +[[ "#" ]] && _kernext=${_kernext:-} +[[ "#" ]] && _kernver=${_kernver:-$(uname -r)} +[[ "#" ]] && _extramodules=$(readlink -f "/lib/modules/$_kernver/extramodules" | sed 's#^/lib/modules/##') +[[ "#" ]] && _kernver=$(< /lib/modules/$_extramodules/version) + pkgname=$_pkgname$_kernext pkgver=0.41 pkgrel=2 pkgdesc="Modules for ThinkPad's SMAPI functionality" -[[ -n $_kernext ]] && pkgdesc="$pkgdesc (for linux$_kernext)" +[[ -n $_kernext ]] && pkgdesc+=" (for linux$_kernext)" arch=('i686' 'x86_64') url="http://tpctl.sourceforge.net/" license=('GPL') depends=("linux$_kernext") makedepends=("linux$_kernext-headers") install=$_pkgname.install -source=(https://cloud.github.com/downloads/evgeni/$_pkgname/$_pkgname-$pkgver.tar.gz) # https://github.com/downloads/evgeni/$_pkgname/$_pkgname-$pkgver.tar.gz +source=(https://github.com/downloads/evgeni/$_pkgname/$_pkgname-$pkgver.tar.gz) md5sums=('63c683415c764568f6bf17c7eabe4752') sha256sums=('6aef02b92d10360ac9be0db29ae390636be55017990063a092a285c70b54e666') @@ -33,22 +37,16 @@ build() { } package() { - make -C "/lib/modules/$_kernver/build" INSTALL_MOD_PATH="$pkgdir" M="$srcdir/$_pkgname-$pkgver" modules_install - - if [[ $_extramodules != $_kernver ]]; then - cd "$pkgdir/lib/modules/" - mv "$_kernver/extra" "$_extramodules" - rmdir "$_kernver" - else - # move hdaps.ko into updates to override in-tree kernel module - cd "$pkgdir/lib/modules/$_kernver/" - mkdir updates - mv extra/hdaps.ko updates - fi + make -C "/lib/modules/$_kernver/build" \ + INSTALL_MOD_PATH="$pkgdir" M="$srcdir/$_pkgname-$pkgver" modules_install + + cd "$pkgdir/lib/modules/" + mv "$_kernver/extra" "$_extramodules" + rmdir "$_kernver" # compress kernel modules find "$pkgdir" -name "*.ko" -exec gzip -9 {} + # update kernel version in install file - sed -ri "s/^(kernver=).*$/\1$_kernver/" "$startdir/$_pkgname.install" + sed -ri "s/^(extramodules=).*$/\1$_extramodules/" "$startdir/$_pkgname.install" } diff --git a/tp_smapi/tp_smapi.install b/tp_smapi/tp_smapi.install index fff51be58..3cad13ad2 100644 --- a/tp_smapi/tp_smapi.install +++ b/tp_smapi/tp_smapi.install @@ -1,7 +1,7 @@ -kernver=3.0-ARCH +extramodules=extramodules-3.2-ARCH post_install() { - depmod $kernver + depmod -v $(< /lib/modules/$extramodules/version) &> /dev/null } post_upgrade() { -- 2.11.4.GIT