diff options
author | Mubashshir | 2021-11-19 12:35:36 +0600 |
---|---|---|
committer | Mubashshir | 2021-11-19 12:38:31 +0600 |
commit | 9305b95b3536794173c303f0c22ffef8073c2f73 (patch) | |
tree | 1395ff5b2625cce530a1ac6d6a3fdbf73e614f4f | |
parent | 8a993b9f06cf2af965baa96bf6533e11a94e79e8 (diff) | |
download | aur-9305b95b3536794173c303f0c22ffef8073c2f73.tar.gz |
upgpkg: autovala 1.16.0-1
upstream release
Signed-off-by: Mubashshir <ahmubashshir@gmail.com>
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | PKGBUILD | 66 | ||||
-rw-r--r-- | autovala.install | 17 | ||||
-rw-r--r-- | gedit40.patch | 95 |
5 files changed, 160 insertions, 44 deletions
@@ -1,9 +1,8 @@ pkgbase = autovala pkgdesc = A program that automatically generates CMake and Meson configuration files for your Vala project - pkgver = 1.15.1 + pkgver = 1.16.0 pkgrel = 1 url = https://gitlab.com/rastersoft/autovala - install = autovala.install arch = x86_64 groups = vala license = GPL3 @@ -14,12 +13,19 @@ pkgbase = autovala makedepends = pandoc makedepends = bash-completion makedepends = gobject-introspection - depends = make - depends = vte3 - depends = libgee - depends = bash-completion - source = autovala-1.15.1.tar.gz::https://gitlab.com/rastersoft/autovala/-/archive/1.15.1/autovala-1.15.1.tar.gz - sha256sums = af77e46d7ac50eb34e63ab5477a1f94f696f05fae41b21282961819820051f4b + source = git+https://gitlab.com/rastersoft/autovala#tag=1.16.0 + source = gedit40.patch + sha256sums = SKIP + sha256sums = SKIP pkgname = autovala + depends = make + depends = bash-completion +pkgname = gedit-autovala + depends = autovala + depends = gedit + depends = vte3 + depends = libgee + depends = gtksourceview4 + depends = libpeas diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..a97ee41c70f2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +* +!.SRCINFO +!PKGBUILD +!gedit40.patch @@ -1,18 +1,20 @@ # Maintainer: Dimitris Kiziridis <ragouel at outlook dot com> # Contributor: Mario Steele <mario@ruby-im.net> +# from: gitlab +# what: rastersoft/autovala -pkgname=autovala -pkgver=1.15.1 +pkgbase=autovala +pkgname=( + autovala + gedit-autovala +) +pkgver=1.16.0 pkgrel=1 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') -depends=('make' - 'vte3' - 'libgee' - 'bash-completion') makedepends=('vala' 'cmake' 'libgee' @@ -20,20 +22,46 @@ makedepends=('vala' 'pandoc' 'bash-completion' 'gobject-introspection') -install=autovala.install -source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/rastersoft/autovala/-/archive/${pkgver}/autovala-${pkgver}.tar.gz") -sha256sums=('af77e46d7ac50eb34e63ab5477a1f94f696f05fae41b21282961819820051f4b') +source=("git+https://gitlab.com/rastersoft/autovala#tag=$pkgver" gedit40.patch) +sha256sums=('SKIP' + 'SKIP') +prepare() { + patch -d autovala -p1 < gedit40.patch +} build() { - cd "${pkgname}-${pkgver}" - rm -rf build - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_INSTALL_LIBDIR="/usr/lib" .. - make + arch-meson autovala build --reconfigure + meson compile -C build + for each in build/meson-uninstalled/*-uninstalled.pc;do + mv "$each" ${each%-*}.pc + done + arch-meson autovala/gedit_plugin \ + build-gedit --reconfigure \ + --pkg-config-path build/meson-uninstalled + echo $LDFLAGS + VALAFLAGS="$(echo "--"{vapidir,girdir}"=$PWD/build/src/"{autovalaLib,autovalaPlugin})" \ + meson compile -C build-gedit +} + +package_autovala() { + depends=('make' + 'bash-completion') + DESTDIR="$pkgdir" meson install -C build + mv "$pkgdir/usr"{,/share}/appdata + rm -rf "$pkgdir"/usr/share/doc/autovala/CMakeLists.txt } -package() { - cd "${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install -}
\ No newline at end of file +package_gedit-autovala() { + depends=(autovala gedit vte3 + libgee gtksourceview4 libpeas) + 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.* \ + "$pkgdir"/usr/lib/gedit/plugins/autovala/autovalagedit{.h,.vapi,-1.0.gir,-1.0.typelib} \ + "$pkgdir"/usr/share/autovala_gedit \ + "$pkgdir"/usr/share/doc \ + "$pkgdir"/usr/share/vala +} diff --git a/autovala.install b/autovala.install deleted file mode 100644 index dfed8d98f957..000000000000 --- a/autovala.install +++ /dev/null @@ -1,17 +0,0 @@ -# Maintainer: Dimitris Kiziridis <ragouel at outlook dot com> -# Contributor: Mario Steele <mario@ruby-im.net> - -post_install() { - echo "Updating dynamic linker bindings." - sudo ldconfig -} - -post_upgrade() { - echo "Updating dynamic linker bindings." - sudo ldconfig -} - -post_remove() { - echo "Updating dynamic linker bindings." - sudo ldconfig -}
\ No newline at end of file diff --git a/gedit40.patch b/gedit40.patch new file mode 100644 index 000000000000..0b5d67db141b --- /dev/null +++ b/gedit40.patch @@ -0,0 +1,95 @@ +diff --git a/gedit_plugin/meson.build b/gedit_plugin/meson.build +index fec30b5..4027a4b 100644 +--- a/gedit_plugin/meson.build ++++ b/gedit_plugin/meson.build +@@ -5,7 +5,7 @@ ATHOME = (get_option('ATHOME') != '') + add_global_arguments('-DGETTEXT_PACKAGE="autovala_gedit"',language: 'c') + + find_program ('g-ir-compiler') +-gtksourceview_3_0_dep = dependency('gtksourceview-3.0') ++gtksourceview_4_dep = dependency('gtksourceview-4') + 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 ++++ b/gedit_plugin/src/meson.build +@@ -12,7 +12,7 @@ cfgfile_1 = configure_file( + output: 'Config.vala', + configuration: cfg_gedit_plugin) + +-gedit_plugin_deps = [gtksourceview_3_0_dep] ++gedit_plugin_deps = [gtksourceview_4_dep] + gedit_plugin_deps += [AutoVala_dep] + gedit_plugin_deps += [AutovalaPlugin_dep] + gedit_plugin_deps += [atk_dep] +diff --git a/src/autovalaLib/configuration.vala b/src/autovalaLib/configuration.vala +index f577241..aec5495 100644 +--- a/src/autovalaLib/configuration.vala ++++ b/src/autovalaLib/configuration.vala +@@ -398,7 +398,7 @@ namespace AutoVala { + } + + private bool check_version(string version) { +- return Regex.match_simple("^[0-9]+.[0-9]+(.[0-9]+)?$", version); ++ return GLib.Regex.match_simple("^[0-9]+.[0-9]+(.[0-9]+)?$", version); + } + + /** +diff --git a/src/autovalaLib/elementValaBinary.vala b/src/autovalaLib/elementValaBinary.vala +index 97250fe..8d85d11 100644 +--- a/src/autovalaLib/elementValaBinary.vala ++++ b/src/autovalaLib/elementValaBinary.vala +@@ -314,7 +314,7 @@ namespace AutoVala { + this.regexClasses = new GLib.Regex("^[ \t]*(public )?(private )?[ \t]*class[ ]+"); + this.regexDefines = new GLib.Regex("^VALA_[0-9]+_[0-9]+$"); + } catch (GLib.Error e) { +- ElementBase.globalData.addError(_("Can't generate the Regexps")); ++ ElementBase.globalData.addError(_("Can't generate the GLib.Regexps")); + } + } + +@@ -822,7 +822,7 @@ namespace AutoVala { + } + + private bool checkVersion(string version) { +- return Regex.match_simple("^[0-9]+.[0-9]+(.[0-9]+)?$", version); ++ return GLib.Regex.match_simple("^[0-9]+.[0-9]+(.[0-9]+)?$", version); + } + + private bool setVersion(string version, bool automatic, int lineNumber) { +diff --git a/src/autovalaLib/genVapis.vala b/src/autovalaLib/genVapis.vala +index 7f941ea..56b161c 100644 +--- a/src/autovalaLib/genVapis.vala ++++ b/src/autovalaLib/genVapis.vala +@@ -185,7 +185,7 @@ namespace AutoVala { + element.filenames.add(file); + newfile = file; + // if the filename has a version number, remove it +- if (Regex.match_simple("-[0-9]+(.[0-9]+)?$", file)) { ++ if (GLib.Regex.match_simple("-[0-9]+(.[0-9]+)?$", file)) { + var pos = file.last_index_of("-"); + newfile = file.substring(0, pos); + // if there is no version number inside, use the one in the filename |