commit a3088442afaa84175be17dcd6ce26b0ac2e1ea17 parent c6f80be5ac154b76fb4eb7ace9d4ff2fa7e0c0bc Author: St John Karp <contact@stjo.hn> Date: Wed, 13 Jul 2022 09:16:22 -0400 Purge fwupd and its dependencies I just can't get fwupd working on my system. It compiles and runs, but in addition to requiring forks of a bunch of community packages, it also requires dbus. Then I couldn't get it to detect anything on my system without installing udisks, which would in turn require polkit. The whole thing is just too much. I've done this in one commit so it can be easily reverted if someone wants to fork/maintain it. The removed packages are: - fwupd-efi - fwupd - tpm2-tss - freetype-harfbuzz - gcab - gnu-efi - gobject-introspection - json-glib - libftdi1 - libgudev - pango - protobuf-c - pycairo - pygobject Diffstat:
73 files changed, 1 insertion(+), 734 deletions(-)
diff --git a/README b/README @@ -16,24 +16,7 @@ repo, and occasionally others such as [mmatongo/kiss-lang](https://github.com/mm Thanks, all you wonderful KISS folks for sharing your work in public repos! On the whole I only rely on other repos for dependencies so it does not -matter whether this repo comes before or after the others. Some exceptions -are: - -- sbase and ubase - - I've forked these from the community repo for my own tweaks. By and - large the community versions are preferable, but if you want to use - my versions then kiss-stj should come before the community repo. - -- fwupd - - fwupd relies on the following common packages being built with - introspection support: freetype-harfbuzz (kisslinux/repo), json-glib - (kiss-community/community), pango (kisslinux/repo), and protobuf-c - (kiss-community/community). If you intend to use fwupd, you must place - this repo *before* the others in your $KISS_PATH, preferably when you're - first installing KISS. Otherwise I expect you can remove the existing - packages and reinstall them from this repo. +matter whether this repo comes before or after the others. ## Known Issues diff --git a/extra/fwupd-efi/build b/extra/fwupd-efi/build @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -meson build \ - --prefix=/usr - -ninja -C build -ninja -C build install diff --git a/extra/fwupd-efi/checksums b/extra/fwupd-efi/checksums @@ -1 +0,0 @@ -691c77f11c2101048d8dabaf63c6d0fe22cfad0e5d4322041c9babcebafceb3f diff --git a/extra/fwupd-efi/sources b/extra/fwupd-efi/sources @@ -1 +0,0 @@ -https://github.com/fwupd/fwupd-efi/releases/download/VERSION/fwupd-efi-VERSION.tar.xz diff --git a/extra/fwupd-efi/version b/extra/fwupd-efi/version @@ -1 +0,0 @@ -1.2 1 diff --git a/extra/fwupd/README b/extra/fwupd/README @@ -1 +0,0 @@ -fwupd runs as a D-Bus service, so you have to have the systemwide D-Bus daemon running. Then, when you run fwupdmgr, D-Bus should automatically launch fwupd. diff --git a/extra/fwupd/build b/extra/fwupd/build @@ -1,25 +0,0 @@ -#!/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 \ - -Dtests=false \ - -Dudevdir=/etc/udev \ - -Dplugin_dell=false \ - -Dgusb:docs=false \ - -Dgusb:vapi=false \ - -Dlibjcat:vapi=false - -ninja -C build -ninja -C build install - -mkdir -p "$1/usr/share/dbus-1/system-services" -sed 's|@libexecdir@|/usr/libexec|' data/org.freedesktop.fwupd.service.in > "$1/usr/share/dbus-1/system-services/org.freedesktop.fwupd.service" diff --git a/extra/fwupd/checksums b/extra/fwupd/checksums @@ -1,2 +0,0 @@ -8baaf567d8e23600363a4ed3df1dcebbdff66593704c19ebd164ba78ea8598de -c276af9e447ae64f6be5285638519b4c63a00b997a052c68bfa0b005b9939ba1 diff --git a/extra/fwupd/depends b/extra/fwupd/depends @@ -1,19 +0,0 @@ -efibootmgr -gcab -glib -gnu-efi -gnutls -gobject-introspection -gpgme -json-glib -libftdi1 -libgpg-error -libgudev -libusb -meson make -pango -pciutils -protobuf-c -pygobject -tpm2-tss -xz diff --git a/extra/fwupd/patches/no-i18n.patch b/extra/fwupd/patches/no-i18n.patch @@ -1,60 +0,0 @@ -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,2 +0,0 @@ -https://github.com/fwupd/fwupd/releases/download/VERSION/fwupd-VERSION.tar.xz -patches/no-i18n.patch patches diff --git a/extra/fwupd/version b/extra/fwupd/version @@ -1 +0,0 @@ -1.8.2 1 diff --git a/extra/tpm2-tss/build b/extra/tpm2-tss/build @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -./configure \ - $KISS_CONFIGURE \ - --prefix=/usr -make -make install diff --git a/extra/tpm2-tss/checksums b/extra/tpm2-tss/checksums @@ -1 +0,0 @@ -48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912 diff --git a/extra/tpm2-tss/sources b/extra/tpm2-tss/sources @@ -1 +0,0 @@ -https://github.com/tpm2-software/tpm2-tss/releases/download/VERSION/tpm2-tss-VERSION.tar.gz diff --git a/extra/tpm2-tss/version b/extra/tpm2-tss/version @@ -1 +0,0 @@ -3.2.0 1 diff --git a/libs/freetype-harfbuzz/README b/libs/freetype-harfbuzz/README @@ -1,57 +0,0 @@ -freetype-harfbuzz -________________________________________________________________________________ - -+------------------------------------------------------------------------------+ -| | -| This package is actually two packages: freetype and harfbuzz. To circumvent | -| the circular dependency between them, they have been merged together. | -| | -+------------------------------------------------------------------------------+ - -FreeType is a popular software development library used to render text onto -bitmaps, and provides support for other font-related operations. The FreeType -font rasterization engine is free and open-source software with the source code -dual-licensed under a BSD-like license and the GPL. FreeType supports a number -of font formats, including TrueType, Type 1, and OpenType and "is designed to -be small, efficient, highly customizable, and portable while capable of -producing high-quality output (glyph images)." [0] - -HarfBuzz is a software development library for text shaping, which is the -process of converting Unicode text to glyph indices and positions. The newer -version, New HarfBuzz (2012–), targets various font technologies while the first -version, Old HarfBuzz (2006–2012), targeted only OpenType fonts. [1] - -Upstream: https://www.freetype.org/ https://github.com/harfbuzz/harfbuzz - - -[000] Index -________________________________________________________________________________ - -* Installation ........................................................... [001] -* Usage .................................................................. [002] -* References ............................................................. [003] - - -[001] Installation -________________________________________________________________________________ - -+------------------------------------------------------------------------------+ -| | -| $ kiss b freetype-harfbuzz | -| | -+------------------------------------------------------------------------------+ - - -[002] Usage -________________________________________________________________________________ - -No documentation is currently provided with the package, refer to online -documentation for the time being. - - -[003] References -________________________________________________________________________________ - -[0] https://en.wikipedia.org/wiki/FreeType -[1] https://en.wikipedia.org/wiki/HarfBuzz - diff --git a/libs/freetype-harfbuzz/build b/libs/freetype-harfbuzz/build @@ -1,51 +0,0 @@ -#!/bin/sh -e - -build_freetype() ( - cd freetype - - meson \ - --prefix=/usr \ - -Ddefault_library=both \ - -Dbzip2=disabled \ - -Dzlib=disabled \ - "$@" \ - . output - - ninja -C output - ninja -C output install -) - -build_harfbuzz() ( - cd harfbuzz - - meson \ - --prefix=/usr \ - -Dpkg_config_path="$DESTDIR/usr/lib/pkgconfig" \ - -Ddefault_library=both \ - -Dglib=disabled \ - -Dfreetype=enabled \ - -Dgobject=enabled \ - -Dcairo=disabled \ - -Dicu=disabled \ - -Dbenchmark=disabled \ - -Dtests=disabled \ - . output - - ninja -C output - ninja -C output install -) - -# Point Freetype to the Harfbuzz files. -export CFLAGS="$CFLAGS -I$DESTDIR/usr/include/harfbuzz" -export CFLAGS="$CFLAGS -L$DESTDIR/usr/lib " -export PKG_CONFIG_PATH=$DESTDIR/usr/lib/pkgconfig - -# Point Harfbuzz to the Freetype files. -export CFLAGS="$CFLAGS -I$DESTDIR/usr/include/freetype2" -export CFLAGS="$CFLAGS -L$DESTDIR/usr/lib" -export CXXFLAGS="$CXXFLAGS -I$DESTDIR/usr/include/freetype2" -export CXXFLAGS="$CXXFLAGS -L$DESTDIR/usr/lib" - -build_freetype -Dharfbuzz=disabled -build_harfbuzz -build_freetype -Dharfbuzz=enabled --reconfigure diff --git a/libs/freetype-harfbuzz/checksums b/libs/freetype-harfbuzz/checksums @@ -1,2 +0,0 @@ -4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f -32184860ddc0b264ff95010e1c64e596bd746fe4c2e34014a1185340cdddeba6 diff --git a/libs/freetype-harfbuzz/depends b/libs/freetype-harfbuzz/depends @@ -1,4 +0,0 @@ -libpng -gobject-introspection -meson make -pkgconf make diff --git a/libs/freetype-harfbuzz/sources b/libs/freetype-harfbuzz/sources @@ -1,2 +0,0 @@ -https://download-mirror.savannah.gnu.org/releases/freetype/freetype-MAJOR.MINOR.PATCH.tar.xz freetype -https://github.com/harfbuzz/harfbuzz/archive/IDENT.tar.gz harfbuzz diff --git a/libs/freetype-harfbuzz/version b/libs/freetype-harfbuzz/version @@ -1 +0,0 @@ -2.12.1+4.3.0 1 diff --git a/libs/gcab/build b/libs/gcab/build @@ -1,11 +0,0 @@ -#!/usr/bin/env sh - -meson build \ - --prefix=/usr \ - -Ddocs=false \ - -Dnls=false \ - -Dvapi=false \ - -Dtests=false - -ninja -C build -ninja -C build install diff --git a/libs/gcab/checksums b/libs/gcab/checksums @@ -1 +0,0 @@ -67a5fa9be6c923fbc9197de6332f36f69a33dadc9016a2b207859246711c048f diff --git a/libs/gcab/depends b/libs/gcab/depends @@ -1,3 +0,0 @@ -glib -meson make -zlib diff --git a/libs/gcab/sources b/libs/gcab/sources @@ -1 +0,0 @@ -https://download.gnome.org/sources/gcab/VERSION/gcab-VERSION.tar.xz diff --git a/libs/gcab/version b/libs/gcab/version @@ -1 +0,0 @@ -1.4 1 diff --git a/libs/gnu-efi/build b/libs/gnu-efi/build @@ -1,11 +0,0 @@ -#!/usr/bin/env sh - -for file in patches/* ; do - patch -p1 < "$file" -done - -sed 's/^PREFIX := \/usr\/local/PREFIX := \/usr/' Make.defaults > _ -mv -f _ Make.defaults - -make -make install diff --git a/libs/gnu-efi/checksums b/libs/gnu-efi/checksums @@ -1,2 +0,0 @@ -b73b643a0d5697d1f396d7431448e886dd805668789578e3e1a28277c9528435 -4cbadb9caa97eee498b4e1009d52203316733b167bffe1652819af189d374a3a diff --git a/libs/gnu-efi/patches/0035-Make-make-make-DESTDIR-.-foo-install-work-right.patch b/libs/gnu-efi/patches/0035-Make-make-make-DESTDIR-.-foo-install-work-right.patch @@ -1,41 +0,0 @@ -From c0963d33ad37ff62da31208b1688d164bd8a1449 Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Fri, 25 Oct 2019 15:39:35 -0400 -Subject: [PATCH 35/46] Make: make "make DESTDIR=../foo install" work right. - -This makes the normal DESTDIR= variable work on the command line, and -makes relative paths always relative to the top-level directory. - -Signed-off-by: Peter Jones <pjones@redhat.com> ---- - Make.defaults | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/Make.defaults b/Make.defaults -index 696028dd6c2..157559d20ee 100755 ---- a/Make.defaults -+++ b/Make.defaults -@@ -47,7 +47,19 @@ ARCHES=aa64 arm ia32 ia64 mips64el x64 - # Where to install the package. GNU-EFI will create and access - # lib and include under the root - # --INSTALLROOT := / -+DESTDIR ?= / -+ifeq ($(origin INSTALLROOT),undefined) -+INSTALLROOT = $(DESTDIR) -+endif -+ -+empty := -+space := $(empty) $(empty) -+stripped = $(subst $(space),/,$(strip $(subst /,$(space),$(1)))) -+unstripped = $(subst $(space),/,$(subst /,$(space),$(1))) -+is_absolute = $(subst $(call stripped,$(1)),$(empty),$(call unstripped,$(1))) -+ -+override INSTALLROOT:=$(if $(call is_absolute,$(INSTALLROOT)),,$(TOPDIR)/)$(INSTALLROOT) -+ - PREFIX := /usr/local - LIBDIR := $(PREFIX)/lib - INSTALL := install --- -2.24.1 - diff --git a/libs/gnu-efi/sources b/libs/gnu-efi/sources @@ -1,2 +0,0 @@ -https://sourceforge.net/projects/gnu-efi/files/gnu-efi-VERSION.tar.bz2 -https://src.fedoraproject.org/rpms/gnu-efi/raw/f31/f/0035-Make-make-make-DESTDIR-.-foo-install-work-right.patch patches diff --git a/libs/gnu-efi/version b/libs/gnu-efi/version @@ -1 +0,0 @@ -3.0.14 1 diff --git a/libs/gobject-introspection/build b/libs/gobject-introspection/build @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -meson \ - --prefix=/usr \ - . _build -ninja -C _build -ninja -C _build install diff --git a/libs/gobject-introspection/checksums b/libs/gobject-introspection/checksums @@ -1 +0,0 @@ -07c30d7f465dabd861c03a950430343e976d445179ad451a4dd1b17329e1cbae diff --git a/libs/gobject-introspection/depends b/libs/gobject-introspection/depends @@ -1,3 +0,0 @@ -glib -libffi -meson make diff --git a/libs/gobject-introspection/sources b/libs/gobject-introspection/sources @@ -1 +0,0 @@ -https://gitlab.gnome.org/GNOME/gobject-introspection/-/archive/VERSION/gobject-introspection-VERSION.tar.gz diff --git a/libs/gobject-introspection/version b/libs/gobject-introspection/version @@ -1 +0,0 @@ -1.72.0 1 diff --git a/libs/json-glib/build b/libs/json-glib/build @@ -1,11 +0,0 @@ -#!/bin/sh -e - -meson \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - -Dgtk_doc=disabled \ - -Dintrospection=enabled \ - . output - -ninja -C output -ninja -C output install diff --git a/libs/json-glib/checksums b/libs/json-glib/checksums @@ -1 +0,0 @@ -96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e diff --git a/libs/json-glib/depends b/libs/json-glib/depends @@ -1,6 +0,0 @@ -glib -gobject-introspection -meson make -pkgconf make -python -samurai make diff --git a/libs/json-glib/sources b/libs/json-glib/sources @@ -1 +0,0 @@ -https://download.gnome.org/sources/json-glib/1.6/json-glib-1.6.6.tar.xz diff --git a/libs/json-glib/version b/libs/json-glib/version @@ -1 +0,0 @@ -1.6.6 1 diff --git a/libs/libftdi1/build b/libs/libftdi1/build @@ -1,9 +0,0 @@ -#!/usr/bin/env sh - -mkdir build -cd build -cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - ../ -make -make install diff --git a/libs/libftdi1/checksums b/libs/libftdi1/checksums @@ -1 +0,0 @@ -7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049 diff --git a/libs/libftdi1/depends b/libs/libftdi1/depends @@ -1 +0,0 @@ -libusb diff --git a/libs/libftdi1/sources b/libs/libftdi1/sources @@ -1 +0,0 @@ -https://www.intra2net.com/en/developer/libftdi/download/libftdi1-VERSION.tar.bz2 diff --git a/libs/libftdi1/version b/libs/libftdi1/version @@ -1 +0,0 @@ -1.5 1 diff --git a/libs/libgudev/build b/libs/libgudev/build @@ -1,11 +0,0 @@ -#!/usr/bin/env sh - -meson build \ - --prefix=/usr \ - -Dtests=disabled \ - -Dintrospection=enabled \ - -Dgtk_doc=false \ - -Dvapi=disabled - -ninja -C build -ninja -C build install diff --git a/libs/libgudev/checksums b/libs/libgudev/checksums @@ -1 +0,0 @@ -0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa diff --git a/libs/libgudev/depends b/libs/libgudev/depends @@ -1,4 +0,0 @@ -glib -gobject-introspection -libudev-zero -meson make diff --git a/libs/libgudev/sources b/libs/libgudev/sources @@ -1 +0,0 @@ -https://download.gnome.org/sources/libgudev/VERSION/libgudev-VERSION.tar.xz diff --git a/libs/libgudev/version b/libs/libgudev/version @@ -1 +0,0 @@ -237 1 diff --git a/libs/pango/README b/libs/pango/README @@ -1,43 +0,0 @@ -pango -________________________________________________________________________________ - -Pango is a text (i.e. glyph) layout engine library which works with the HarfBuzz -shaping engine for displaying multi-language text. Full-function rendering of -text and cross-platform support is achieved when Pango is used with platform -APIs or third-party libraries, such as Uniscribe and FreeType, as text rendering -backends. Pango-processed text will appear similar under different operating -systems. [0] - -Upstream: https://pango.gnome.org/ - - -[000] Index -________________________________________________________________________________ - -* Installation ........................................................... [001] -* Usage .................................................................. [002] -* References ............................................................. [003] - - -[001] Installation -________________________________________________________________________________ - -+------------------------------------------------------------------------------+ -| | -| $ kiss b pango | -| | -+------------------------------------------------------------------------------+ - - -[002] Usage -________________________________________________________________________________ - -No documentation is currently provided with the package, refer to online -documentation for the time being. - - -[003] References -________________________________________________________________________________ - -[0] https://en.wikipedia.org/wiki/Pango - diff --git a/libs/pango/build b/libs/pango/build @@ -1,21 +0,0 @@ -#!/bin/sh -e - -patch -p1 < no-fribidi.patch - -# Disable download of missing (optional) dependencies -# during the build. This cannot be turned off otherwise. -rm -rf subprojects - -: > tests/meson.build -: > examples/meson.build -: > docs/meson.build - -meson \ - --prefix=/usr \ - -Dgtk_doc=false \ - -Dxft=disabled \ - -Dintrospection=enabled \ - . build - -ninja -C build -ninja -C build install diff --git a/libs/pango/checksums b/libs/pango/checksums @@ -1,2 +0,0 @@ -4964dc5f1a17464de3c1b91c16a0153429e2f73e81cfdea3229a6370b9ab8e5a -aed72762abddda21ad26e109d17e2874b3c106e2d06d41c54fd31053efe07d9d diff --git a/libs/pango/depends b/libs/pango/depends @@ -1,7 +0,0 @@ -cairo -fontconfig -freetype-harfbuzz -glib -gobject-introspection -meson make -pkgconf make diff --git a/libs/pango/patches/no-fribidi.patch b/libs/pango/patches/no-fribidi.patch @@ -1,229 +0,0 @@ -diff --git a/meson.build b/meson.build -index acead2d..2e51d8a 100644 ---- a/meson.build -+++ b/meson.build -@@ -226,7 +226,6 @@ endif - pango_deps = [] - - glib_req_version = '>= 2.62' --fribidi_req_version = '>= 1.0.6' - libthai_req_version = '>= 0.1.9' - harfbuzz_req_version = '>= 2.6.0' - fontconfig_req_version = '>= 2.13.0' -@@ -246,10 +245,6 @@ gio_dep = dependency('gio-2.0', version: glib_req_version, - fallback: ['glib', 'libgio_dep']) - pango_deps += [glib_dep, gobject_dep, gio_dep] - --fribidi_dep = dependency('fribidi', version: fribidi_req_version, -- fallback: ['fribidi', 'libfribidi_dep'], -- default_options: ['docs=false']) --pango_deps += fribidi_dep - - thai_dep = dependency('libthai', version: libthai_req_version, required: get_option('libthai')) - if thai_dep.found() -diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c -index 40123a6..328e617 100644 ---- a/pango/pango-bidi-type.c -+++ b/pango/pango-bidi-type.c -@@ -23,13 +23,21 @@ - - #include <string.h> - --#include <fribidi.h> - - #undef PANGO_DISABLE_DEPRECATED - - #include "pango-bidi-type.h" - #include "pango-utils.h" - -+typedef uint32_t FriBidiChar; -+typedef uint32_t FriBidiCharType; -+typedef uint32_t FriBidiBracketType; -+typedef int FriBidiStrIndex; -+typedef int FriBidiParType; -+typedef signed char FriBidiLevel; -+ -+#define FRIBIDI_PAR_LTR (0x00000010L | 0x00000100L) -+ - /** - * pango_bidi_type_for_unichar: - * @ch: a Unicode character -@@ -48,41 +56,7 @@ - PangoBidiType - pango_bidi_type_for_unichar (gunichar ch) - { -- FriBidiCharType fribidi_ch_type; -- -- G_STATIC_ASSERT (sizeof (FriBidiChar) == sizeof (gunichar)); -- -- fribidi_ch_type = fribidi_get_bidi_type (ch); -- -- switch (fribidi_ch_type) -- { -- case FRIBIDI_TYPE_LTR: return PANGO_BIDI_TYPE_L; -- case FRIBIDI_TYPE_LRE: return PANGO_BIDI_TYPE_LRE; -- case FRIBIDI_TYPE_LRO: return PANGO_BIDI_TYPE_LRO; -- case FRIBIDI_TYPE_RTL: return PANGO_BIDI_TYPE_R; -- case FRIBIDI_TYPE_AL: return PANGO_BIDI_TYPE_AL; -- case FRIBIDI_TYPE_RLE: return PANGO_BIDI_TYPE_RLE; -- case FRIBIDI_TYPE_RLO: return PANGO_BIDI_TYPE_RLO; -- case FRIBIDI_TYPE_PDF: return PANGO_BIDI_TYPE_PDF; -- case FRIBIDI_TYPE_EN: return PANGO_BIDI_TYPE_EN; -- case FRIBIDI_TYPE_ES: return PANGO_BIDI_TYPE_ES; -- case FRIBIDI_TYPE_ET: return PANGO_BIDI_TYPE_ET; -- case FRIBIDI_TYPE_AN: return PANGO_BIDI_TYPE_AN; -- case FRIBIDI_TYPE_CS: return PANGO_BIDI_TYPE_CS; -- case FRIBIDI_TYPE_NSM: return PANGO_BIDI_TYPE_NSM; -- case FRIBIDI_TYPE_BN: return PANGO_BIDI_TYPE_BN; -- case FRIBIDI_TYPE_BS: return PANGO_BIDI_TYPE_B; -- case FRIBIDI_TYPE_SS: return PANGO_BIDI_TYPE_S; -- case FRIBIDI_TYPE_WS: return PANGO_BIDI_TYPE_WS; -- case FRIBIDI_TYPE_ON: return PANGO_BIDI_TYPE_ON; -- case FRIBIDI_TYPE_LRI: return PANGO_BIDI_TYPE_LRI; -- case FRIBIDI_TYPE_RLI: return PANGO_BIDI_TYPE_RLI; -- case FRIBIDI_TYPE_FSI: return PANGO_BIDI_TYPE_FSI; -- case FRIBIDI_TYPE_PDI: return PANGO_BIDI_TYPE_PDI; -- case _FRIBIDI_TYPE_SENTINEL: -- default: -- return PANGO_BIDI_TYPE_ON; -- } -+ return PANGO_BIDI_TYPE_L; - } - - /* Some bidi-related functions */ -@@ -117,36 +91,12 @@ pango_log2vis_get_embedding_levels (const gchar *text, - glong n_chars, i; - guint8 *embedding_levels_list; - const gchar *p; -- FriBidiParType fribidi_base_dir; - FriBidiCharType *bidi_types; - FriBidiBracketType *bracket_types; -- FriBidiLevel max_level; -- FriBidiCharType ored_types = 0; -- FriBidiCharType anded_strongs = FRIBIDI_TYPE_RLE; - - G_STATIC_ASSERT (sizeof (FriBidiLevel) == sizeof (guint8)); - G_STATIC_ASSERT (sizeof (FriBidiChar) == sizeof (gunichar)); - -- switch (*pbase_dir) -- { -- case PANGO_DIRECTION_LTR: -- case PANGO_DIRECTION_TTB_RTL: -- fribidi_base_dir = FRIBIDI_PAR_LTR; -- break; -- case PANGO_DIRECTION_RTL: -- case PANGO_DIRECTION_TTB_LTR: -- fribidi_base_dir = FRIBIDI_PAR_RTL; -- break; -- case PANGO_DIRECTION_WEAK_RTL: -- fribidi_base_dir = FRIBIDI_PAR_WRTL; -- break; -- case PANGO_DIRECTION_WEAK_LTR: -- case PANGO_DIRECTION_NEUTRAL: -- default: -- fribidi_base_dir = FRIBIDI_PAR_WLTR; -- break; -- } -- - if (length < 0) - length = strlen (text); - -@@ -158,20 +108,11 @@ pango_log2vis_get_embedding_levels (const gchar *text, - - for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++) - { -- gunichar ch = g_utf8_get_char (p); -- FriBidiCharType char_type = fribidi_get_bidi_type (ch); -- - if (i == n_chars) - break; - -- bidi_types[i] = char_type; -- ored_types |= char_type; -- if (FRIBIDI_IS_STRONG (char_type)) -- anded_strongs &= char_type; -- if (G_UNLIKELY(bidi_types[i] == FRIBIDI_TYPE_ON)) -- bracket_types[i] = fribidi_get_bracket (ch); -- else -- bracket_types[i] = FRIBIDI_NO_BRACKET; -+ bidi_types[i] = FRIBIDI_PAR_LTR; -+ bracket_types[i] = 0; - } - - /* Short-circuit (malloc-expensive) FriBidi call for unidirectional -@@ -188,56 +129,11 @@ pango_log2vis_get_embedding_levels (const gchar *text, - * o base_dir doesn't have an RTL taste. - * o there are letters, and base_dir is weak. - */ -- if (!FRIBIDI_IS_ISOLATE (ored_types) && -- !FRIBIDI_IS_RTL (ored_types) && -- !FRIBIDI_IS_ARABIC (ored_types) && -- (!FRIBIDI_IS_RTL (fribidi_base_dir) || -- (FRIBIDI_IS_WEAK (fribidi_base_dir) && -- FRIBIDI_IS_LETTER (ored_types)) -- )) -- { -- /* all LTR */ -- fribidi_base_dir = FRIBIDI_PAR_LTR; - memset (embedding_levels_list, 0, n_chars); -- goto resolved; -- } -- /* The case that all resolved levels will be RTL is much more complex. -- * No isolates, no numbers, all strongs are RTL, and one of -- * the following: -- * -- * o base_dir has an RTL taste (may be weak). -- * o there are letters, and base_dir is weak. -- */ -- else if (!FRIBIDI_IS_ISOLATE (ored_types) && -- !FRIBIDI_IS_NUMBER (ored_types) && -- FRIBIDI_IS_RTL (anded_strongs) && -- (FRIBIDI_IS_RTL (fribidi_base_dir) || -- (FRIBIDI_IS_WEAK (fribidi_base_dir) && -- FRIBIDI_IS_LETTER (ored_types)) -- )) -- { -- /* all RTL */ -- fribidi_base_dir = FRIBIDI_PAR_RTL; -- memset (embedding_levels_list, 1, n_chars); -- goto resolved; -- } -- -- -- max_level = fribidi_get_par_embedding_levels_ex (bidi_types, bracket_types, n_chars, -- &fribidi_base_dir, -- (FriBidiLevel*)embedding_levels_list); -- -- if (G_UNLIKELY(max_level == 0)) -- { -- /* fribidi_get_par_embedding_levels() failed. */ -- memset (embedding_levels_list, 0, length); -- } -- --resolved: - g_free (bidi_types); - g_free (bracket_types); - -- *pbase_dir = (fribidi_base_dir == FRIBIDI_PAR_LTR) ? PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL; -+ *pbase_dir = PANGO_DIRECTION_LTR; - - return embedding_levels_list; - } -@@ -261,17 +157,6 @@ resolved: - PangoDirection - pango_unichar_direction (gunichar ch) - { -- FriBidiCharType fribidi_ch_type; -- -- G_STATIC_ASSERT (sizeof (FriBidiChar) == sizeof (gunichar)); -- -- fribidi_ch_type = fribidi_get_bidi_type (ch); -- -- if (!FRIBIDI_IS_STRONG (fribidi_ch_type)) -- return PANGO_DIRECTION_NEUTRAL; -- else if (FRIBIDI_IS_RTL (fribidi_ch_type)) -- return PANGO_DIRECTION_RTL; -- else - return PANGO_DIRECTION_LTR; - } - diff --git a/libs/pango/sources b/libs/pango/sources @@ -1,2 +0,0 @@ -https://github.com/GNOME/pango/archive/VERSION.tar.gz -patches/no-fribidi.patch diff --git a/libs/pango/version b/libs/pango/version @@ -1 +0,0 @@ -1.50.7 1 diff --git a/libs/protobuf-c/build b/libs/protobuf-c/build @@ -1,7 +0,0 @@ -#!/bin/sh -e - -./configure \ - --prefix=/usr - -make -make DESTDIR="$1" install diff --git a/libs/protobuf-c/checksums b/libs/protobuf-c/checksums @@ -1 +0,0 @@ -26d98ee9bf18a6eba0d3f855ddec31dbe857667d269bc0b6017335572f85bbcb diff --git a/libs/protobuf-c/depends b/libs/protobuf-c/depends @@ -1,2 +0,0 @@ -pkgconf make -protobuf diff --git a/libs/protobuf-c/sources b/libs/protobuf-c/sources @@ -1 +0,0 @@ -https://github.com/protobuf-c/protobuf-c/releases/download/v1.4.0/protobuf-c-1.4.0.tar.gz diff --git a/libs/protobuf-c/version b/libs/protobuf-c/version @@ -1 +0,0 @@ -1.4.0 2 diff --git a/libs/pycairo/build b/libs/pycairo/build @@ -1,3 +0,0 @@ -#!/usr/bin/env sh - -pip install --root="$1" . diff --git a/libs/pycairo/checksums b/libs/pycairo/checksums @@ -1 +0,0 @@ -251907f18a552df938aa3386657ff4b5a4937dde70e11aa042bc297957f4b74b diff --git a/libs/pycairo/sources b/libs/pycairo/sources @@ -1 +0,0 @@ -https://github.com/pygobject/pycairo/releases/download/vVERSION/pycairo-VERSION.tar.gz diff --git a/libs/pycairo/version b/libs/pycairo/version @@ -1 +0,0 @@ -1.21.0 1 diff --git a/libs/pygobject/build b/libs/pygobject/build @@ -1,4 +0,0 @@ -#!/usr/bin/env sh - -python setup.py build -python setup.py install --prefix=/usr --root="$1" diff --git a/libs/pygobject/checksums b/libs/pygobject/checksums @@ -1 +0,0 @@ -1f34b5f7624de35e44eb5a7eb428353285bd03004d55131a5f7f7fa9b90f3cc9 diff --git a/libs/pygobject/depends b/libs/pygobject/depends @@ -1 +0,0 @@ -pycairo diff --git a/libs/pygobject/sources b/libs/pygobject/sources @@ -1 +0,0 @@ -https://download.gnome.org/sources/pygobject/MAJOR.MINOR/pygobject-VERSION.tar.xz diff --git a/libs/pygobject/version b/libs/pygobject/version @@ -1 +0,0 @@ -3.42.1 1