kiss-stj

commit 45fc33e44ee44c9143411f1177b063e0151d5cd2
parent a73b92a42b2e91e0c636561f0765361684f44cfa
Author: St John Karp <contact@stjo.hn>
Date:   Tue, 12 Jul 2022 10:27:20 -0400

fwupd: Remove vala and gettexty-tiny as dependencies

Disabled vapi in various subprojects. Patched out the i18n
stuff to deprecate the need for gettext.

Diffstat:
M
extra/fwupd/build
 | 
10
+++++++++-
M
extra/fwupd/checksums
 | 
1
+
M
extra/fwupd/depends
 | 
2
--
A
extra/fwupd/patches/no-i18n.patch
 | 
60
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
extra/fwupd/sources
 | 
1
+

5 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/extra/fwupd/build b/extra/fwupd/build
@@ -1,8 +1,13 @@
 #!/usr/bin/env sh
 
+for file in patches/* ; do
+	patch -p1 < "$file"
+done
+
 meson build \
 	--prefix=/usr \
 	-Ddocs=none \
+	-Dintrospection=false \
 	-Defi_binary=false \
 	-Dpolkit=false \
 	-Dsystemd=false \
@@ -10,7 +15,10 @@ meson build \
 	-Dudevdir=/etc/udev \
 	-Dplugin_dell=false \
 	-Dplugin_flashrom=true \
-	-Dplugin_tpm=false
+	-Dplugin_tpm=false \
+	-Dgusb:docs=false \
+	-Dgusb:vapi=false \
+	-Dlibjcat:vapi=false
 
 ninja -C build
 ninja -C build install
diff --git a/extra/fwupd/checksums b/extra/fwupd/checksums
@@ -1 +1,2 @@
 ce7f9b500a7f3fe6b23eedf63471e327c471ab9b51748df4efafc8e3b9de0b24
+c276af9e447ae64f6be5285638519b4c63a00b997a052c68bfa0b005b9939ba1
diff --git a/extra/fwupd/depends b/extra/fwupd/depends
@@ -1,6 +1,5 @@
 efibootmgr
 gcab
-gettext-tiny
 glib
 gnu-efi
 gnutls
@@ -16,5 +15,4 @@ pango
 pciutils
 protobuf-c
 pygobject
-vala
 xz
diff --git a/extra/fwupd/patches/no-i18n.patch b/extra/fwupd/patches/no-i18n.patch
@@ -0,0 +1,60 @@
+diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
+index 1d1698a..c598711 100644
+--- a/data/remotes.d/meson.build
++++ b/data/remotes.d/meson.build
+@@ -17,24 +17,24 @@ if build_standalone and get_option('lvfs') != 'false'
+     install: true,
+     install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+   )
+-  i18n.merge_file(
+-    input: 'lvfs.metainfo.xml',
+-    output: 'org.freedesktop.fwupd.remotes.lvfs.metainfo.xml',
+-    type: 'xml',
+-    po_dir: join_paths(meson.project_source_root(), 'po'),
+-    data_dirs: join_paths(meson.project_source_root(), 'po'),
+-    install: true,
+-    install_dir: join_paths(get_option('datadir'), 'fwupd', 'metainfo')
+-  )
+-  i18n.merge_file(
+-    input: 'lvfs-testing.metainfo.xml',
+-    output: 'org.freedesktop.fwupd.remotes.lvfs-testing.metainfo.xml',
+-    type: 'xml',
+-    po_dir: join_paths(meson.project_source_root(), 'po'),
+-    data_dirs: join_paths(meson.project_source_root(), 'po'),
+-    install: true,
+-    install_dir: join_paths(get_option('datadir'), 'fwupd', 'metainfo')
+-  )
++#  i18n.merge_file(
++#    input: 'lvfs.metainfo.xml',
++#    output: 'org.freedesktop.fwupd.remotes.lvfs.metainfo.xml',
++#    type: 'xml',
++#    po_dir: join_paths(meson.project_source_root(), 'po'),
++#    data_dirs: join_paths(meson.project_source_root(), 'po'),
++#    install: true,
++#    install_dir: join_paths(get_option('datadir'), 'fwupd', 'metainfo')
++#  )
++#  i18n.merge_file(
++#    input: 'lvfs-testing.metainfo.xml',
++#    output: 'org.freedesktop.fwupd.remotes.lvfs-testing.metainfo.xml',
++#    type: 'xml',
++#    po_dir: join_paths(meson.project_source_root(), 'po'),
++#    data_dirs: join_paths(meson.project_source_root(), 'po'),
++#    install: true,
++#    install_dir: join_paths(get_option('datadir'), 'fwupd', 'metainfo')
++#  )
+ endif
+ 
+ install_data('README.md',
+diff --git a/meson.build b/meson.build
+index 98942cd..c69b57c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -567,7 +567,7 @@ if build_standalone
+   plugin_quirks = []
+   gcab = find_program('gcab', required: get_option('tests'))
+   subdir('data')
+-  subdir('po')
++  #subdir('po')
+   subdir('libfwupdplugin')
+   subdir('contrib')
+ 
diff --git a/extra/fwupd/sources b/extra/fwupd/sources
@@ -1 +1,2 @@
 https://github.com/fwupd/fwupd/releases/download/VERSION/fwupd-VERSION.tar.xz
+patches/no-i18n.patch patches