diff options
author | Mubashshir | 2021-11-19 20:55:53 +0600 |
---|---|---|
committer | Mubashshir | 2021-11-19 20:55:53 +0600 |
commit | 11fc6b11cda997faa1cfd5f88ea9b179e2c10d26 (patch) | |
tree | 975cfeefdb9b3acbc86f100af8b961b80959c60b | |
parent | 1b7db9a76e68574e677831f1dfa5f735a3ef169e (diff) | |
download | aur-11fc6b11cda997faa1cfd5f88ea9b179e2c10d26.tar.gz |
upgpkg: autovala 1.16.0-3
sign me
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 30 | ||||
-rw-r--r-- | gedit40.patch | 21 | ||||
-rw-r--r-- | local.patch | 16 | ||||
-rw-r--r-- | tepl.patch | 6 |
5 files changed, 41 insertions, 40 deletions
@@ -1,7 +1,7 @@ pkgbase = autovala pkgdesc = A program that automatically generates CMake and Meson configuration files for your Vala project pkgver = 1.16.0 - pkgrel = 2 + pkgrel = 3 url = https://gitlab.com/rastersoft/autovala arch = x86_64 groups = vala @@ -20,9 +20,11 @@ pkgbase = autovala source = git+https://gitlab.com/rastersoft/autovala#tag=1.16.0 source = gedit40.patch source = tepl.patch + source = local.patch sha256sums = SKIP - sha256sums = b69b316bca2799007a95714d2585b499e22ebcaebe348b4eafd9c2e637bac1d2 - sha256sums = 146773efe896ecc5db8fa644e4be8cd6708832aa3467c44570edb3973726e794 + sha256sums = c72f55685649d184da17ef47a3ecbcf9a77906e0ae7b831ca116bf06db4764b3 + sha256sums = 66eba692513fb12283fef312ef39c3acb3d7705f7129addd7023ad936b0e3f0b + sha256sums = 5b40b72a328c45ff66af92bbbdf2918cdcc9c8bdd9077ba169badfa743589b66 pkgname = autovala depends = make @@ -9,7 +9,7 @@ pkgname=( gedit-autovala ) pkgver=1.16.0 -pkgrel=2 +pkgrel=3 pkgdesc="A program that automatically generates CMake and Meson configuration files for your Vala project" arch=('x86_64') url="https://gitlab.com/rastersoft/autovala" @@ -19,30 +19,34 @@ 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) +source=("git+https://gitlab.com/rastersoft/autovala#tag=$pkgver" gedit40.patch tepl.patch local.patch) sha256sums=('SKIP' - 'b69b316bca2799007a95714d2585b499e22ebcaebe348b4eafd9c2e637bac1d2' - '146773efe896ecc5db8fa644e4be8cd6708832aa3467c44570edb3973726e794') + 'c72f55685649d184da17ef47a3ecbcf9a77906e0ae7b831ca116bf06db4764b3' + '66eba692513fb12283fef312ef39c3acb3d7705f7129addd7023ad936b0e3f0b' + '5b40b72a328c45ff66af92bbbdf2918cdcc9c8bdd9077ba169badfa743589b66') 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 + patch -d autovala -p1 < gedit40.patch + patch -d autovala -p1 < local.patch + + ! grep 'goto_line' /usr/share/vala/vapi/gedit.vapi && \ + patch -d autovala -p1 < tepl.patch + + rm -rf build build-gedit } build() { arch-meson autovala build - meson compile -C build + ninja -C build + for each in build/meson-uninstalled/*-uninstalled.pc;do cp "$each" ${each%-*}.pc done + arch-meson autovala/gedit_plugin \ build-gedit \ --pkg-config-path build/meson-uninstalled - echo $LDFLAGS - VALAFLAGS="$(echo "--"{vapidir,girdir}"=$PWD/build/src/"{autovalaLib,autovalaPlugin})" \ - meson compile -C build-gedit + ninja -C build-gedit } package_autovala() { @@ -57,7 +61,7 @@ package_gedit-autovala() { depends=(autovala gedit) DESTDIR="$pkgdir" meson install -C build-gedit mv "$pkgdir"/usr/lib/gedit/plugins/autovala/libautovalagedit.so{.1.0.0,} - + rm -rf \ "$pkgdir"/usr/lib/pkgconfig \ "$pkgdir"/usr/lib/gedit/plugins/autovala/libautovalagedit.so.* \ diff --git a/gedit40.patch b/gedit40.patch index 0b5d67db141b..c9a92807cfcc 100644 --- a/gedit40.patch +++ b/gedit40.patch @@ -11,27 +11,6 @@ index fec30b5..4027a4b 100644 AutoVala_dep = dependency('AutoVala') AutovalaPlugin_dep = dependency('AutovalaPlugin') atk_dep = dependency('atk') -diff --git a/gedit_plugin/src/autovalagedit.deps b/gedit_plugin/src/autovalagedit.deps -index 5208d0a..19e82de 100644 ---- a/gedit_plugin/src/autovalagedit.deps -+++ b/gedit_plugin/src/autovalagedit.deps -@@ -1,5 +1,5 @@ - gtk+-3.0 --gtksourceview-3.0 -+gtksourceview-4 - AutoVala - AutovalaPlugin - atk -diff --git a/gedit_plugin/src/autovalagedit.pc b/gedit_plugin/src/autovalagedit.pc -index 057eced..1f93ead 100644 ---- a/gedit_plugin/src/autovalagedit.pc -+++ b/gedit_plugin/src/autovalagedit.pc -@@ -7,4 +7,4 @@ Description: autovalagedit - Version: 1.0.0 - Libs: -L@DOLLAR@{libdir} -lautovalagedit - Cflags: -I@DOLLAR@{includedir} --Requires: gtksourceview-3.0 AutoVala AutovalaPlugin atk cairo gdk-3.0 gdk-pixbuf-2.0 gedit gee-0.8 gio-2.0 glib-2.0 gobject-2.0 gobject-introspection-1.0 libpeas-1.0 libxml-2.0 pango pangocairo vte-2.91 x11 -+Requires: gtksourceview-4 AutoVala AutovalaPlugin atk cairo gdk-3.0 gdk-pixbuf-2.0 gedit gee-0.8 gio-2.0 glib-2.0 gobject-2.0 gobject-introspection-1.0 libpeas-1.0 libxml-2.0 pango pangocairo vte-2.91 x11 diff --git a/gedit_plugin/src/meson.build b/gedit_plugin/src/meson.build index 3976c52..9878629 100644 --- a/gedit_plugin/src/meson.build diff --git a/local.patch b/local.patch new file mode 100644 index 000000000000..bb17023d55c8 --- /dev/null +++ b/local.patch @@ -0,0 +1,16 @@ +diff --git a/gedit_plugin/meson.build b/gedit_plugin/meson.build +index 4027a4b..4fb60dc 100644 +--- a/gedit_plugin/meson.build ++++ b/gedit_plugin/meson.build +@@ -4,6 +4,11 @@ ATHOME = (get_option('ATHOME') != '') + + add_global_arguments('-DGETTEXT_PACKAGE="autovala_gedit"',language: 'c') + ++add_project_arguments('--girdir=../build/src/autovalaLib', language: 'vala') ++add_project_arguments('--vapidir=../build/src/autovalaLib', language: 'vala') ++add_project_arguments('--girdir=../build/src/autovalaPlugin', language: 'vala') ++add_project_arguments('--vapidir=../build/src/autovalaPlugin', language: 'vala') ++ + find_program ('g-ir-compiler') + gtksourceview_4_dep = dependency('gtksourceview-4') + AutoVala_dep = dependency('AutoVala') diff --git a/tepl.patch b/tepl.patch index 8f6ed95719ac..34f6e626dcef 100644 --- a/tepl.patch +++ b/tepl.patch @@ -1,5 +1,5 @@ diff --git a/gedit_plugin/meson.build b/gedit_plugin/meson.build -index fec30b5..a178c88 100644 +index 883668d..596adbb 100644 --- a/gedit_plugin/meson.build +++ b/gedit_plugin/meson.build @@ -3,6 +3,7 @@ project('autovala_gedit',['c','vala']) @@ -8,8 +8,8 @@ index fec30b5..a178c88 100644 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') + add_project_arguments('--girdir=../build/src/autovalaLib', language: 'vala') + add_project_arguments('--vapidir=../build/src/autovalaLib', language: 'vala') 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 |