Date: Tuesday, April 9, 2013 @ 23:31:07 Author: eric Revision: 87990 archrelease: copy trunk to community-i686
Added: icewm-utils/repos/community-i686/PKGBUILD (from rev 87989, icewm-utils/trunk/PKGBUILD) icewm-utils/repos/community-i686/icets-fix-icewmtray-crash.diff (from rev 87989, icewm-utils/trunk/icets-fix-icewmtray-crash.diff) Deleted: icewm-utils/repos/community-i686/PKGBUILD icewm-utils/repos/community-i686/icets-fix-icewmtray-crash.diff --------------------------------+ PKGBUILD | 228 +++++++++++++++++++-------------------- icets-fix-icewmtray-crash.diff | 26 ++-- 2 files changed, 126 insertions(+), 128 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-04-09 21:30:21 UTC (rev 87989) +++ PKGBUILD 2013-04-09 21:31:07 UTC (rev 87990) @@ -1,115 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Dominika Solarz <dominikasol...@gmail.com> - -pkgname=icewm-utils -pkgver=1.0 - -_mcver=2.1 -_tsver=1.4 -_bgsetver=1.3 -_kedver=1.5 -_woedver=1.8 -_sndcfgver=1.3 -_ccver=2.9 -_cursorscfgver=0.6 -_iconcvtver=1.0 -_rrunver=0.5 -_mergeprefsver=0.5 - -pkgrel=6 -pkgdesc="Suite of tools for IceWM" -arch=(i686 x86_64) -license=("GPL") -url="http://icecc.sourceforge.net/" -depends=('qt3' 'python2') -optdepends=('pyqt3' 'gvim') -source=("http://downloads.sourceforge.net/icecc/icemc-$_mcver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icets-$_tsver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icebgset-$_bgsetver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/iceked-$_kedver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icewoed-$_woedver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icesndcfg-$_sndcfgver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icecc-$_ccver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icecursorscfg-$_cursorscfgver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/iceiconcvt-$_iconcvtver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icerrun-$_rrunver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icemergeprefs-$_mergeprefsver.tar.bz2" - icets-fix-icewmtray-crash.diff) -md5sums=('cb2afc6efaa0f9d77b0119b29d528667' - '1d87c93f5cb27da16c90f47531b7fb21' - '7086b771fc7877369924affc5b5f5e41' - '47761a8dc59880ddda2a00de9cd187f5' - '518f05c02cb24a7e36715ce0d0672c8e' - '2113c524ebbbf38ce7eb174b9997c202' - 'e3ddbb3536941745435f727053816865' - '000ec299a83dbae269f2f335910bd50e' - '64463287b6c535b31cb2823d97bfe299' - 'cea2fd7726b9f01b080e3861d325ec24' - 'b34931566da118e7a14ddcb529e739c6' - '5116da930c0063dd8c478dd8e473b08f') - -build() { - mkdir -p $pkgdir/usr/bin - - . /etc/profile.d/qt3.sh - export PATH=/opt/qt/bin:$PATH - - cd $srcdir - # fix default global path to IceWM - for file in icewoed-$_woedver/qcentralwidget.cpp \ - icemc-$_mcver/qcentralwidget.cpp \ - icets-$_tsver/icets.cpp - do - sed -i 's|/usr/local/|/usr/|' $file - done - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_#!.*/usr/bin/python$_#!/usr/bin/python2_' $file - sed -i 's_#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file - done - - (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff) - - cd $srcdir/icemc-$_mcver - qmake - make - cp icemc $pkgdir/usr/bin/ - - cd $srcdir/icets-$_tsver - qmake - make - cp icets $pkgdir/usr/bin/ - - cd $srcdir/icebgset-$_bgsetver - qmake - make - cp icebgset $pkgdir/usr/bin/ - - cd $srcdir/iceked-$_kedver - qmake - make - cp iceked $pkgdir/usr/bin/ - - cd $srcdir/icecc-$_ccver - qmake - make - cp icecc $pkgdir/usr/bin/ - - cd $srcdir/icesndcfg-$_sndcfgver - qmake - make - cp icesndcfg $pkgdir/usr/bin/ - - cd $srcdir/icewoed-$_woedver - qmake - make - cp icewoed $pkgdir/usr/bin/ - - cp $srcdir/icecursorscfg-$_cursorscfgver/icecurcfg.py $pkgdir/usr/bin/icecurcfg - cp $srcdir/iceiconcvt-$_iconcvtver/iceiconcvt.py $pkgdir/usr/bin/iceiconcvt - cp $srcdir/icemergeprefs-$_mergeprefsver/icemergeprefs.py $pkgdir/usr/bin/icemergeprefs - cp $srcdir/icerrun-$_rrunver/icerrun.py $pkgdir/usr/bin/icerrun - cp $srcdir/icerrun-$_rrunver/icerrrun.py $pkgdir/usr/bin/icerrrun -} Copied: icewm-utils/repos/community-i686/PKGBUILD (from rev 87989, icewm-utils/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-04-09 21:31:07 UTC (rev 87990) @@ -0,0 +1,113 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Dominika Solarz <dominikasol...@gmail.com> + +pkgname=icewm-utils +pkgver=1.0 + +_mcver=2.1 +_tsver=1.4 +_bgsetver=1.3 +_kedver=1.5 +_woedver=1.8 +_sndcfgver=1.3 +_ccver=2.9 +_cursorscfgver=0.6 +_iconcvtver=1.0 +_rrunver=0.5 +_mergeprefsver=0.5 + +pkgrel=6 +pkgdesc="Suite of tools for IceWM" +arch=(i686 x86_64) +license=("GPL") +url="http://icecc.sourceforge.net/" +depends=('qt3' 'python2') +optdepends=('pyqt3' 'gvim') +source=("http://downloads.sourceforge.net/icecc/icemc-$_mcver.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/icecc/icets-$_tsver.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/icecc/icebgset-$_bgsetver.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/icecc/iceked-$_kedver.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/icecc/icewoed-$_woedver.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/icecc/icesndcfg-$_sndcfgver.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/icecc/icecc-$_ccver.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/icecc/icecursorscfg-$_cursorscfgver.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/icecc/iceiconcvt-$_iconcvtver.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/icecc/icerrun-$_rrunver.tar.bz2" + "http://downloads.sourceforge.net/sourceforge/icecc/icemergeprefs-$_mergeprefsver.tar.bz2" + icets-fix-icewmtray-crash.diff) +md5sums=('cb2afc6efaa0f9d77b0119b29d528667' + '1d87c93f5cb27da16c90f47531b7fb21' + '7086b771fc7877369924affc5b5f5e41' + '47761a8dc59880ddda2a00de9cd187f5' + '518f05c02cb24a7e36715ce0d0672c8e' + '2113c524ebbbf38ce7eb174b9997c202' + 'e3ddbb3536941745435f727053816865' + '000ec299a83dbae269f2f335910bd50e' + '64463287b6c535b31cb2823d97bfe299' + 'cea2fd7726b9f01b080e3861d325ec24' + 'b34931566da118e7a14ddcb529e739c6' + '5116da930c0063dd8c478dd8e473b08f') + +build() { + cd $srcdir + # fix default global path to IceWM + for file in icewoed-$_woedver/qcentralwidget.cpp \ + icemc-$_mcver/qcentralwidget.cpp \ + icets-$_tsver/icets.cpp + do + sed -i 's|/usr/local/|/usr/|' $file + done + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_#!.*/usr/bin/python$_#!/usr/bin/python2_' $file + sed -i 's_#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file + done + + (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff) + + cd $srcdir/icemc-$_mcver + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' + + cd $srcdir/icets-$_tsver + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' + + cd $srcdir/icebgset-$_bgsetver + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' + + cd $srcdir/iceked-$_kedver + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' + + cd $srcdir/icecc-$_ccver + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' + + cd $srcdir/icesndcfg-$_sndcfgver + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' + + cd $srcdir/icewoed-$_woedver + qmake-qt3 + make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' +} + +package() { + mkdir -p $pkgdir/usr/bin + cp $srcdir/icemc-$_mcver/icemc $pkgdir/usr/bin/ + cp $srcdir/icets-$_tsver/icets $pkgdir/usr/bin/ + cp $srcdir/icebgset-$_bgsetver/icebgset $pkgdir/usr/bin/ + cp $srcdir/iceked-$_kedver/iceked $pkgdir/usr/bin/ + cp $srcdir/icecc-$_ccver/icecc $pkgdir/usr/bin/ + cp $srcdir/icesndcfg-$_sndcfgver/icesndcfg $pkgdir/usr/bin/ + cp $srcdir/icewoed-$_woedver/icewoed $pkgdir/usr/bin/ + cp $srcdir/icecursorscfg-$_cursorscfgver/icecurcfg.py $pkgdir/usr/bin/icecurcfg + cp $srcdir/iceiconcvt-$_iconcvtver/iceiconcvt.py $pkgdir/usr/bin/iceiconcvt + cp $srcdir/icemergeprefs-$_mergeprefsver/icemergeprefs.py $pkgdir/usr/bin/icemergeprefs + cp $srcdir/icerrun-$_rrunver/icerrun.py $pkgdir/usr/bin/icerrun + cp $srcdir/icerrun-$_rrunver/icerrrun.py $pkgdir/usr/bin/icerrrun +} Deleted: icets-fix-icewmtray-crash.diff =================================================================== --- icets-fix-icewmtray-crash.diff 2013-04-09 21:30:21 UTC (rev 87989) +++ icets-fix-icewmtray-crash.diff 2013-04-09 21:31:07 UTC (rev 87990) @@ -1,13 +0,0 @@ ---- ./icets.cpp.orig 2010-03-22 00:42:19.231913625 +1000 -+++ ./icets.cpp 2010-03-22 00:43:34.611221044 +1000 -@@ -311,7 +311,9 @@ - }/* if(bakFile.exists()) */ - - //restart IceWM -- system("pkill -1 icewm"); -+ // Use killall instead of pkill, because pkill kills all icewm processes -+ // like icewmtray - in this case we lost view of running tray apps -+ system("killall -1 icewm"); - }/* setTheme() */ - - /** Copied: icewm-utils/repos/community-i686/icets-fix-icewmtray-crash.diff (from rev 87989, icewm-utils/trunk/icets-fix-icewmtray-crash.diff) =================================================================== --- icets-fix-icewmtray-crash.diff (rev 0) +++ icets-fix-icewmtray-crash.diff 2013-04-09 21:31:07 UTC (rev 87990) @@ -0,0 +1,13 @@ +--- ./icets.cpp.orig 2010-03-22 00:42:19.231913625 +1000 ++++ ./icets.cpp 2010-03-22 00:43:34.611221044 +1000 +@@ -311,7 +311,9 @@ + }/* if(bakFile.exists()) */ + + //restart IceWM +- system("pkill -1 icewm"); ++ // Use killall instead of pkill, because pkill kills all icewm processes ++ // like icewmtray - in this case we lost view of running tray apps ++ system("killall -1 icewm"); + }/* setTheme() */ + + /**