upgpkg: autovala 1.16.0-2

sign me

3 files changed, 53 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b56ff17c0c8..e2cf62da3270 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,35 @@
 pkgbase = autovala
 	pkgdesc = A program that automatically generates CMake and Meson configuration files for your Vala project
 	pkgver = 1.16.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.com/rastersoft/autovala
 	arch = x86_64
 	groups = vala
 	license = GPL3
+	makedepends = git
+	makedepends = meson
 	makedepends = vala
-	makedepends = cmake
 	makedepends = libgee
+	makedepends = gedit
 	makedepends = gtk3
+	makedepends = vte3
+	makedepends = gtksourceview4
+	makedepends = libpeas
 	makedepends = pandoc
-	makedepends = bash-completion
 	makedepends = gobject-introspection
 	source = git+https://gitlab.com/rastersoft/autovala#tag=1.16.0
 	source = gedit40.patch
+	source = tepl.patch
 	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = b69b316bca2799007a95714d2585b499e22ebcaebe348b4eafd9c2e637bac1d2
+	sha256sums = 146773efe896ecc5db8fa644e4be8cd6708832aa3467c44570edb3973726e794
 
 pkgname = autovala
 	depends = make
+	depends = vte3
+	depends = libgee
 	depends = bash-completion
 
 pkgname = gedit-autovala
 	depends = autovala
 	depends = gedit
-	depends = vte3
-	depends = libgee
-	depends = gtksourceview4
-	depends = libpeas
diff --git a/PKGBUILD b/PKGBUILD
index 4898e2b08889..df7e3ef063e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,25 +9,25 @@ pkgname=(
 	gedit-autovala
 )
 pkgver=1.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A program that automatically generates CMake and Meson configuration files for your Vala project"
 arch=('x86_64')
 url="https://gitlab.com/rastersoft/autovala"
 license=('GPL3')
 groups=('vala')
-makedepends=('vala'
-             'cmake'
-             'libgee'
-             'gtk3'
-             'pandoc'
-             'bash-completion'
-             'gobject-introspection')
-source=("git+https://gitlab.com/rastersoft/autovala#tag=$pkgver" gedit40.patch)
+makedepends=('git' 'meson' 'vala'
+             'libgee' 'gedit' 'gtk3'
+             'vte3' 'gtksourceview4' 'libpeas'
+             'pandoc' 'gobject-introspection')
+source=("git+https://gitlab.com/rastersoft/autovala#tag=$pkgver" gedit40.patch tepl.patch)
 sha256sums=('SKIP'
-            'SKIP')
+            'b69b316bca2799007a95714d2585b499e22ebcaebe348b4eafd9c2e637bac1d2'
+            '146773efe896ecc5db8fa644e4be8cd6708832aa3467c44570edb3973726e794')
 
 prepare() {
 	patch -d autovala -p1 < gedit40.patch
+	! grep 'goto_line' /usr/share/vala/vapi/gedit.vapi \
+	&& patch -d autovala -p1 < tepl.patch
 	rm -rf build build-gedit
 }
 
@@ -46,7 +46,7 @@ build() {
 }
 
 package_autovala() {
-  depends=('make'
+  depends=('make' 'vte3' 'libgee'
            'bash-completion')
   DESTDIR="$pkgdir" meson install -C build
   mv "$pkgdir/usr"{,/share}/appdata
@@ -54,8 +54,7 @@ package_autovala() {
 }
 
 package_gedit-autovala() {
-  depends=(autovala gedit vte3
-           libgee gtksourceview4 libpeas)
+  depends=(autovala gedit)
   DESTDIR="$pkgdir" meson install -C build-gedit
   mv "$pkgdir"/usr/lib/gedit/plugins/autovala/libautovalagedit.so{.1.0.0,}
   
diff --git a/tepl.patch b/tepl.patch
new file mode 100644
index 000000000000..8f6ed95719ac
--- /dev/null
+++ b/tepl.patch
@@ -0,0 +1,29 @@
+diff --git a/gedit_plugin/meson.build b/gedit_plugin/meson.build
+index fec30b5..a178c88 100644
+--- a/gedit_plugin/meson.build
++++ b/gedit_plugin/meson.build
+@@ -3,6 +3,7 @@ project('autovala_gedit',['c','vala'])
+ ATHOME = (get_option('ATHOME') != '')
+ 
+ add_global_arguments('-DGETTEXT_PACKAGE="autovala_gedit"',language: 'c')
++add_project_arguments('--pkg=Tepl-6', language: 'vala')
+ 
+ find_program ('g-ir-compiler')
+ gtksourceview_3_0_dep = dependency('gtksourceview-3.0')
+diff --git a/gedit_plugin/src/gedit_plugin.vala b/gedit_plugin/src/gedit_plugin.vala
+index 641345e..c0edb99 100644
+--- a/gedit_plugin/src/gedit_plugin.vala
++++ b/gedit_plugin/src/gedit_plugin.vala
+@@ -148,10 +148,9 @@ namespace autovalagedit {
+ 				this.window.set_active_tab(tab);
+ 			}
+ 			if (tab != null) {
+-				var document = tab.get_document();
+-				document.goto_line(line);
+ 				var view = tab.get_view();
+-				view.scroll_to_cursor();
++				(view as Tepl.View)?.goto_line(line);
++				(view as Tepl.View)?.scroll_to_cursor();
+ 			}
+ 		}
+