From ea6b86918910c6e7a577782416de1e44389e8b2d Mon Sep 17 00:00:00 2001 From: philm Date: Fri, 22 Apr 2011 17:41:06 +0000 Subject: [PATCH 1/3] 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 36e85a91db8d2036d3f2cfc419d2bc9634c1866d Mon Sep 17 00:00:00 2001 From: Giuseppe Date: Fri, 22 Apr 2011 19:01:14 +0000 Subject: [PATCH 2/3] 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 15f4b5d669f4714f68b3d54d5d97ae1f3b5541f4 Mon Sep 17 00:00:00 2001 From: Giuseppe Date: Sat, 23 Apr 2011 11:03:56 +0000 Subject: [PATCH 3/3] 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