From 528fdc672eabeb465b37094a8a423c67bfc56b66 Mon Sep 17 00:00:00 2001 From: philm Date: Fri, 22 Apr 2011 17:41:06 +0000 Subject: [PATCH 1/4] cbundle: clean testing stuff --- tools-pkg-cbundle/PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools-pkg-cbundle/PKGBUILD b/tools-pkg-cbundle/PKGBUILD index 5cb2cf711..18644e197 100644 --- a/tools-pkg-cbundle/PKGBUILD +++ b/tools-pkg-cbundle/PKGBUILD @@ -6,7 +6,7 @@ pkgname=cbundle pkgver=0.4.5.1 -pkgrel=3 +pkgrel=2 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse') makedepends=('qt' 'automoc4' 'kdebase-workspace') pkgdesc="A shared library for using Chakra software bundles" @@ -29,7 +29,6 @@ mksource() { build() { cd "${srcdir}/cbundle" - patch -Np0 -i ${startdir}/debug-env.patch cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ From 42b020028975b06b44c9793aff3c1bac3c775ad1 Mon Sep 17 00:00:00 2001 From: Giuseppe Date: Fri, 22 Apr 2011 19:01:14 +0000 Subject: [PATCH 2/4] added flag to compile against xulrunner 2.0 (gtk free) --- .gitignore | 7 +++++++ support-pkg-google-gadgets-qt/PKGBUILD | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 53494abd7..a24dbed1a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,9 @@ hdr build.sh clean-builddir.sh clean-workdir.sh +copy.sh makepkg +move.sh pkgrels-decrease.sh pkgrels-increase.sh pkgrels-reset.sh @@ -24,6 +26,11 @@ sync-complete.sh sync-down.sh sync-up-nodb.sh sync-up.sh +remove.sh +recreate-database.sh +upload.sh +upload-nodb.sh +unlock-database.sh *-cfg.conf *-makepkg.conf diff --git a/support-pkg-google-gadgets-qt/PKGBUILD b/support-pkg-google-gadgets-qt/PKGBUILD index 391d5f4e0..a0358c900 100644 --- a/support-pkg-google-gadgets-qt/PKGBUILD +++ b/support-pkg-google-gadgets-qt/PKGBUILD @@ -16,15 +16,14 @@ _origname=google-gadgets-qt pkgname=${_origname} pkgver=0.11.2 -pkgrel=1 +pkgrel=3 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' - "${_qtpkg}>=${_qtver}" 'desktop-file-utils' 'curl' 'spidermonkey') +depends=('gstreamer0.10-base-plugins' 'librsvg' 'xulrunner>=2.0' "${_qtpkg}>=${_qtver}" 'desktop-file-utils' 'curl' 'spidermonkey') makedepends=('zip' 'unzip') -options=('!libtool' '!splitdbg' '!splithdr') +options=('!libtool') conflicts=('google-gadgets-gtk' 'google-gadgets' 'google-gadgets-qt' 'google-gadgets-gtk-svn' 'google-gagdets-qt-svn') replaces=('google-gadgets-qt') install=${_origname}.install @@ -41,7 +40,7 @@ build() { cd "${srcdir}/google-gadgets-for-linux-$pkgver" - ./configure --prefix=${_installprefix} \ + ./configure --prefix=/usr \ --disable-werror \ --disable-update-desktop-database \ --disable-update-mime-database \ @@ -50,6 +49,7 @@ build() --disable-gtk-system-framework \ --disable-gtkmoz-browser-element \ --disable-gtk-flash-element \ + --disable-smjs-script-runtime \ || return 1 make || return 1 From d9ccc4c533c9e2385c24d76a9886e63c13cca93a Mon Sep 17 00:00:00 2001 From: Giuseppe Date: Sat, 23 Apr 2011 11:03:56 +0000 Subject: [PATCH 3/4] restored splitdbg splithdr options --- support-pkg-google-gadgets-qt/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support-pkg-google-gadgets-qt/PKGBUILD b/support-pkg-google-gadgets-qt/PKGBUILD index a0358c900..3a8d4cd13 100644 --- a/support-pkg-google-gadgets-qt/PKGBUILD +++ b/support-pkg-google-gadgets-qt/PKGBUILD @@ -16,14 +16,14 @@ _origname=google-gadgets-qt pkgname=${_origname} pkgver=0.11.2 -pkgrel=3 +pkgrel=4 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') makedepends=('zip' 'unzip') -options=('!libtool') +options=('!libtool' '!splitdbg' '!splithdr') conflicts=('google-gadgets-gtk' 'google-gadgets' 'google-gadgets-qt' 'google-gadgets-gtk-svn' 'google-gagdets-qt-svn') replaces=('google-gadgets-qt') install=${_origname}.install From 81d682c58097e5e493b59a0171de86a72e65f7a2 Mon Sep 17 00:00:00 2001 From: abveritas Date: Sun, 24 Apr 2011 02:47:16 +0000 Subject: [PATCH 4/4] kdepim/runtime update to 4.4.11.1 --- kdepim-runtime/PKGBUILD | 6 +++--- kdepim/PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kdepim-runtime/PKGBUILD b/kdepim-runtime/PKGBUILD index 791661e40..a76c36ea2 100644 --- a/kdepim-runtime/PKGBUILD +++ b/kdepim-runtime/PKGBUILD @@ -17,8 +17,8 @@ _origname=kdepim-runtime pkgname=${_origname} arch=('i686' 'x86_64') #pkgver=${_kdever} -pkgver=4.4.10 -pkgrel=3 +pkgver=4.4.11 +pkgrel=1 pkgdesc="KDE Pim Runtime" url="http://www.kde.org" @@ -37,7 +37,7 @@ groups=("kde" "kde-complete" "kde-uninstall" "kde-minimal") #source=("$_mirror/${_origname}-$_kdever.tar.bz2") source=("ftp://ftp.gwdg.de/pub/x11/kde/stable/kdepim-$pkgver/src/${_origname}-$pkgver.tar.bz2") -sha1sums=('a0e74f95daf8c28f7b3bd1ee84b6a86fc509d0ff') +sha1sums=('e3105eb99ab0de47c617f8491774b2e3ee4cdd4a') # # build and install diff --git a/kdepim/PKGBUILD b/kdepim/PKGBUILD index 0e81d254f..274d74eb0 100644 --- a/kdepim/PKGBUILD +++ b/kdepim/PKGBUILD @@ -88,8 +88,8 @@ packs=('ar' arch=('i686' 'x86_64') #pkgver=${_kdever} -pkgver=4.4.10 -pkgrel=3 +pkgver=4.4.11.1 +pkgrel=1 pkgdesc="split package" url="http://www.kde.org" @@ -104,7 +104,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kdelibs>=${_kdever}" "kdepi #source=("$_mirror/${_origname}-$_kdever.tar.bz2") source=("ftp://ftp.gwdg.de/pub/x11/kde/stable/kdepim-$pkgver/src/${_origname}-$pkgver.tar.bz2" "http://chakra-project.org/sources/kde-l10n/kdepim-l10n-4.4.10.tar.xz") -sha1sums=('b9c45e80dddc3bff201df6ddd76fdf4f1f18d5c3' +sha1sums=('49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2' 'ce16a0cbd172376bc999b5bcbf29733273cc866c') #