[arch-commits] Commit in qtwebkit/repos (14 files)

2013-10-14 Thread Andrea Scarpino 
Date: Monday, October 14, 2013 @ 20:08:22
  Author: andrea
Revision: 196523

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qtwebkit/repos/extra-i686/PKGBUILD
(from rev 196522, qtwebkit/trunk/PKGBUILD)
  qtwebkit/repos/extra-i686/bison3.patch
(from rev 196522, qtwebkit/trunk/bison3.patch)
  qtwebkit/repos/extra-i686/qwebview.patch
(from rev 196522, qtwebkit/trunk/qwebview.patch)
  qtwebkit/repos/extra-i686/use-python2.patch
(from rev 196522, qtwebkit/trunk/use-python2.patch)
  qtwebkit/repos/extra-x86_64/PKGBUILD
(from rev 196522, qtwebkit/trunk/PKGBUILD)
  qtwebkit/repos/extra-x86_64/bison3.patch
(from rev 196522, qtwebkit/trunk/bison3.patch)
  qtwebkit/repos/extra-x86_64/qwebview.patch
(from rev 196522, qtwebkit/trunk/qwebview.patch)
  qtwebkit/repos/extra-x86_64/use-python2.patch
(from rev 196522, qtwebkit/trunk/use-python2.patch)
Deleted:
  qtwebkit/repos/extra-i686/PKGBUILD
  qtwebkit/repos/extra-i686/qwebview.patch
  qtwebkit/repos/extra-i686/use-python2.patch
  qtwebkit/repos/extra-x86_64/PKGBUILD
  qtwebkit/repos/extra-x86_64/qwebview.patch
  qtwebkit/repos/extra-x86_64/use-python2.patch

+
 /PKGBUILD  |  126 +++
 /qwebview.patch|   42 +
 /use-python2.patch |  114 +++
 extra-i686/PKGBUILD|   56 -
 extra-i686/bison3.patch|   38 +++
 extra-i686/qwebview.patch  |   21 --
 extra-i686/use-python2.patch   |   57 -
 extra-x86_64/PKGBUILD  |   56 -
 extra-x86_64/bison3.patch  |   38 +++
 extra-x86_64/qwebview.patch|   21 --
 extra-x86_64/use-python2.patch |   57 -
 11 files changed, 358 insertions(+), 268 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-10-14 18:08:12 UTC (rev 196522)
+++ extra-i686/PKGBUILD 2013-10-14 18:08:22 UTC (rev 196523)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=qtwebkit
-pkgver=2.3.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://trac.webkit.org/wiki/QtWebKit'
-pkgdesc='An open source web browser engine (Qt port)'
-license=('LGPL2.1' 'GPL3')
-depends=('qt4' 'systemd' 'gstreamer0.10-base')
-makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
-conflicts=('qt4.8')
-_qtver=4.8.5
-source=(${pkgname}-${pkgver}.tar.gz::http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver};
-
http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-${_qtver}.tar.gz;
-'use-python2.patch'
-'qwebview.patch')
-sha1sums=('adf66bc92b0c3e41791a419c6b776d0167acaa7c'
-  '745f9ebf091696c0d5403ce691dc28c039d77b9e'
-  '315b6ff603f35e5492a036f7082f6aa075dfb607'
-  'ef467fcfc9e74aa88356f27acc21792706ed1e4d')
-
-build() {
-  cd webkit-qtwebkit-23
-
-  patch -p1 -i ${srcdir}/use-python2.patch
-
-  OPTS=--no-webkit2
-  if [ ${CARCH} = i686 ]; then
-  # FS#33418
-  OPTS=${OPTS} --no-force-sse2
-  fi
-
-  export QTDIR=/usr
-  export PATH=/usr/lib/qt4/bin:$PATH
-  Tools/Scripts/build-webkit --qt \
---makeargs=${MAKEFLAGS} \
---prefix=/usr \
-${OPTS}
-
-  # Build the QWebView plugin (FS#27914)
-  cd ../qt-everywhere-opensource-src-${_qtver}
-  patch -p1 -i ${srcdir}/qwebview.patch
-  cd tools/designer/src/plugins/qwebview
-  qmake-qt4
-  make
-}
-
-package() {
-  cd webkit-qtwebkit-23
-  make INSTALL_ROOT=${pkgdir} -C WebKitBuild/Release install
-
-  cd 
../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
-  make INSTALL_ROOT=${pkgdir} install
-}

