[arch-commits] Commit in gedit-code-assistance/trunk (PKGBUILD fix-compile.diff)

[Jan Steffens]

    Date: Saturday, November 12, 2016 @ 17:54:02
  Author: heftig
Revision: 280604

3.16.0+4+gd19b879-1

Added:
  gedit-code-assistance/trunk/fix-compile.diff
Modified:
  gedit-code-assistance/trunk/PKGBUILD

------------------+
 PKGBUILD         |   30 +++++++++++++++++++++++-------
 fix-compile.diff |   13 +++++++++++++
 2 files changed, 36 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-12 17:41:30 UTC (rev 280603)
+++ PKGBUILD	2016-11-12 17:54:02 UTC (rev 280604)
@@ -3,25 +3,41 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gedit-code-assistance
-pkgver=3.16.0
+pkgver=3.16.0+4+gd19b879
 pkgrel=1
 pkgdesc="Code assistance for gedit"
+url="https://git.gnome.org/browse/gedit-code-assistance"
 arch=(i686 x86_64)
 license=(GPL3)
 depends=(gedit libgee gnome-code-assistance)
-makedepends=(intltool gobject-introspection)
+makedepends=(intltool gobject-introspection vala git)
 groups=(gnome-extra)
-url="http://www.gnome.org"
-source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('65e04381a2efd273ff2d0861db41245eadbb83bd9c369085bb083a5fbd5d0b23')
+_commit=d19b879e421ed43db779f6a26ac460f63c45b463  # master
+options=(!makeflags)  # indentbackend build breaks, needs gca.vapi
+source=("git://git.gnome.org/gedit-code-assistance#commit=$_commit"
+        fix-compile.diff)
+sha256sums=('SKIP'
+            '7ebfe45ae3abc547af248397bd6a5b5d5063b666cc52f2660977a709d1fa3ec6')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  patch -Np1 -i ../fix-compile.diff
+  NOCONFIGURE=1 ./autogen.sh
+}
+
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package(){
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 }

Added: fix-compile.diff
===================================================================
--- fix-compile.diff	                        (rev 0)
+++ fix-compile.diff	2016-11-12 17:54:02 UTC (rev 280604)
@@ -0,0 +1,13 @@
+diff --git i/indentbackends/c/gca-c-backend.vala w/indentbackends/c/gca-c-backend.vala
+index f44d431409bf9e40..61ea32cb7d4de026 100644
+--- i/indentbackends/c/gca-c-backend.vala
++++ w/indentbackends/c/gca-c-backend.vala
+@@ -193,7 +193,7 @@ class Backend : Object, Gca.IndentBackend
+ 
+ 		if (document.iter_has_context_class(iter, "comment"))
+ 		{
+-			if (!document.iter_backward_to_context_class_toggle(ref iter, "comment"))
++			if (!document.iter_backward_to_context_class_toggle(iter, "comment"))
+ 			{
+ 				return amount;
+ 			}