[arch-commits] Commit in gitg/trunk (PKGBUILD webkit2gtk-4.0.patch)

[Jan Steffens]

    Date: Wednesday, October 8, 2014 @ 20:13:12
  Author: heftig
Revision: 224109

Use webkit2gtk

Added:
  gitg/trunk/webkit2gtk-4.0.patch
Modified:
  gitg/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   22 +++++++++++++++++-----
 webkit2gtk-4.0.patch |   12 ++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-08 17:04:50 UTC (rev 224108)
+++ PKGBUILD	2014-10-08 18:13:12 UTC (rev 224109)
@@ -3,21 +3,33 @@
 
 pkgname=gitg
 pkgver=3.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A GIT repository viewer based on GTK+'
 arch=('i686' 'x86_64')
 url='https://git.gnome.org/browse/gitg/'
 license=('GPL')
-depends=('gtksourceview3' 'git' 'desktop-file-utils' 'libgit2-glib' 'libgee' 'webkitgtk' 'libpeas' 'gtkspell3')
-makedepends=('intltool' 'vala' 'gobject-introspection' 'python2')
+depends=('gtksourceview3' 'git' 'desktop-file-utils' 'libgit2-glib' 'libgee' 'webkit2gtk' 'libpeas' 'gtkspell3')
+makedepends=('intltool' 'vala' 'gobject-introspection' 'python2' 'gnome-common')
 groups=('gnome-extra')
 install=gitg.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b')
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz
+        webkit2gtk-4.0.patch)
+sha256sums=('8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b'
+            '3488adb8ea4ab40c1a8faa09d7c79e1933aa7667e3e6df2d644de750dc47d0d8')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../webkit2gtk-4.0.patch
+  AUTOPOINT='intltoolize --automake --copy' autoreconf -fi
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
+
+  # Don't overlink
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
   make WARN_CFLAGS="-Wall"
 }
 

Added: webkit2gtk-4.0.patch
===================================================================
--- webkit2gtk-4.0.patch	                        (rev 0)
+++ webkit2gtk-4.0.patch	2014-10-08 18:13:12 UTC (rev 224109)
@@ -0,0 +1,12 @@
+diff -u gitg-3.14.0/Gitg-1.0.gir gitg-3.14.0-webkit/Gitg-1.0.gir
+--- gitg-3.14.0/Gitg-1.0.gir	2014-08-20 11:26:30.000000000 +0200
++++ gitg-3.14.0-webkit/Gitg-1.0.gir	2014-10-08 19:49:50.285616042 +0200
+@@ -10,7 +10,7 @@
+ <include name="cairo" version="1.0"/>
+ <include name="Gdk" version="3.0"/>
+ <include name="GdkPixbuf" version="2.0"/>
+-<include name="WebKit2" version="3.0"/>
++<include name="WebKit2" version="4.0"/>
+ <include name="Soup" version="2.4"/>
+ <package name="libgitg/libgitg-1.0"/>
+ <c:include name="libgitg/libgitg.h"/>