[packages/flatpak] - added missing patch (missing files from git), rebuild autotools to fix missing gtk-docs
qboosh
qboosh at pld-linux.org
Sun Sep 18 21:04:25 CEST 2022
commit b5e6e5b8a5032dc4f1a35675af72be83067cf447
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 18 21:04:45 2022 +0200
- added missing patch (missing files from git), rebuild autotools to fix missing gtk-docs
flatpak-missing.patch | 434 ++++++++++++++++++++++++++++++++++++++++++++++++++
flatpak.spec | 25 ++-
2 files changed, 456 insertions(+), 3 deletions(-)
---
diff --git a/flatpak.spec b/flatpak.spec
index 608095d..6afda30 100644
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -1,5 +1,6 @@
#
# Conditional build:
+%bcond_without apidocs # API documentation
%bcond_without static_libs # static library
%bcond_with selinux # selinux module for system-helper
%bcond_without system_bwrap # system bubblewrap
@@ -15,13 +16,18 @@ Group: Applications
#Source0Download: https://github.com/flatpak/flatpak/releases/
Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
# Source0-md5: 5e67b00ea06a45289718307d03a704a5
+Patch0: %{name}-missing.patch
URL: https://flatpak.org/
BuildRequires: AppStream-devel >= 0.14.0
BuildRequires: appstream-glib-devel >= 0.5.10
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.13.4
%{?with_system_bwrap:BuildRequires: bubblewrap >= 0.4.0}
BuildRequires: dconf-devel >= 0.26
+%if %{with apidocs}
BuildRequires: docbook-dtd45-xml
BuildRequires: docbook-style-xsl-nons
+%endif
# or libelf >= 0.8.12
BuildRequires: elfutils-devel
BuildRequires: gdk-pixbuf2-devel >= 2.0
@@ -38,8 +44,9 @@ BuildRequires: libfuse-devel >= 2.9.2
%{?with_malcontent:BuildRequires: libmalcontent-devel >= 0.4.0}
BuildRequires: libseccomp-devel
BuildRequires: libsoup-devel >= 2.4
+BuildRequires: libtool >= 2:2.2.6
BuildRequires: libxml2-devel >= 2.4
-BuildRequires: libxslt-progs
+%{?with_apidocs:BuildRequires: libxslt-progs}
BuildRequires: ostree-devel >= 2020.8
BuildRequires: pkgconfig >= 1:0.24
BuildRequires: polkit-devel >= 0.98
@@ -172,11 +179,20 @@ Uzupełnianie parametrów polecenia flatpak w powłoce ZSH.
%prep
%setup -q
+%patch0 -p1
%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' scripts/flatpak-{bisect,coredumpctl}
%build
+%{__gtkdocize}
+%{__libtoolize}
+%{__aclocal} -I m4 -I subprojects/libglnx
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
+ %{?with_apidocs:--enable-documentation} \
+ %{?with_apidocs:--enable-gtk-doc} \
--disable-silent-rules \
%{?with_selinux:--enable-selinux-module} \
%{?with_static_libs:--enable-static} \
@@ -205,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc NEWS
+%doc NEWS README.md
%doc %{_docdir}/flatpak
%attr(755,root,root) %{_bindir}/flatpak
%attr(755,root,root) %{_bindir}/flatpak-bisect
@@ -267,9 +283,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libflatpak.a
%endif
+%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
-#%{_gtkdocdir}/flatpak
+%{_gtkdocdir}/flatpak
+%endif
%files -n bash-completion-flatpak
%defattr(644,root,root,755)
@@ -278,6 +296,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n fish-completion-flatpak
%defattr(644,root,root,755)
%{fish_compdir}
+%{_datadir}/fish/vendor_conf.d/flatpak.fish
%files -n zsh-completion-flatpak
%defattr(644,root,root,755)
diff --git a/flatpak-missing.patch b/flatpak-missing.patch
new file mode 100644
index 0000000..4062175
--- /dev/null
+++ b/flatpak-missing.patch
@@ -0,0 +1,434 @@
+--- flatpak-1.14.0/doc/reference/flatpak-sections.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ flatpak-1.14.0/doc/reference/flatpak-sections.txt 2022-09-18 20:36:08.083031123 +0200
+@@ -0,0 +1,366 @@
++<SECTION>
++<FILE>flatpak-installation</FILE>
++<TITLE>FlatpakInstallation</TITLE>
++FlatpakInstallation
++FlatpakQueryFlags
++flatpak_installation_new_system
++flatpak_installation_new_system_with_id
++flatpak_installation_new_user
++flatpak_installation_new_for_path
++flatpak_installation_get_is_user
++flatpak_installation_get_path
++flatpak_installation_create_monitor
++flatpak_installation_install
++flatpak_installation_install_full
++flatpak_installation_update
++flatpak_installation_update_full
++flatpak_installation_uninstall
++flatpak_installation_uninstall_full
++flatpak_installation_launch
++flatpak_installation_launch_full
++flatpak_installation_get_current_installed_app
++flatpak_installation_get_display_name
++flatpak_installation_get_id
++flatpak_installation_get_installed_ref
++flatpak_installation_get_min_free_space_bytes
++flatpak_installation_get_priority
++flatpak_installation_get_storage_type
++flatpak_installation_set_no_interaction
++flatpak_installation_get_no_interaction
++flatpak_installation_list_installed_refs
++flatpak_installation_list_installed_refs_by_kind
++flatpak_installation_list_installed_refs_for_update
++flatpak_installation_list_installed_related_refs_sync
++flatpak_installation_list_unused_refs
++flatpak_installation_list_remote_refs_sync
++flatpak_installation_list_remote_refs_sync_full
++flatpak_installation_list_remotes_by_type
++flatpak_installation_list_remote_related_refs_sync
++flatpak_installation_list_remotes
++flatpak_installation_get_remote_by_name
++flatpak_installation_fetch_remote_metadata_sync
++flatpak_installation_fetch_remote_ref_sync
++flatpak_installation_fetch_remote_ref_sync_full
++flatpak_installation_fetch_remote_size_sync
++flatpak_installation_load_app_overrides
++flatpak_installation_update_appstream_sync
++flatpak_installation_install_bundle
++flatpak_installation_install_ref_file
++flatpak_installation_drop_caches
++flatpak_installation_add_remote
++flatpak_installation_modify_remote
++flatpak_installation_remove_remote
++flatpak_installation_update_remote_sync
++flatpak_installation_cleanup_local_refs_sync
++flatpak_installation_get_config
++flatpak_installation_get_default_languages
++flatpak_installation_get_default_locales
++flatpak_installation_prune_local_repo
++flatpak_installation_remove_local_ref_sync
++flatpak_installation_set_config_sync
++flatpak_installation_update_appstream_full_sync
++flatpak_installation_run_triggers
++flatpak_get_default_arch
++flatpak_get_supported_arches
++flatpak_get_system_installations
++FlatpakProgressCallback
++FlatpakUpdateFlags
++FlatpakInstallFlags
++FlatpakUninstallFlags
++FlatpakLaunchFlags
++FlatpakStorageType
++<SUBSECTION Standard>
++FLATPAK_INSTALLATION
++FLATPAK_IS_INSTALLATION
++FLATPAK_TYPE_INSTALLATION
++FlatpakInstallationClass
++flatpak_installation_get_type
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-installed-ref</FILE>
++<TITLE>FlatpakInstalledRef</TITLE>
++FlatpakInstalledRef
++flatpak_installed_ref_get_deploy_dir
++flatpak_installed_ref_get_installed_size
++flatpak_installed_ref_get_is_current
++flatpak_installed_ref_get_latest_commit
++flatpak_installed_ref_get_origin
++flatpak_installed_ref_load_appdata
++flatpak_installed_ref_load_metadata
++flatpak_installed_ref_get_appdata_license
++flatpak_installed_ref_get_appdata_name
++flatpak_installed_ref_get_appdata_summary
++flatpak_installed_ref_get_appdata_version
++flatpak_installed_ref_get_appdata_content_rating
++flatpak_installed_ref_get_appdata_content_rating_type
++flatpak_installed_ref_get_subpaths
++flatpak_installed_ref_get_eol
++flatpak_installed_ref_get_eol_rebase
++<SUBSECTION Standard>
++FlatpakInstalledRefClass
++FLATPAK_INSTALLED_REF
++FLATPAK_IS_INSTALLED_REF
++FLATPAK_TYPE_INSTALLED_REF
++flatpak_installed_ref_get_type
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-remote-ref</FILE>
++<TITLE>FlatpakRemoteRef</TITLE>
++FlatpakRemoteRef
++flatpak_remote_ref_get_remote_name
++flatpak_remote_ref_get_download_size
++flatpak_remote_ref_get_eol
++flatpak_remote_ref_get_eol_rebase
++flatpak_remote_ref_get_installed_size
++flatpak_remote_ref_get_metadata
++<SUBSECTION Standard>
++FLATPAK_IS_REMOTE_REF
++FLATPAK_REMOTE_REF
++FLATPAK_TYPE_REMOTE_REF
++FlatpakRemoteRefClass
++flatpak_remote_ref_get_type
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-related-ref</FILE>
++<TITLE>FlatpakRelatedRef</TITLE>
++FlatpakRelatedRef
++flatpak_related_ref_new
++flatpak_related_ref_get_subpaths
++flatpak_related_ref_should_download
++flatpak_related_ref_should_delete
++flatpak_related_ref_should_autoprune
++<SUBSECTION Standard>
++FLATPAK_IS_RELATED_REF
++FLATPAK_RELATED_REF
++FLATPAK_TYPE_RELATED_REF
++FlatpakRelatedRefClass
++flatpak_related_ref_get_type
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-ref</FILE>
++<TITLE>FlatpakRef</TITLE>
++FlatpakRef
++FlatpakRefKind
++flatpak_ref_format_ref
++flatpak_ref_get_arch
++flatpak_ref_get_branch
++flatpak_ref_get_collection_id
++flatpak_ref_get_commit
++flatpak_ref_get_kind
++flatpak_ref_get_name
++flatpak_ref_parse
++<SUBSECTION Standard>
++FlatpakRefClass
++FLATPAK_IS_REF
++FLATPAK_REF
++FLATPAK_TYPE_REF
++flatpak_ref_get_type
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-remote</FILE>
++<TITLE>FlatpakRemote</TITLE>
++FlatpakRemote
++flatpak_remote_new
++flatpak_remote_new_from_file
++flatpak_remote_get_name
++flatpak_remote_get_appstream_dir
++flatpak_remote_get_appstream_timestamp
++flatpak_remote_get_collection_id
++flatpak_remote_set_collection_id
++flatpak_remote_get_default_branch
++flatpak_remote_set_default_branch
++flatpak_remote_get_gpg_verify
++flatpak_remote_set_gpg_verify
++flatpak_remote_set_gpg_key
++flatpak_remote_get_nodeps
++flatpak_remote_set_nodeps
++flatpak_remote_get_noenumerate
++flatpak_remote_set_noenumerate
++flatpak_remote_get_prio
++flatpak_remote_set_prio
++flatpak_remote_get_remote_type
++flatpak_remote_get_title
++flatpak_remote_set_title
++flatpak_remote_get_comment
++flatpak_remote_set_comment
++flatpak_remote_get_description
++flatpak_remote_set_description
++flatpak_remote_get_homepage
++flatpak_remote_set_homepage
++flatpak_remote_get_icon
++flatpak_remote_set_icon
++flatpak_remote_get_url
++flatpak_remote_set_url
++flatpak_remote_get_disabled
++flatpak_remote_set_disabled
++flatpak_remote_get_filter
++flatpak_remote_set_filter
++flatpak_remote_get_main_ref
++flatpak_remote_set_main_ref
++FlatpakRemoteType
++<SUBSECTION Standard>
++FlatpakRemoteClass
++FLATPAK_IS_REMOTE
++FLATPAK_REMOTE
++FLATPAK_TYPE_REMOTE
++flatpak_remote_get_type
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-transaction-progress</FILE>
++<TITLE>FlatpakTransactionProgress</TITLE>
++FlatpakTransactionProgress
++flatpak_transaction_progress_get_is_estimating
++flatpak_transaction_progress_get_progress
++flatpak_transaction_progress_get_status
++flatpak_transaction_progress_set_update_frequency
++flatpak_transaction_progress_get_bytes_transferred
++flatpak_transaction_progress_get_start_time
++
++<SUBSECTION Standard>
++FlatpakTransactionProgressClass
++FLATPAK_IS_TRANSACTION_PROGRESS
++FLATPAK_TRANSACTION_PROGRESS
++FLATPAK_TYPE_TRANSACTION_PROGRESS
++flatpak_transaction_progress_get_type
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-transaction-operation</FILE>
++<TITLE>FlatpakTransactionOperation</TITLE>
++FlatpakTransactionOperation
++flatpak_transaction_operation_get_bundle_path
++flatpak_transaction_operation_get_commit
++flatpak_transaction_operation_get_operation_type
++flatpak_transaction_operation_get_ref
++flatpak_transaction_operation_get_remote
++flatpak_transaction_operation_get_metadata
++flatpak_transaction_operation_get_old_metadata
++flatpak_transaction_operation_get_download_size
++flatpak_transaction_operation_get_installed_size
++flatpak_transaction_operation_type_to_string
++<SUBSECTION Standard>
++FlatpakTransactionOperationClass
++FLATPAK_IS_TRANSACTION_OPERATION
++FLATPAK_TRANSACTION_OPERATION
++FLATPAK_TYPE_TRANSACTION_OPERATION
++flatpak_transaction_operation_get_type
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-transaction</FILE>
++<TITLE>FlatpakTransaction</TITLE>
++FlatpakTransaction
++FlatpakTransactionOperationType
++FlatpakTransactionErrorDetails
++FlatpakTransactionRemoteReason
++FlatpakTransactionResult
++flatpak_transaction_new_for_installation
++flatpak_transaction_add_install
++flatpak_transaction_add_install_bundle
++flatpak_transaction_add_install_flatpakref
++flatpak_transaction_add_rebase
++flatpak_transaction_add_update
++flatpak_transaction_add_uninstall
++flatpak_transaction_add_default_dependency_sources
++flatpak_transaction_add_dependency_source
++flatpak_transaction_run
++<SUBSECTION>
++flatpak_transaction_get_current_operation
++flatpak_transaction_get_installation
++flatpak_transaction_get_operations
++flatpak_transaction_is_empty
++<SUBSECTION>
++flatpak_transaction_set_disable_dependencies
++flatpak_transaction_set_disable_prune
++flatpak_transaction_set_disable_related
++flatpak_transaction_set_disable_static_deltas
++flatpak_transaction_set_no_deploy
++flatpak_transaction_get_no_deploy
++flatpak_transaction_set_no_pull
++flatpak_transaction_get_no_pull
++flatpak_transaction_set_reinstall
++flatpak_transaction_set_force_uninstall
++flatpak_transaction_set_default_arch
++<subsection>
++flatpak_transaction_set_parent_window
++flatpak_transaction_get_parent_window
++flatpak_transaction_abort_webflow
++
++<SUBSECTION Standard>
++FlatpakTransactionClass
++FLATPAK_IS_TRANSACTION
++FLATPAK_TRANSACTION
++FLATPAK_TYPE_TRANSACTION
++flatpak_transaction_get_type
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-version-macros</FILE>
++FLATPAK_CHECK_VERSION
++FLATPAK_MAJOR_VERSION
++FLATPAK_MINOR_VERSION
++FLATPAK_MICRO_VERSION
++<SUBSECTION Standard>
++FLATPAK_EXTERN
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-error</FILE>
++FLATPAK_ERROR
++FlatpakError
++FLATPAK_PORTAL_ERROR
++FlatpakPortalError
++<SUBSECTION Standard>
++flatpak_error_quark
++flatpak_portal_error_quark
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-bundle-ref</FILE>
++<TITLE>FlatpakBundleRef</TITLE>
++FlatpakBundleRef
++flatpak_bundle_ref_new
++flatpak_bundle_ref_get_file
++flatpak_bundle_ref_get_metadata
++flatpak_bundle_ref_get_appstream
++flatpak_bundle_ref_get_icon
++flatpak_bundle_ref_get_origin
++flatpak_bundle_ref_get_installed_size
++flatpak_bundle_ref_get_runtime_repo_url
++<SUBSECTION Standard>
++FlatpakBundleRefClass
++FLATPAK_TYPE_BUNDLE_REF
++FLATPAK_BUNDLE_REF
++FLATPAK_IS_BUNDLE_REF
++flatpak_bundle_ref_get_type
++</SECTION>
++
++<SECTION>
++<FILE>flatpak-instance</FILE>
++<TITLE>FlatpakInstance</TITLE>
++FlatpakInstance
++flatpak_instance_get_all
++flatpak_instance_get_id
++flatpak_instance_get_app
++flatpak_instance_get_arch
++flatpak_instance_get_branch
++flatpak_instance_get_commit
++flatpak_instance_get_runtime
++flatpak_instance_get_runtime_commit
++flatpak_instance_get_pid
++flatpak_instance_get_child_pid
++flatpak_instance_get_info
++flatpak_instance_is_running
++<SUBSECTION Standard>
++FlatpakInstanceClass
++FLATPAK_TYPE_INSTANCE
++FLATPAK_INSTANCE
++FLATPAK_IS_INSTANCE
++flatpak_instance_get_type
++</SECTION>
+--- flatpak-1.14.0/doc/reference/libflatpak-docs.xml.orig 1970-01-01 01:00:00.000000000 +0100
++++ flatpak-1.14.0/doc/reference/libflatpak-docs.xml 2022-09-18 20:36:08.083031123 +0200
+@@ -0,0 +1,62 @@
++<?xml version="1.0"?>
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
++ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
++[
++ <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
++ <!ENTITY version SYSTEM "version.xml">
++]>
++<book id="index">
++ <bookinfo>
++ <title>Flatpak Library Reference Manual</title>
++ <releaseinfo>
++ For flatpak &version;
++ </releaseinfo>
++ </bookinfo>
++
++ <chapter>
++ <title>Flatpak</title>
++ <xi:include href="xml/flatpak-installation.xml"/>
++ <xi:include href="xml/flatpak-remote.xml"/>
++ <xi:include href="xml/flatpak-transaction-operation.xml"/>
++ <xi:include href="xml/flatpak-transaction-progress.xml"/>
++ <xi:include href="xml/flatpak-transaction.xml"/>
++ <xi:include href="xml/flatpak-ref.xml"/>
++ <xi:include href="xml/flatpak-installed-ref.xml"/>
++ <xi:include href="xml/flatpak-related-ref.xml"/>
++ <xi:include href="xml/flatpak-remote-ref.xml"/>
++ <xi:include href="xml/flatpak-bundle-ref.xml"/>
++ <xi:include href="xml/flatpak-instance.xml"/>
++ <xi:include href="xml/flatpak-error.xml"/>
++ <xi:include href="xml/flatpak-version-macros.xml"/>
++ </chapter>
++
++ <chapter>
++ <title>D-Bus APIs</title>
++ <xi:include href="dbus-org.freedesktop.Flatpak.Authenticator.xml"/>
++ <xi:include href="dbus-org.freedesktop.Flatpak.AuthenticatorRequest.xml"/>
++ <xi:include href="dbus-org.freedesktop.Flatpak.Development.xml"/>
++ <xi:include href="dbus-org.freedesktop.Flatpak.SessionHelper.xml"/>
++ <xi:include href="dbus-org.freedesktop.Flatpak.SystemHelper.xml"/>
++ <xi:include href="dbus-org.freedesktop.impl.portal.PermissionStore.xml"/>
++ <xi:include href="dbus-org.freedesktop.portal.Documents.xml"/>
++ <xi:include href="dbus-org.freedesktop.portal.Flatpak.xml"/>
++ <xi:include href="dbus-org.freedesktop.portal.Flatpak.UpdateMonitor.xml"/>
++ </chapter>
++
++ <chapter id="object-tree">
++ <title>Object Hierarchy</title>
++ <xi:include href="xml/tree_index.sgml"/>
++ </chapter>
++
++ <index id="full-api-index">
++ <title>API Index</title>
++ <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
++ </index>
++
++ <index id="deprecated-api-index" role="deprecated">
++ <title>Index of deprecated API</title>
++ <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
++ </index>
++
++ <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
++</book>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/flatpak.git/commitdiff/b5e6e5b8a5032dc4f1a35675af72be83067cf447
More information about the pld-cvs-commit
mailing list