Copied: qtwebkit/repos/extra-i686/PKGBUILD (from rev 196522, 
qtwebkit/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-10-14 18:08:22 UTC (rev 196523)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=qtwebkit
+pkgver=2.3.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://trac.webkit.org/wiki/QtWebKit'
+pkgdesc='An open source web browser engine (Qt port)'
+license=('LGPL2.1' 'GPL3')
+depends=('qt4' 'systemd' 'gstreamer0.10-base')
+makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
+conflicts=('qt4.8')
+_qtver=4.8.5
+source=(ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz;
+
http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-${_qtver}.tar.gz;
+'use-python2.patch'
+'bison3.patch'
+'qwebview.patch')
+sha1sums=('64f3ab7f8e53b5b971a3a6577fc61db0cc2ea31f'
+  '745f9ebf091696c0d5403ce691dc28c039d77b9e'
+  '315b6ff603f35e5492a036f7082f6aa075dfb607'
+  'd2c6182512e4bcbdf30a9e9d513c52fe4b16d9f2'
+

[arch-commits] Commit in qtwebkit/repos (14 files)

2013-01-21 Thread andrea 
Date: Monday, January 21, 2013 @ 14:09:08
  Author: andrea
Revision: 175761

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qtwebkit/repos/extra-i686/PKGBUILD
(from rev 175760, qtwebkit/trunk/PKGBUILD)
  qtwebkit/repos/extra-i686/qwebview.patch
(from rev 175760, qtwebkit/trunk/qwebview.patch)
  qtwebkit/repos/extra-i686/use-python2.patch
(from rev 175760, qtwebkit/trunk/use-python2.patch)
  qtwebkit/repos/extra-x86_64/PKGBUILD
(from rev 175760, qtwebkit/trunk/PKGBUILD)
  qtwebkit/repos/extra-x86_64/qwebview.patch
(from rev 175760, qtwebkit/trunk/qwebview.patch)
  qtwebkit/repos/extra-x86_64/use-python2.patch
(from rev 175760, qtwebkit/trunk/use-python2.patch)
Deleted:
  qtwebkit/repos/extra-i686/PKGBUILD
  qtwebkit/repos/extra-i686/enable-accelerated-compositing.patch
  qtwebkit/repos/extra-i686/qwebview.patch
  qtwebkit/repos/extra-i686/use-python2.patch
  qtwebkit/repos/extra-x86_64/PKGBUILD
  qtwebkit/repos/extra-x86_64/enable-accelerated-compositing.patch
  qtwebkit/repos/extra-x86_64/qwebview.patch
  qtwebkit/repos/extra-x86_64/use-python2.patch

---+
 extra-i686/PKGBUILD   |  112 +--
 extra-i686/enable-accelerated-compositing.patch   |   11 -
 extra-i686/qwebview.patch |   42 +++
 extra-i686/use-python2.patch  |  114 ++--
 extra-x86_64/PKGBUILD |  112 +--
 extra-x86_64/enable-accelerated-compositing.patch |   11 -
 extra-x86_64/qwebview.patch   |   42 +++
 extra-x86_64/use-python2.patch|  114 ++--
 8 files changed, 264 insertions(+), 294 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-01-21 12:31:18 UTC (rev 175760)
+++ extra-i686/PKGBUILD 2013-01-21 13:09:08 UTC (rev 175761)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=qtwebkit
-pkgver=2.3git20130115
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://trac.webkit.org/wiki/QtWebKit'
-pkgdesc='An open source web browser engine (Qt port)'
-license=('LGPL2.1' 'GPL3')
-depends=('qt' 'systemd' 'gstreamer0.10-base')
-makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
-conflicts=('qt4.8')
-_qtver=4.8.4
-source=(${pkgname}-${pkgver}.tar.gz::http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-2.3;
-
http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz;
-'use-python2.patch'
-'qwebview.patch'
-'enable-accelerated-compositing.patch')
-sha1sums=('8d74fdb4354d1f1b4f3df0ec7b057a7516350372'
-  'f5880f11c139d7d8d01ecb8d874535f7d9553198'
-  '315b6ff603f35e5492a036f7082f6aa075dfb607'
-  'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f'
-  '471032229c61a0f95e142c21370aab6d3f00ff7e')
-
-build() {
-  cd webkit-qtwebkit-23
-
-  patch -p1 -i ${srcdir}/use-python2.patch
-
-  # Fixed upstream, https://bugs.webkit.org/show_bug.cgi?id=106892
-  patch -p1 -i ${srcdir}/enable-accelerated-compositing.patch
-
-  export QTDIR=/usr
-  Tools/Scripts/build-webkit --qt \
---makeargs=${MAKEFLAGS} \
---prefix=/usr \
---no-webkit2
-
-  cd ../
-
-  # Build the QWebView plugin (FS#27914)
-  cd qt-everywhere-opensource-src-${_qtver}
-  patch -p1 -i ${srcdir}/qwebview.patch
-  cd tools/designer/src/plugins/qwebview
-  qmake
-  make
-}
-
-package() {
-  cd webkit-qtwebkit-23
-  make INSTALL_ROOT=${pkgdir} -C WebKitBuild/Release install
-
-  cd ../
-
-  cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
-  make INSTALL_ROOT=${pkgdir} install
-}

Copied: qtwebkit/repos/extra-i686/PKGBUILD (from rev 175760, 
qtwebkit/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-01-21 13:09:08 UTC (rev 175761)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=qtwebkit
+pkgver=2.3.beta1
+_pkgver=2.3-beta1
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://trac.webkit.org/wiki/QtWebKit'
+pkgdesc='An open source web browser engine (Qt port)'
+license=('LGPL2.1' 'GPL3')
+depends=('qt' 'systemd' 'gstreamer0.10-base')
+makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
+conflicts=('qt4.8')
+_qtver=4.8.4
+source=(${pkgname}-${pkgver}.tar.gz::http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${_pkgver};
+
http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz;
+'use-python2.patch'
+'qwebview.patch')
+sha1sums=('e5a8ffe62fc57dbbea2110241077bebbcd605fd2'
+  'f5880f11c139d7d8d01ecb8d874535f7d9553198'
+  '315b6ff603f35e5492a036f7082f6aa075dfb607'
+  'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f')
+
+build() {

[arch-commits] Commit in qtwebkit/repos (14 files)

2013-01-15 Thread Andrea Scarpino 
Date: Tuesday, January 15, 2013 @ 15:30:20
  Author: andrea
Revision: 175164

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  qtwebkit/repos/testing-i686/PKGBUILD
(from rev 175163, qtwebkit/trunk/PKGBUILD)
  qtwebkit/repos/testing-i686/enable-accelerated-compositing.patch
(from rev 175163, qtwebkit/trunk/enable-accelerated-compositing.patch)
  qtwebkit/repos/testing-i686/qwebview.patch
(from rev 175163, qtwebkit/trunk/qwebview.patch)
  qtwebkit/repos/testing-i686/use-python2.patch
(from rev 175163, qtwebkit/trunk/use-python2.patch)
  qtwebkit/repos/testing-x86_64/PKGBUILD
(from rev 175163, qtwebkit/trunk/PKGBUILD)
  qtwebkit/repos/testing-x86_64/enable-accelerated-compositing.patch
(from rev 175163, qtwebkit/trunk/enable-accelerated-compositing.patch)
  qtwebkit/repos/testing-x86_64/qwebview.patch
(from rev 175163, qtwebkit/trunk/qwebview.patch)
  qtwebkit/repos/testing-x86_64/use-python2.patch
(from rev 175163, qtwebkit/trunk/use-python2.patch)
Deleted:
  qtwebkit/repos/testing-i686/PKGBUILD
  qtwebkit/repos/testing-i686/qwebview.patch
  qtwebkit/repos/testing-i686/use-python2.patch
  qtwebkit/repos/testing-x86_64/PKGBUILD
  qtwebkit/repos/testing-x86_64/qwebview.patch
  qtwebkit/repos/testing-x86_64/use-python2.patch

-+
 testing-i686/PKGBUILD   |  111 +
 testing-i686/enable-accelerated-compositing.patch   |   11 +
 testing-i686/qwebview.patch |   42 +++---
 testing-i686/use-python2.patch  |  114 +-
 testing-x86_64/PKGBUILD |  111 +
 testing-x86_64/enable-accelerated-compositing.patch |   11 +
 testing-x86_64/qwebview.patch   |   42 +++---
 testing-x86_64/use-python2.patch|  114 +-
 8 files changed, 294 insertions(+), 262 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2013-01-15 19:02:29 UTC (rev 175163)
+++ testing-i686/PKGBUILD   2013-01-15 20:30:20 UTC (rev 175164)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=qtwebkit
-pkgver=2.3git20130108
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://trac.webkit.org/wiki/QtWebKit'
-pkgdesc='An open source web browser engine (Qt port)'
-license=('LGPL2.1' 'GPL3')
-depends=('qt' 'systemd' 'gstreamer0.10-base')
-makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
-conflicts=('qt4.8')
-_qtver=4.8.4
-source=(${pkgname}-${pkgver}.tar.gz::http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-2.3;
-
http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz;
-'use-python2.patch'
-'qwebview.patch')
-sha1sums=('a1c62eab9fc476d5e646c9370f216f3c262b0ab7'
-  'f5880f11c139d7d8d01ecb8d874535f7d9553198'
-  '315b6ff603f35e5492a036f7082f6aa075dfb607'
-  'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f')
-
-build() {
-  cd webkit-qtwebkit-23
-
-  patch -p1 -i ${srcdir}/use-python2.patch
-
-  export QTDIR=/usr
-  Tools/Scripts/build-webkit --qt \
---makeargs=${MAKEFLAGS} \
---prefix=/usr \
---no-webkit2
-
-  cd ../
-
-  # Build the QWebView plugin (FS#27914)
-  cd qt-everywhere-opensource-src-${_qtver}
-  patch -p1 -i ${srcdir}/qwebview.patch
-  cd tools/designer/src/plugins/qwebview
-  qmake
-  make
-}
-
-package() {
-  cd webkit-qtwebkit-23
-  make INSTALL_ROOT=${pkgdir} -C WebKitBuild/Release install
-
-  cd ../
-
-  cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
-  make INSTALL_ROOT=${pkgdir} install
-}

Copied: qtwebkit/repos/testing-i686/PKGBUILD (from rev 175163, 
qtwebkit/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-01-15 20:30:20 UTC (rev 175164)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=qtwebkit
+pkgver=2.3git20130115
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://trac.webkit.org/wiki/QtWebKit'
+pkgdesc='An open source web browser engine (Qt port)'
+license=('LGPL2.1' 'GPL3')
+depends=('qt' 'systemd' 'gstreamer0.10-base')
+makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
+conflicts=('qt4.8')
+_qtver=4.8.4
+source=(${pkgname}-${pkgver}.tar.gz::http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-2.3;
+
http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz;
+'use-python2.patch'
+'qwebview.patch'
+'enable-accelerated-compositing.patch')
+sha1sums=('8d74fdb4354d1f1b4f3df0ec7b057a7516350372'
+  'f5880f11c139d7d8d01ecb8d874535f7d9553198'
+  '315b6ff603f35e5492a036f7082f6aa075dfb607'
+