[arch-commits] Commit in libwebkit/repos (10 files)

Ionut Biru ibiru at archlinux.org
Tue Mar 20 08:10:42 EDT 2012


    Date: Tuesday, March 20, 2012 @ 08:10:42
  Author: ibiru
Revision: 153905

archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64

Added:
  libwebkit/repos/gnome-unstable-i686/PKGBUILD
    (from rev 153904, libwebkit/trunk/PKGBUILD)
  libwebkit/repos/gnome-unstable-x86_64/PKGBUILD
    (from rev 153904, libwebkit/trunk/PKGBUILD)
Deleted:
  libwebkit/repos/gnome-unstable-i686/PKGBUILD
  libwebkit/repos/gnome-unstable-i686/libwebkit.install
  libwebkit/repos/gnome-unstable-i686/python.patch
  libwebkit/repos/gnome-unstable-i686/webkit-gtk-1.7.90-parallel-make-hack.patch
  libwebkit/repos/gnome-unstable-x86_64/PKGBUILD
  libwebkit/repos/gnome-unstable-x86_64/libwebkit.install
  libwebkit/repos/gnome-unstable-x86_64/python.patch
  libwebkit/repos/gnome-unstable-x86_64/webkit-gtk-1.7.90-parallel-make-hack.patch

------------------------------------------------------------------+
 gnome-unstable-i686/PKGBUILD                                     |  124 ++++------
 gnome-unstable-i686/libwebkit.install                            |   11 
 gnome-unstable-i686/python.patch                                 |   12 
 gnome-unstable-i686/webkit-gtk-1.7.90-parallel-make-hack.patch   |   21 -
 gnome-unstable-x86_64/PKGBUILD                                   |  124 ++++------
 gnome-unstable-x86_64/libwebkit.install                          |   11 
 gnome-unstable-x86_64/python.patch                               |   12 
 gnome-unstable-x86_64/webkit-gtk-1.7.90-parallel-make-hack.patch |   21 -
 8 files changed, 110 insertions(+), 226 deletions(-)

Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD	2012-03-20 12:07:17 UTC (rev 153904)
+++ gnome-unstable-i686/PKGBUILD	2012-03-20 12:10:42 UTC (rev 153905)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=libwebkit
-pkgname=(libwebkit libwebkit3)
-pkgver=1.7.91
-pkgrel=1
-pkgdesc="An opensource web content engine"
-arch=('i686' 'x86_64')
-url="http://webkitgtk.org/"
-license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa' 'gtk-doc')
-options=('!libtool' '!emptydirs')
-install=libwebkit.install
-source=(http://webkitgtk.org/webkit-$pkgver.tar.xz
-        webkit-gtk-1.7.90-parallel-make-hack.patch
-        python.patch)
-sha256sums=('9d9de6968c466b973988ce97e4f2f53535dd4f72356bd7b29b03ba9dab937545'
-            'e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73'
-            '29b82e47277d982bc57a7ba967d28ae76e07556986627c2e456694b699ae0e09')
-
-build() {
-  cd "$srcdir/webkit-$pkgver"
-  patch -Np1 -i $srcdir/webkit-gtk-1.7.90-parallel-make-hack.patch
-  patch -Np1 -i $srcdir/python.patch
-  autoreconf -I Source/autotools -fi
-  mkdir build-gtk{2,3}
-
-  ( cd build-gtk2 && _build --with-gtk=2.0 )
-  ( cd build-gtk3 && _build --with-gtk=3.0 )
-}
-
-_build() {
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --with-font-backend=freetype \
-    --with-unicode-backend=icu \
-    --enable-geolocation=no \
-    --enable-spellcheck "$@"
-#  make all stamp-po
-#  until parallel building is fixed
-  make all-built-sources-local
-  make all-ltlibraries-local
-  make all-programs-local
-  make all-data-local
-  make stamp-po
-}
-
-package_libwebkit() {
-  pkgdesc+=" (for GTK2)"
-  depends+=(gtk2)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk2"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
-}
-
-package_libwebkit3() {
-  pkgdesc+=" (for GTK3)"
-  depends+=(gtk3)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk3"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
-}
-
-
-

