diff --git a/glade/.signature b/glade/.signature index a1f3b2981..9bde6d188 100644 --- a/glade/.signature +++ b/glade/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/SwdBkBtE/pW5D0aeKrKcDJk4xo9uWi+bADqHTzcu9myJPTu3rkjuw7J6uuqyKPEmDqUsCuEz/B4tiv1aVcAgU= -SHA256 (Pkgfile) = e8b5e4223283c6b15e9ce383e782426588732f91b8b0de0b4e39573d0c34cff9 +RWSagIOpLGJF36PW+hEqTOOs8lL3yPbT0bNPuWZDQvhaDWDloz/8a/nsE0hr2eVMf/AfZl/SZUirULxcpe9+q3FArG7npKqT7AA= +SHA256 (Pkgfile) = af495b8ca34c74da6981e66db5faa8b60e5042e0a24cba4431b91aa52d7d7002 SHA256 (.footprint) = 0e24791b66cc24de202a41bb044c1a6f32cd75c69964d49fe50da80349036f57 SHA256 (glade-3.38.2.tar.xz) = 98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7 +SHA256 (glade-3.38.2-meson-0.61.patch) = 5b0fbcb7187371d4ca30989e01fc762b473e76fccc2b70ed78c7c5d469eaf42c diff --git a/glade/Pkgfile b/glade/Pkgfile index 11d829aaa..2f8d9b7e2 100644 --- a/glade/Pkgfile +++ b/glade/Pkgfile @@ -2,19 +2,24 @@ # URL: https://glade.gnome.org/ # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: gtk3 itstool -# Optional: webkitgtk gtk-doc python3-gobject +# Optional: gtk-doc libxslt python3-gobject webkitgtk name=glade version=3.38.2 release=1 -source=(https://download.gnome.org/sources/$name/${version::4}/$name-$version.tar.xz) +source=(https://download.gnome.org/sources/$name/${version::4}/$name-$version.tar.xz + glade-3.38.2-meson-0.61.patch) build() { - prt-get isinst gtk-doc || PKGMK_GLADE+=' -D man=false' + patch -Np1 -d $name-$version -i $SRC/glade-3.38.2-meson-0.61.patch + + prt-get isinst gtk-doc || PKGMK_GLADE+=' -D gtk_doc=false' + prt-get isinst libxslt || PKGMK_GLADE+=' -D man=false' meson setup build $name-$version ${PKGMK_GLADE} \ --prefix=/usr \ - --buildtype=plain + --buildtype=plain \ + -D gladeui=true meson compile -C build -j ${JOBS-1} DESTDIR=$PKG meson install -C build diff --git a/glade/glade-3.38.2-meson-0.61.patch b/glade/glade-3.38.2-meson-0.61.patch new file mode 100644 index 000000000..72f9c0e50 --- /dev/null +++ b/glade/glade-3.38.2-meson-0.61.patch @@ -0,0 +1,57 @@ +From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 20 Jan 2022 14:18:09 -0500 +Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional + argument + +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 9f244566..bfbc514c 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,6 @@ desktop_conf = configuration_data() + desktop_conf.set('VERSION', glade_version) + + i18n.merge_file( +- 'desktop', + type: 'desktop', + input: configure_file( + input: 'org.gnome.Glade.desktop.in.in', +@@ -18,7 +17,6 @@ i18n.merge_file( + appdata = glade_name + '.appdata.xml' + + i18n.merge_file( +- 'appdata', + input: 'org.gnome.Glade.appdata.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +GitLab + + +From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 20 Jan 2022 14:19:03 -0500 +Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS + +--- + help/LINGUAS | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/help/LINGUAS b/help/LINGUAS +index fc3cd4c3..d67e42c8 100644 +--- a/help/LINGUAS ++++ b/help/LINGUAS +@@ -1,6 +1,5 @@ + # please keep this list sorted alphabetically + # +-da + bg + ca + cs +-- +GitLab +