From a0c43cd9e64c929dd78ef65352693e3e404a8e77 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 13 May 2021 11:52:57 +0200 Subject: extra/gcr: no vala on i486 --- extra/gcr/PKGBUILD | 15 +++++ extra/gcr/gcr-no-vala.arch32.patch | 113 +++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 extra/gcr/PKGBUILD create mode 100644 extra/gcr/gcr-no-vala.arch32.patch diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD new file mode 100644 index 00000000..f2897717 --- /dev/null +++ b/extra/gcr/PKGBUILD @@ -0,0 +1,15 @@ +# no Vala on i486 +if [ "$CARCH" = 'i486' ]; then + makedepends=(${makedepends[@]//vala/}) + source_i486+=('gcr-no-vala.arch32.patch') + sha256sums_i486+=('eb95b35b36595c7dfe3ccc22d135751c49c96d4878b03bef6884e13b8f3ea1cb') + if [ "${CARCH}" == "i486" ]; then + eval "$( + declare -f prepare | \ + sed ' + /cd.*/a for _p in \"$srcdir\"\/*.arch32.patch; do patch -p1 -i \"$_p\"; done + ' + )" + fi + +fi diff --git a/extra/gcr/gcr-no-vala.arch32.patch b/extra/gcr/gcr-no-vala.arch32.patch new file mode 100644 index 00000000..1d8802c2 --- /dev/null +++ b/extra/gcr/gcr-no-vala.arch32.patch @@ -0,0 +1,113 @@ +diff -rauN gcr/gck/meson.build gcr-no-vala-patch/gck/meson.build +--- gcr/gck/meson.build 2021-05-13 11:42:03.269748891 +0200 ++++ gcr-no-vala-patch/gck/meson.build 2021-05-13 11:37:10.000000000 +0200 +@@ -142,16 +142,16 @@ + install: true, + ) + +- gck_vapi = gnome.generate_vapi('gck-@0@'.format(gck_major_version), +- sources: gck_gir[0], +- metadata_dirs: meson.current_source_dir(), +- packages: [ 'glib-2.0', 'gio-2.0' ], +- install: true, +- ) ++# gck_vapi = gnome.generate_vapi('gck-@0@'.format(gck_major_version), ++# sources: gck_gir[0], ++# metadata_dirs: meson.current_source_dir(), ++# packages: [ 'glib-2.0', 'gio-2.0' ], ++# install: true, ++# ) + +- install_data('pkcs11.vapi', +- install_dir: get_option('datadir') / 'vala' / 'vapi', +- ) ++# install_data('pkcs11.vapi', ++# install_dir: get_option('datadir') / 'vala' / 'vapi', ++# ) + endif + + # pkg-config file +diff -rauN gcr/gcr/meson.build gcr-no-vala-patch/gcr/meson.build +--- gcr/gcr/meson.build 2021-05-13 11:42:03.336415608 +0200 ++++ gcr-no-vala-patch/gcr/meson.build 2021-05-13 11:37:47.000000000 +0200 +@@ -204,18 +204,18 @@ + install: true, + ) + +- gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version), +- sources: gcr_gir[0], +- packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ], +- metadata_dirs: meson.current_source_dir(), +- vapi_dirs: [ +- build_root / 'gck', +- ], +- gir_dirs: [ +- build_root / 'gck', +- ], +- install: true, +- ) ++# gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version), ++# sources: gcr_gir[0], ++# packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ], ++# metadata_dirs: meson.current_source_dir(), ++# vapi_dirs: [ ++# build_root / 'gck', ++# ], ++# gir_dirs: [ ++# build_root / 'gck', ++# ], ++# install: true, ++# ) + endif + + # pkg-config file +diff -rauN gcr/ui/meson.build gcr-no-vala-patch/ui/meson.build +--- gcr/ui/meson.build 2021-05-13 11:42:03.309748920 +0200 ++++ gcr-no-vala-patch/ui/meson.build 2021-05-13 11:38:21.000000000 +0200 +@@ -168,26 +168,26 @@ + install: true, + ) + +- gcr_ui_vapi = gnome.generate_vapi('gcr-ui-@0@'.format(gcr_major_version), +- sources: gcr_ui_gir[0], +- packages: [ +- 'glib-2.0', +- 'gio-2.0', +- gck_vapi, +- gcr_vapi, +- 'gtk+-3.0' +- ], +- metadata_dirs: meson.current_source_dir(), +- vapi_dirs: [ +- build_root / 'gck', +- build_root / 'gcr', +- ], +- gir_dirs: [ +- build_root / 'gck', +- build_root / 'gcr', +- ], +- install: true, +- ) ++# gcr_ui_vapi = gnome.generate_vapi('gcr-ui-@0@'.format(gcr_major_version), ++# sources: gcr_ui_gir[0], ++# packages: [ ++# 'glib-2.0', ++# 'gio-2.0', ++# gck_vapi, ++# gcr_vapi, ++# 'gtk+-3.0' ++# ], ++# metadata_dirs: meson.current_source_dir(), ++# vapi_dirs: [ ++# build_root / 'gck', ++# build_root / 'gcr', ++# ], ++# gir_dirs: [ ++# build_root / 'gck', ++# build_root / 'gcr', ++# ], ++# install: true, ++# ) + endif + + # gcr-viewer -- cgit v1.2.3-70-g09d2