Copied: libwebkit/repos/gnome-unstable-i686/PKGBUILD (from rev 153904, libwebkit/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD	                        (rev 0)
+++ gnome-unstable-i686/PKGBUILD	2012-03-20 12:10:42 UTC (rev 153905)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=libwebkit
+pkgname=(libwebkit libwebkit3)
+pkgver=1.7.92
+pkgrel=1
+pkgdesc="An opensource web content engine"
+arch=('i686' 'x86_64')
+url="http://webkitgtk.org/"
+license=('custom')
+depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl')
+makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
+options=('!libtool' '!emptydirs')
+source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
+sha256sums=('b5f7b9eef333609d457a0e6b335ff8d9e31c92459019b8aa80e1e24767601bb0')
+
+build() {
+  cd "$srcdir/webkit-$pkgver"
+  mkdir build-gtk{2,3}
+
+  ( cd build-gtk2 && _build --with-gtk=2.0 )
+  ( cd build-gtk3 && _build --with-gtk=3.0 )
+}
+
+_build() {
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+    --enable-introspection \
+    --with-font-backend=freetype \
+    --with-unicode-backend=icu \
+    --enable-geolocation=no \
+    --enable-spellcheck "$@"
+  make all stamp-po
+}
+
+package_libwebkit() {
+  pkgdesc+=" (for GTK2)"
+  depends+=(gtk2)
+
+  cd "$srcdir/webkit-$pkgver/build-gtk2"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
+}
+
+package_libwebkit3() {
+  pkgdesc+=" (for GTK3)"
+  depends+=(gtk3)
+
+  cd "$srcdir/webkit-$pkgver/build-gtk3"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
+}
+
+
+

Deleted: gnome-unstable-i686/libwebkit.install
===================================================================
--- gnome-unstable-i686/libwebkit.install	2012-03-20 12:07:17 UTC (rev 153904)
+++ gnome-unstable-i686/libwebkit.install	2012-03-20 12:10:42 UTC (rev 153905)
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Deleted: gnome-unstable-i686/python.patch
===================================================================
--- gnome-unstable-i686/python.patch	2012-03-20 12:07:17 UTC (rev 153904)
+++ gnome-unstable-i686/python.patch	2012-03-20 12:10:42 UTC (rev 153905)
@@ -1,12 +0,0 @@
-diff -Nur webkit-1.7.91.orig/Tools/GNUmakefile.am webkit-1.7.91/Tools/GNUmakefile.am
---- webkit-1.7.91.orig/Tools/GNUmakefile.am	2012-03-08 12:37:34.221447643 +0000
-+++ webkit-1.7.91/Tools/GNUmakefile.am	2012-03-08 12:53:28.713523074 +0000
-@@ -326,7 +326,7 @@
- 	  fi; \
- 	fi
- endif
--	$(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
-+	$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
- 
- uninstall-local:
- 	@DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \

Deleted: gnome-unstable-i686/webkit-gtk-1.7.90-parallel-make-hack.patch
===================================================================
--- gnome-unstable-i686/webkit-gtk-1.7.90-parallel-make-hack.patch	2012-03-20 12:07:17 UTC (rev 153904)
+++ gnome-unstable-i686/webkit-gtk-1.7.90-parallel-make-hack.patch	2012-03-20 12:10:42 UTC (rev 153905)
@@ -1,21 +0,0 @@
-Horrible failure of a hack to enable workaround for
-https://bugs.webkit.org/show_bug.cgi?id=79498
-
---- a/GNUmakefile.am
-+++ b/GNUmakefile.am
-@@ -285,6 +285,15 @@
- all-local: stamp-po
- 	$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
- 
-+# Horrible hack to enable workaround for parallel make failure
-+all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h
-+
-+all-ltlibraries-local: GNUmakefile $(LTLIBRARIES)
-+
-+all-programs-local: GNUmakefile $(PROGRAMS)
-+
-+all-data-local: GNUmakefile $(DATA)
-+
- # remove built sources and program directories
- clean-local:
- 	-rm -rf $(GENPROGRAMS)

Deleted: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	2012-03-20 12:07:17 UTC (rev 153904)
+++ gnome-unstable-x86_64/PKGBUILD	2012-03-20 12:10:42 UTC (rev 153905)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=libwebkit
-pkgname=(libwebkit libwebkit3)
-pkgver=1.7.91
-pkgrel=1
-pkgdesc="An opensource web content engine"
-arch=('i686' 'x86_64')
-url="http://webkitgtk.org/"
-license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa' 'gtk-doc')
-options=('!libtool' '!emptydirs')
-install=libwebkit.install
-source=(http://webkitgtk.org/webkit-$pkgver.tar.xz
-        webkit-gtk-1.7.90-parallel-make-hack.patch
-        python.patch)
-sha256sums=('9d9de6968c466b973988ce97e4f2f53535dd4f72356bd7b29b03ba9dab937545'
-            'e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73'
-            '29b82e47277d982bc57a7ba967d28ae76e07556986627c2e456694b699ae0e09')
-
-build() {
-  cd "$srcdir/webkit-$pkgver"
-  patch -Np1 -i $srcdir/webkit-gtk-1.7.90-parallel-make-hack.patch
-  patch -Np1 -i $srcdir/python.patch
-  autoreconf -I Source/autotools -fi
-  mkdir build-gtk{2,3}
-
-  ( cd build-gtk2 && _build --with-gtk=2.0 )
-  ( cd build-gtk3 && _build --with-gtk=3.0 )
-}
-
-_build() {
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --with-font-backend=freetype \
-    --with-unicode-backend=icu \
-    --enable-geolocation=no \
-    --enable-spellcheck "$@"
-#  make all stamp-po
-#  until parallel building is fixed
-  make all-built-sources-local
-  make all-ltlibraries-local
-  make all-programs-local
-  make all-data-local
-  make stamp-po
-}
-
-package_libwebkit() {
-  pkgdesc+=" (for GTK2)"
-  depends+=(gtk2)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk2"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
-}
-
-package_libwebkit3() {
-  pkgdesc+=" (for GTK3)"
-  depends+=(gtk3)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk3"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
-}
-
-
-

Copied: libwebkit/repos/gnome-unstable-x86_64/PKGBUILD (from rev 153904, libwebkit/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD	2012-03-20 12:10:42 UTC (rev 153905)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=libwebkit
+pkgname=(libwebkit libwebkit3)
+pkgver=1.7.92
+pkgrel=1
+pkgdesc="An opensource web content engine"
+arch=('i686' 'x86_64')
+url="http://webkitgtk.org/"
+license=('custom')
+depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl')
+makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
+options=('!libtool' '!emptydirs')
+source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
+sha256sums=('b5f7b9eef333609d457a0e6b335ff8d9e31c92459019b8aa80e1e24767601bb0')
+
+build() {
+  cd "$srcdir/webkit-$pkgver"
+  mkdir build-gtk{2,3}
+
+  ( cd build-gtk2 && _build --with-gtk=2.0 )
+  ( cd build-gtk3 && _build --with-gtk=3.0 )
+}
+
+_build() {
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+    --enable-introspection \
+    --with-font-backend=freetype \
+    --with-unicode-backend=icu \
+    --enable-geolocation=no \
+    --enable-spellcheck "$@"
+  make all stamp-po
+}
+
+package_libwebkit() {
+  pkgdesc+=" (for GTK2)"
+  depends+=(gtk2)
+
+  cd "$srcdir/webkit-$pkgver/build-gtk2"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
+}
+
+package_libwebkit3() {
+  pkgdesc+=" (for GTK3)"
+  depends+=(gtk3)
+
+  cd "$srcdir/webkit-$pkgver/build-gtk3"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
+}
+
+
+

Deleted: gnome-unstable-x86_64/libwebkit.install
===================================================================
--- gnome-unstable-x86_64/libwebkit.install	2012-03-20 12:07:17 UTC (rev 153904)
+++ gnome-unstable-x86_64/libwebkit.install	2012-03-20 12:10:42 UTC (rev 153905)
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Deleted: gnome-unstable-x86_64/python.patch
===================================================================
--- gnome-unstable-x86_64/python.patch	2012-03-20 12:07:17 UTC (rev 153904)
+++ gnome-unstable-x86_64/python.patch	2012-03-20 12:10:42 UTC (rev 153905)
@@ -1,12 +0,0 @@
-diff -Nur webkit-1.7.91.orig/Tools/GNUmakefile.am webkit-1.7.91/Tools/GNUmakefile.am
---- webkit-1.7.91.orig/Tools/GNUmakefile.am	2012-03-08 12:37:34.221447643 +0000
-+++ webkit-1.7.91/Tools/GNUmakefile.am	2012-03-08 12:53:28.713523074 +0000
-@@ -326,7 +326,7 @@
- 	  fi; \
- 	fi
- endif
--	$(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
-+	$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
- 
- uninstall-local:
- 	@DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \

Deleted: gnome-unstable-x86_64/webkit-gtk-1.7.90-parallel-make-hack.patch
===================================================================
--- gnome-unstable-x86_64/webkit-gtk-1.7.90-parallel-make-hack.patch	2012-03-20 12:07:17 UTC (rev 153904)
+++ gnome-unstable-x86_64/webkit-gtk-1.7.90-parallel-make-hack.patch	2012-03-20 12:10:42 UTC (rev 153905)
@@ -1,21 +0,0 @@
-Horrible failure of a hack to enable workaround for
-https://bugs.webkit.org/show_bug.cgi?id=79498
-
---- a/GNUmakefile.am
-+++ b/GNUmakefile.am
-@@ -285,6 +285,15 @@
- all-local: stamp-po
- 	$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
- 
-+# Horrible hack to enable workaround for parallel make failure
-+all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h
-+
-+all-ltlibraries-local: GNUmakefile $(LTLIBRARIES)
-+
-+all-programs-local: GNUmakefile $(PROGRAMS)
-+
-+all-data-local: GNUmakefile $(DATA)
-+
- # remove built sources and program directories
- clean-local:
- 	-rm -rf $(GENPROGRAMS)



More information about the arch-commits mailing list