From a4659cf02d561a332ef3e35f6fd30a5a5a855733 Mon Sep 17 00:00:00 2001 From: amnon Date: Sun, 20 Jun 2010 09:14:42 +0000 Subject: [PATCH 1/6] fix wrong cmd --- build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) mode change 100755 => 100644 build.sh diff --git a/build.sh b/build.sh old mode 100755 new mode 100644 index 2e7acb331..ecb72cdb9 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see # -# Desktop v.0.06.08 +# Desktop v.0.06.20 # by Phil Miller # # setup @@ -38,7 +38,8 @@ current_repo="$_cur_repo" build_it() { _mkpkg_flags=$1 - [ -n "$MODE" ] || error "you need to specify a package list defined in _/buildsystem/${_cur_repo}-${_build_arch}-pkgs.conf\n -> ${_available_pkglists}" + [ -n "$MODE" ] || error "you need to specify a package list defined in _/buildscripts/${_cur_repo}-${_build_arch}-pkgs.conf\n -> +${_available_pkglists}" && exit cd $_build_work From 5765386c68e67efb42e96a1120f8031532b2b441 Mon Sep 17 00:00:00 2001 From: Manuel Tortosa Date: Sun, 20 Jun 2010 21:50:19 +0000 Subject: [PATCH 2/6] rebuild against qt 4.6.3 --- kdebase-runtime/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdebase-runtime/PKGBUILD b/kdebase-runtime/PKGBUILD index 1d6755fe0..3fb3578d4 100644 --- a/kdebase-runtime/PKGBUILD +++ b/kdebase-runtime/PKGBUILD @@ -23,7 +23,7 @@ pkgname=('kdebase-runtime' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=1 +pkgrel=2 pkgdesc="split package" url="http://www.kde.org" From ea40ce9f10b372df5088f07c4fc9f477056bf6e6 Mon Sep 17 00:00:00 2001 From: Manuel Tortosa Date: Mon, 21 Jun 2010 00:47:03 +0200 Subject: [PATCH 3/6] Add missing dependence --- koffice/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/koffice/PKGBUILD b/koffice/PKGBUILD index 222d7d69d..db83a53a8 100644 --- a/koffice/PKGBUILD +++ b/koffice/PKGBUILD @@ -22,10 +22,11 @@ pkgname=('koffice-common' 'koffice-doc') pkgver=2.2.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') +depends=('fftw') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'eigen' \ 'kdelibs' 'gsl' 'qca' 'lcms' 'glew' 'qimageblitz' 'libgsf' \ 'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd' 'openexr' 'kdegraphics-common' 'sqlite3') # 'opengtl' From 662be925d8a5a7b93b5dc54d28776c6c3e903cfb Mon Sep 17 00:00:00 2001 From: Manuel Tortosa Date: Sun, 20 Jun 2010 23:49:48 +0000 Subject: [PATCH 4/6] Update against 4.6.3 --- kdegraphics/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdegraphics/PKGBUILD b/kdegraphics/PKGBUILD index b073fbbde..7685f83a2 100644 --- a/kdegraphics/PKGBUILD +++ b/kdegraphics/PKGBUILD @@ -30,7 +30,7 @@ pkgname=('kdegraphics-common' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=2 +pkgrel=3 pkgdesc="split package" url="http://www.kde.org" From 2922c3eab725cf034eb886915e2f0461dacb211d Mon Sep 17 00:00:00 2001 From: amnon Date: Tue, 22 Jun 2010 21:02:26 +0000 Subject: [PATCH 5/6] proper fix for build.sh --- build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 build.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index ecb72cdb9..94dca6793 --- a/build.sh +++ b/build.sh @@ -38,8 +38,9 @@ current_repo="$_cur_repo" build_it() { _mkpkg_flags=$1 - [ -n "$MODE" ] || error "you need to specify a package list defined in _/buildscripts/${_cur_repo}-${_build_arch}-pkgs.conf\n -> -${_available_pkglists}" && exit + if [ "$MODE" = "" ] ; then + error "you need to specify a package list defined in _/buildscripts/${_cur_repo}-${_build_arch}-pkgs.conf\n -> ${_available_pkglists}" && exit + fi cd $_build_work From 405313637b177add521fd6281fa1026fb001507c Mon Sep 17 00:00:00 2001 From: amnon Date: Tue, 22 Jun 2010 21:33:32 +0000 Subject: [PATCH 6/6] remove unneeded pkg list names --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 94dca6793..fe8935c2f 100755 --- a/build.sh +++ b/build.sh @@ -22,7 +22,7 @@ _script_name="build(er)" _build_arch="$_arch" _cur_repo=`pwd | awk -F '/' '{print $NF}'` _needed_functions="config_handling messages dependency_handling" -_available_pkglists=`cat _buildscripts/${_cur_repo}-${_build_arch}-pkgs.conf | grep "_" | cut -d "=" -f 1 | awk 'BEGIN {FS="_"} {print $NF}' | sed '/^$/d'` +_available_pkglists=`cat _buildscripts/${_cur_repo}-${_build_arch}-pkgs.conf | grep $(echo "_build_${_cur_repo}"|sed 's/-/_/g') | cut -d "=" -f 1 | awk 'BEGIN {FS="_"} {print $NF}' | sed '/^$/d'` # load functions for subroutine in ${_needed_functions} do