[arch-commits] Commit in anjuta/trunk (3 files)

[Jan de Groot]

    Date: Wednesday, September 10, 2014 @ 12:14:52
  Author: jgc
Revision: 221374

upgpkg: anjuta 3.13.90-1

Added:
  anjuta/trunk/devhelp-webkit2gtk.patch
Modified:
  anjuta/trunk/PKGBUILD
  anjuta/trunk/anjuta.install

--------------------------+
 PKGBUILD                 |   20 +++++++++++++-------
 anjuta.install           |    1 -
 devhelp-webkit2gtk.patch |   27 +++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-10 09:52:17 UTC (rev 221373)
+++ PKGBUILD	2014-09-10 10:14:52 UTC (rev 221374)
@@ -4,19 +4,25 @@
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.12.0
+pkgver=3.13.90
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=(i686 x86_64)
 license=(GPL)
-makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon gnome-icon-theme vala dconf
-             gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs
-             python2)
+makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon vala dconf gtk-doc 
+             yelp-tools gnome-common intltool gobject-introspection itstool gjs python2)
 url="http://www.anjuta.org/"
 options=('!emptydirs')
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('880efe7274d015a07aec2c5bdfebe27e313f76f1f524bd9309b5e3ecd29bda1f')
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz 
+        devhelp-webkit2gtk.patch)
+sha256sums=('f32e7fd4fce96047314c5fd149f5dc4b34455570f64f8b0aa606906834dd58b4'
+            'e32c3b6e7ee2693bc9d6193eee9437402e4ab211b84b6ce5ddd18c019f41bf26')
 
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../devhelp-webkit2gtk.patch
+}
+
 build() {
   cd "$pkgbase-$pkgver"
 
@@ -39,7 +45,7 @@
 
 package_anjuta(){
   pkgdesc="GNOME Integrated Development Environment (IDE)"
-  depends=(libanjuta vte3 autogen devhelp glade libgda subversion neon gnome-icon-theme vala dconf)
+  depends=(libanjuta vte3 autogen devhelp glade libgda subversion neon vala dconf)
   groups=('gnome-extra')
 
   install=anjuta.install

Modified: anjuta.install
===================================================================
--- anjuta.install	2014-09-10 09:52:17 UTC (rev 221373)
+++ anjuta.install	2014-09-10 10:14:52 UTC (rev 221374)
@@ -2,7 +2,6 @@
   glib-compile-schemas /usr/share/glib-2.0/schemas
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
   update-mime-database /usr/share/mime > /dev/null
 }
 

Added: devhelp-webkit2gtk.patch
===================================================================
--- devhelp-webkit2gtk.patch	                        (rev 0)
+++ devhelp-webkit2gtk.patch	2014-09-10 10:14:52 UTC (rev 221374)
@@ -0,0 +1,27 @@
+From 052856923116439092565cc2953f61003c0eedc5 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Fri, 22 Aug 2014 23:10:59 +0200
+Subject: devhelp plugin: Support webkit2gtk-4.0
+
+API changes between webkit2gtk-3.0 and webkit2gtk-4.0 were minor and we
+can support both, depending on which one devhelp is built with.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=735251
+
+diff --git a/configure.ac b/configure.ac
+index 619f126..ec0a0fa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -237,6 +237,9 @@ if test "x$devhelp_enabled" = "xyes"; then
+ 		*webkit2gtk-3.0*)
+ 			AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
+ 			;;
++		*webkit2gtk-4.0*)
++			AC_DEFINE([HAVE_WEBKIT2], [1], [Defined if devhelp is built against webkitgtk2])
++			;;
+ 		esac
+ fi
+ AM_CONDITIONAL(HAVE_PLUGIN_DEVHELP, [test x$devhelp_enabled = xyes])
+-- 
+cgit v0.10.1
+