From 4b17276a9762ea8d5d230cdc5161b4eb37b086bc Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Mon, 24 Oct 2022 07:07:00 +0900 Subject: [PATCH] glade: Bump to 3.40.0 and build introspection data. --- x11-packages/glade/build.sh | 25 +- x11-packages/glade/data-meson.build.patch | 18 - x11-packages/glade/duplicate-da-entry.patch | 22 - x11-packages/glade/gir/3.40.0/Gladeui-2.0.xml | 511 ++++++++++++++++++ 4 files changed, 529 insertions(+), 47 deletions(-) delete mode 100644 x11-packages/glade/data-meson.build.patch delete mode 100644 x11-packages/glade/duplicate-da-entry.patch create mode 100644 x11-packages/glade/gir/3.40.0/Gladeui-2.0.xml diff --git a/x11-packages/glade/build.sh b/x11-packages/glade/build.sh index a76bbfd64b..33dde55edc 100644 --- a/x11-packages/glade/build.sh +++ b/x11-packages/glade/build.sh @@ -1,10 +1,21 @@ TERMUX_PKG_HOMEPAGE=https://glade.gnome.org/ TERMUX_PKG_DESCRIPTION="User interface designer for Gtk+ and GNOME" -TERMUX_PKG_LICENSE="LGPL-3.0" +TERMUX_PKG_LICENSE="LGPL-2.0, GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.38.2 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL=https://github.com/GNOME/glade/archive/refs/tags/GLADE_${TERMUX_PKG_VERSION//./_}.tar.gz -TERMUX_PKG_SHA256=8abd1e7e6f943156602c6591e763ff40cffc68ea144c523d9702276f54b91b1b -TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libcairo, libxml2, pango, xsltproc, libglade" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-Dintrospection=false" +_MAJOR_VERSION=3.40 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0 +TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/glade/${_MAJOR_VERSION}/glade-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=31c9adaea849972ab9517b564e19ac19977ca97758b109edc3167008f53e3d9c +TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libcairo, libxml2, pango" +TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, xsltproc" +TERMUX_PKG_DISABLE_GIR=false +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-Dgjs=disabled +-Dpython=disabled +-Dwebkit2gtk=disabled +-Dintrospection=true +" + +termux_step_pre_configure() { + termux_setup_gir +} diff --git a/x11-packages/glade/data-meson.build.patch b/x11-packages/glade/data-meson.build.patch deleted file mode 100644 index f640e3f04c..0000000000 --- a/x11-packages/glade/data-meson.build.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ./data/meson.build.orig 2022-08-31 08:30:04.875909208 +0200 -+++ ./data/meson.build 2022-08-31 08:30:10.886196504 +0200 -@@ -2,7 +2,6 @@ - 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 @@ - appdata = glade_name + '.appdata.xml' - - i18n.merge_file( -- 'appdata', - input: 'org.gnome.Glade.appdata.xml.in', - output: '@BASENAME@', - po_dir: po_dir, diff --git a/x11-packages/glade/duplicate-da-entry.patch b/x11-packages/glade/duplicate-da-entry.patch deleted file mode 100644 index 1804da6101..0000000000 --- a/x11-packages/glade/duplicate-da-entry.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Thu, 20 Jan 2022 14:19:03 -0500 -Subject: [PATCH] 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 diff --git a/x11-packages/glade/gir/3.40.0/Gladeui-2.0.xml b/x11-packages/glade/gir/3.40.0/Gladeui-2.0.xml new file mode 100644 index 0000000000..9de0ee1255 --- /dev/null +++ b/x11-packages/glade/gir/3.40.0/Gladeui-2.0.xml @@ -0,0 +1,511 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +