From 9bbd8c7bf52227e6a9ace2eb7a3291102a1c06b7 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 13 May 2012 16:58:36 +0000 Subject: [PATCH] Clean the pkgbuild --- .gitignore | 3 +++ .../PKGBUILD | 13 ++----------- .../ggl-qt.desktop | 0 .../google-gadgets-qt.install | 0 .../plasma-stuff.tar.gz | Bin 5 files changed, 5 insertions(+), 11 deletions(-) rename {support-pkg-google-gadgets-qt => google-gadgets-qt}/PKGBUILD (87%) rename {support-pkg-google-gadgets-qt => google-gadgets-qt}/ggl-qt.desktop (100%) rename {support-pkg-google-gadgets-qt => google-gadgets-qt}/google-gadgets-qt.install (100%) rename {support-pkg-google-gadgets-qt => google-gadgets-qt}/plasma-stuff.tar.gz (100%) diff --git a/.gitignore b/.gitignore index a24dbed1a..2cd4a3dd4 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,9 @@ recreate-database.sh upload.sh upload-nodb.sh unlock-database.sh +unlock-repo.sh +copy-any.sh +get-any.sh *-cfg.conf *-makepkg.conf diff --git a/support-pkg-google-gadgets-qt/PKGBUILD b/google-gadgets-qt/PKGBUILD similarity index 87% rename from support-pkg-google-gadgets-qt/PKGBUILD rename to google-gadgets-qt/PKGBUILD index e7ec1ce9f..37d0344fa 100644 --- a/support-pkg-google-gadgets-qt/PKGBUILD +++ b/google-gadgets-qt/PKGBUILD @@ -2,18 +2,10 @@ # KDE SC Packages for Chakra, part of chakra-project.org # # maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - - # original name (used for the source and pkgnames) _origname=google-gadgets-qt - - pkgname=${_origname} pkgver=0.11.2 pkgrel=5 @@ -21,7 +13,7 @@ pkgdesc="Desktop Widgets (engine) from Google" arch=(i686 x86_64) url="http://code.google.com/p/google-gadgets-for-linux/" license=('APACHE') -depends=('gstreamer0.10-base-plugins' 'librsvg' 'xulrunner>=2.0' "${_qtpkg}>=${_qtver}" 'desktop-file-utils' 'curl' 'spidermonkey') +depends=('gstreamer0.10-base-plugins' 'librsvg' 'xulrunner>=12.0' "qt>=4.8.1" 'desktop-file-utils' 'curl' 'spidermonkey') makedepends=('zip' 'unzip') options=('!libtool' '!splitdbg' '!splithdr') conflicts=('google-gadgets-gtk' 'google-gadgets' 'google-gadgets-qt' 'google-gadgets-gtk-svn' 'google-gagdets-qt-svn') @@ -36,8 +28,7 @@ md5sums=('279305553bcbf74f3e3615f6abc36a5e' # google-gadgets-for-linux-0.11.2.t groups=("kde-uninstall" "kde-support") -build() -{ +build() { cd "${srcdir}/google-gadgets-for-linux-$pkgver" ./configure --prefix=/usr \ diff --git a/support-pkg-google-gadgets-qt/ggl-qt.desktop b/google-gadgets-qt/ggl-qt.desktop similarity index 100% rename from support-pkg-google-gadgets-qt/ggl-qt.desktop rename to google-gadgets-qt/ggl-qt.desktop diff --git a/support-pkg-google-gadgets-qt/google-gadgets-qt.install b/google-gadgets-qt/google-gadgets-qt.install similarity index 100% rename from support-pkg-google-gadgets-qt/google-gadgets-qt.install rename to google-gadgets-qt/google-gadgets-qt.install diff --git a/support-pkg-google-gadgets-qt/plasma-stuff.tar.gz b/google-gadgets-qt/plasma-stuff.tar.gz similarity index 100% rename from support-pkg-google-gadgets-qt/plasma-stuff.tar.gz rename to google-gadgets-qt/plasma-stuff.tar.gz