[arch-commits] Commit in qupzilla/repos (8 files)
speps
speps at nymeria.archlinux.org
Sun Dec 22 05:01:01 UTC 2013
Date: Sunday, December 22, 2013 @ 06:01:00
Author: speps
Revision: 102850
archrelease: copy trunk to community-i686, community-x86_64
Added:
qupzilla/repos/community-i686/PKGBUILD
(from rev 102849, qupzilla/trunk/PKGBUILD)
qupzilla/repos/community-i686/qupzilla.install
(from rev 102849, qupzilla/trunk/qupzilla.install)
qupzilla/repos/community-x86_64/PKGBUILD
(from rev 102849, qupzilla/trunk/PKGBUILD)
qupzilla/repos/community-x86_64/qupzilla.install
(from rev 102849, qupzilla/trunk/qupzilla.install)
Deleted:
qupzilla/repos/community-i686/PKGBUILD
qupzilla/repos/community-i686/qupzilla.install
qupzilla/repos/community-x86_64/PKGBUILD
qupzilla/repos/community-x86_64/qupzilla.install
-----------------------------------+
/PKGBUILD | 130 ++++++++++++++++++++++++++++++++++++
/qupzilla.install | 24 ++++++
community-i686/PKGBUILD | 36 ---------
community-i686/qupzilla.install | 12 ---
community-x86_64/PKGBUILD | 36 ---------
community-x86_64/qupzilla.install | 12 ---
6 files changed, 154 insertions(+), 96 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-12-22 05:00:20 UTC (rev 102849)
+++ community-i686/PKGBUILD 2013-12-22 05:01:00 UTC (rev 102850)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: speps <speps at aur dot archlinux dot org>
-
-pkgname=qupzilla
-pkgver=1.4.4
-pkgrel=1
-pkgdesc="Cross-platform QtWebKit browser"
-arch=(i686 x86_64)
-url="http://www.qupzilla.com/"
-license=('GPL3')
-depends=('qtwebkit' 'hunspell')
-optdepends=('bash-completion: bash completion support')
-install="$pkgname.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/QupZilla/$pkgname/tarball/v$pkgver")
-md5sums=('cfbf5cd23d184275c389c79a39a28631')
-
-build() {
- cd "$srcdir/QupZilla-$pkgname-"*
-
- # enable webgl support
- export USE_WEBGL=true
-
- qmake-qt4 QUPZILLA_PREFIX=/usr/
- make
-}
-
-package() {
- cd "$srcdir/QupZilla-$pkgname-"*
- make INSTALL_ROOT="$pkgdir/" install
-
- # zsh completion
- install -Dm644 linux/completion/zsh_completion.sh \
- "$pkgdir/usr/share/zsh/site-functions/_$pkgname"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: qupzilla/repos/community-i686/PKGBUILD (from rev 102849, qupzilla/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-12-22 05:01:00 UTC (rev 102850)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgbase=qupzilla
+pkgname=(qupzilla qupzilla-qt5)
+pkgver=1.4.4
+pkgrel=1
+pkgdesc="Cross-platform QtWebKit browser"
+arch=(i686 x86_64)
+url="http://www.qupzilla.com/"
+license=('GPL3')
+makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell')
+optdepends=('bash-completion: bash completion support')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/$pkgbase/tarball/v$pkgver")
+noextract=("$pkgbase-$pkgver.tar.gz")
+install="$pkgbase.install"
+md5sums=('cfbf5cd23d184275c389c79a39a28631')
+
+prepare() {
+ # extract
+ mkdir -p qt{4,5}
+ bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt4
+ bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt5
+
+ # configure
+ export USE_WEBGL=true \
+ QUPZILLA_PREFIX=/usr/
+}
+
+build() {
+ cd qt4
+ qmake-qt4
+ make
+
+ cd ../qt5
+ qmake
+ make
+}
+
+package_qupzilla() {
+ depends=('qtwebkit' 'hunspell')
+
+ cd qt4
+ make INSTALL_ROOT="$pkgdir/" install
+
+ # zsh completion
+ install -Dm644 linux/completion/zsh_completion.sh \
+ "$pkgdir/usr/share/zsh/site-functions/_$pkgbase"
+}
+
+package_qupzilla-qt5() {
+ pkgdesc+=" (Qt5)"
+ depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme')
+ provides=('qupzilla')
+ conflicts=('qupzilla')
+
+ cd qt5
+ make INSTALL_ROOT="$pkgdir/" install
+
+ # zsh completion
+ install -Dm644 linux/completion/zsh_completion.sh \
+ "$pkgdir/usr/share/zsh/site-functions/_$pkgbase"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/qupzilla.install
===================================================================
--- community-i686/qupzilla.install 2013-12-22 05:00:20 UTC (rev 102849)
+++ community-i686/qupzilla.install 2013-12-22 05:01:00 UTC (rev 102850)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: qupzilla/repos/community-i686/qupzilla.install (from rev 102849, qupzilla/trunk/qupzilla.install)
===================================================================
--- community-i686/qupzilla.install (rev 0)
+++ community-i686/qupzilla.install 2013-12-22 05:01:00 UTC (rev 102850)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-12-22 05:00:20 UTC (rev 102849)
+++ community-x86_64/PKGBUILD 2013-12-22 05:01:00 UTC (rev 102850)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: speps <speps at aur dot archlinux dot org>
-
-pkgname=qupzilla
-pkgver=1.4.4
-pkgrel=1
-pkgdesc="Cross-platform QtWebKit browser"
-arch=(i686 x86_64)
-url="http://www.qupzilla.com/"
-license=('GPL3')
-depends=('qtwebkit' 'hunspell')
-optdepends=('bash-completion: bash completion support')
-install="$pkgname.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/QupZilla/$pkgname/tarball/v$pkgver")
-md5sums=('cfbf5cd23d184275c389c79a39a28631')
-
-build() {
- cd "$srcdir/QupZilla-$pkgname-"*
-
- # enable webgl support
- export USE_WEBGL=true
-
- qmake-qt4 QUPZILLA_PREFIX=/usr/
- make
-}
-
-package() {
- cd "$srcdir/QupZilla-$pkgname-"*
- make INSTALL_ROOT="$pkgdir/" install
-
- # zsh completion
- install -Dm644 linux/completion/zsh_completion.sh \
- "$pkgdir/usr/share/zsh/site-functions/_$pkgname"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: qupzilla/repos/community-x86_64/PKGBUILD (from rev 102849, qupzilla/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-12-22 05:01:00 UTC (rev 102850)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgbase=qupzilla
+pkgname=(qupzilla qupzilla-qt5)
+pkgver=1.4.4
+pkgrel=1
+pkgdesc="Cross-platform QtWebKit browser"
+arch=(i686 x86_64)
+url="http://www.qupzilla.com/"
+license=('GPL3')
+makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell')
+optdepends=('bash-completion: bash completion support')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/$pkgbase/tarball/v$pkgver")
+noextract=("$pkgbase-$pkgver.tar.gz")
+install="$pkgbase.install"
+md5sums=('cfbf5cd23d184275c389c79a39a28631')
+
+prepare() {
+ # extract
+ mkdir -p qt{4,5}
+ bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt4
+ bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt5
+
+ # configure
+ export USE_WEBGL=true \
+ QUPZILLA_PREFIX=/usr/
+}
+
+build() {
+ cd qt4
+ qmake-qt4
+ make
+
+ cd ../qt5
+ qmake
+ make
+}
+
+package_qupzilla() {
+ depends=('qtwebkit' 'hunspell')
+
+ cd qt4
+ make INSTALL_ROOT="$pkgdir/" install
+
+ # zsh completion
+ install -Dm644 linux/completion/zsh_completion.sh \
+ "$pkgdir/usr/share/zsh/site-functions/_$pkgbase"
+}
+
+package_qupzilla-qt5() {
+ pkgdesc+=" (Qt5)"
+ depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme')
+ provides=('qupzilla')
+ conflicts=('qupzilla')
+
+ cd qt5
+ make INSTALL_ROOT="$pkgdir/" install
+
+ # zsh completion
+ install -Dm644 linux/completion/zsh_completion.sh \
+ "$pkgdir/usr/share/zsh/site-functions/_$pkgbase"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/qupzilla.install
===================================================================
--- community-x86_64/qupzilla.install 2013-12-22 05:00:20 UTC (rev 102849)
+++ community-x86_64/qupzilla.install 2013-12-22 05:01:00 UTC (rev 102850)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: qupzilla/repos/community-x86_64/qupzilla.install (from rev 102849, qupzilla/trunk/qupzilla.install)
===================================================================
--- community-x86_64/qupzilla.install (rev 0)
+++ community-x86_64/qupzilla.install 2013-12-22 05:01:00 UTC (rev 102850)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list