diff --git a/.gitignore b/.gitignore index efb0fe6..3b3bd47 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,3 @@ /android-file-transfer-linux-4.0.tar.gz /android-file-transfer-linux-4.1.tar.gz /android-file-transfer-linux-4.2.tar.gz -/android-file-transfer-linux-4.4.tar.gz -/android-file-transfer-linux-4.5.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index bb0073b..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-rawhide - - job: koji_build - trigger: commit - dist_git_branches: - - fedora-rawhide - - job: bodhi_update - trigger: commit - dist_git_branches: - - fedora-rawhide diff --git a/0001-Fix-build-with-GCC-13-330.patch b/0001-Fix-build-with-GCC-13-330.patch new file mode 100644 index 0000000..6d55607 --- /dev/null +++ b/0001-Fix-build-with-GCC-13-330.patch @@ -0,0 +1,30 @@ +From e8f45ff6f02d2e1e09c12f3aa708e87548d4f2bd Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 18 Apr 2023 11:38:22 +0100 +Subject: [PATCH] Fix build with GCC 13 (#330) + +GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some +are no longer transitively included. + +See https://gnu.org/software/gcc/gcc-13/porting_to.html. + +Bug: https://bugs.gentoo.org/894788 +--- + mtp/types.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mtp/types.h b/mtp/types.h +index 32024e4..676e180 100644 +--- a/mtp/types.h ++++ b/mtp/types.h +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + + namespace mtp +-- +2.40.0 + diff --git a/android-file-transfer.spec b/android-file-transfer.spec index df3c912..11657cf 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -2,26 +2,28 @@ %undefine __cmake_in_source_build Name: android-file-transfer -Version: 4.5 -Release: 5%{?dist} +Version: 4.2 +Release: 12%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only URL: https://github.com/whoozle/android-file-transfer-linux Source0: %{url}/archive/v%{version}/%{name}-linux-%{version}.tar.gz +Patch0001: 0001-Fix-build-with-GCC-13-330.patch + Requires: hicolor-icon-theme BuildRequires: cmake BuildRequires: cmake(pybind11) -BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(Qt5LinguistTools) BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: libappstream-glib BuildRequires: ninja-build -BuildRequires: pkgconfig(fuse3) +BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(libmagic) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(Qt6) +BuildRequires: pkgconfig(Qt5) BuildRequires: pkgconfig(readline) BuildRequires: pkgconfig(taglib) @@ -73,31 +75,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 4.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Tue Nov 4 2025 Tom Callaway - 4.5-4 -- rebuild for new fuse3 - -* Wed Jul 23 2025 Fedora Release Engineering - 4.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Wed May 21 2025 Marek Blaha - 4.5-2 -- Switch to fuse3 - -* Thu May 15 2025 Marek Blaha - 4.5-1 -- Update to version 4.5 - -* Tue Apr 01 2025 Marek Blaha - 4.4-1 -- Update to version 4.4 -- Switch to Qt6 - -* Thu Jan 16 2025 Fedora Release Engineering - 4.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 4.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Mon Jan 22 2024 Fedora Release Engineering - 4.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 0737230..6573eea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (android-file-transfer-linux-4.5.tar.gz) = 7aff608f83055a92fb35ccec768e531c60984d3fc8293c04443bb52a2eeef208c50f6baeccabd951ebc630711b07f043f6ed118bf4e308836c5c796281d68ffd +SHA512 (android-file-transfer-linux-4.2.tar.gz) = 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659