Date: Tuesday, December 27, 2022 @ 14:26:24
Author: heftig
Revision: 465032
archrelease: copy trunk to extra-x86_64
Added:
glade/repos/extra-x86_64/PKGBUILD
(from rev 465031, glade/trunk/PKGBUILD)
glade/repos/extra-x86_64/fix-build.diff
(from rev 465031, glade/trunk/fix-build.diff)
Deleted:
glade/repos/extra-x86_64/PKGBUILD
----------------+
PKGBUILD | 98 ++++++++++++++++++++++++++++++-------------------------
fix-build.diff | 26 ++++++++++++++
2 files changed, 80 insertions(+), 44 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-27 14:25:52 UTC (rev 465031)
+++ PKGBUILD 2022-12-27 14:26:24 UTC (rev 465032)
@@ -1,44 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Contributor: Douglas Soares de Andrade <[email protected]>
-
-pkgname=glade
-pkgver=3.40.0
-pkgrel=1
-pkgdesc="User Interface Builder for GTK+ applications"
-url="https://glade.gnome.org/";
-arch=(x86_64)
-license=(GPL LGPL)
-depends=(gtk3 libxml2)
-makedepends=(gtk-doc gobject-introspection python-gobject itstool docbook-xsl
- git webkit2gtk meson gjs)
-checkdepends=(xorg-server-xvfb)
-optdepends=('devhelp: development help')
-provides=(libgladeui-2.so)
-groups=(gnome-extra)
-options=(debug)
-_commit=b3823efd0acea2b0a5629b261cf56b1d3f2664aa # tags/GLADE_3_40_0^0
-source=("git+https://gitlab.gnome.org/GNOME/glade.git#commit=$_commit";)
-sha256sums=('SKIP')
-
-pkgver() {
- cd glade
- git describe --tags | sed 's/^GLADE_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd glade
-}
-
-build() {
- arch-meson glade build -D gtk_doc=true
- meson compile -C build
-}
-
-check() {
- dbus-run-session xvfb-run -s '-nolisten local' \
- meson test -C build --print-errorlogs
-}
-
-package() {
- meson install -C build --destdir "$pkgdir"
-}
Copied: glade/repos/extra-x86_64/PKGBUILD (from rev 465031,
glade/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-12-27 14:26:24 UTC (rev 465032)
@@ -0,0 +1,54 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Douglas Soares de Andrade <[email protected]>
+
+pkgname=glade
+pkgver=3.40.0+r14+g1fbca367
+pkgrel=1
+pkgdesc="User Interface Builder for GTK+ applications"
+url="https://glade.gnome.org/";
+arch=(x86_64)
+license=(GPL LGPL)
+depends=(gtk3 libxml2)
+makedepends=(gtk-doc gobject-introspection itstool docbook-xsl git meson gjs
+ python-gobject webkit2gtk)
+checkdepends=(xorg-server-xvfb)
+optdepends=('devhelp: development help'
+ 'gjs: gjs module'
+ 'python-gobject: python module'
+ 'webkit2gtk: webkit2gtk module')
+provides=(libgladeui-2.so)
+groups=(gnome-extra)
+options=(debug)
+_commit=1fbca367cf33991f1d8d20a256ca704eb778fca9 # master
+source=("git+https://gitlab.gnome.org/GNOME/glade.git#commit=$_commit";
+ fix-build.diff)
+sha256sums=('SKIP'
+ '0dd99583c4b7b6327e84a909614f46ec0062dbc9f67be733ea97dc294e40317b')
+
+pkgver() {
+ cd glade
+ git describe --tags | sed 's/^GLADE_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd glade
+
+ # Fix missing dependency on vcs_tag
+ git apply -3 ../fix-build.diff
+}
+
+build() {
+ arch-meson glade build -D gtk_doc=true
+ meson compile -C build
+}
+
+check() {
+ dbus-run-session xvfb-run -s '-nolisten local' \
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 sts=-1 et:
Copied: glade/repos/extra-x86_64/fix-build.diff (from rev 465031,
glade/trunk/fix-build.diff)
===================================================================
--- fix-build.diff (rev 0)
+++ fix-build.diff 2022-12-27 14:26:24 UTC (rev 465032)
@@ -0,0 +1,26 @@
+diff --git i/src/meson.build w/src/meson.build
+index 40c730a0..56f4e47d 100644
+--- i/src/meson.build
++++ w/src/meson.build
+@@ -1,18 +1,18 @@
+ fs = import('fs')
+
+ if fs.exists('../.git')
+- vcs_tag(input: 'version.h.in', output: 'version.h')
++ version_h = vcs_tag(input: 'version.h.in', output: 'version.h')[0]
+ else
+ config = configuration_data()
+ config.set ('VCS_TAG', glade_version)
+- configure_file(
++ version_h = configure_file(
+ input: 'version.h.in',
+ output: 'version.h',
+ configuration: config
+ )
+ endif
+
+-sources = files(
++sources = [version_h] + files(
+ 'glade-intro.c',
+ 'glade-preferences.c',
+ 'glade-settings.c',
