- added disable-avx-on-i686.patch

diff --git a/FileZilla.spec b/FileZilla.spec
index bc116793f2271148e2e1fa035e77d19418829484..e72e4b9c031df6765612b7029fcb3e766d0f13ec 100644 (file)
--- a/FileZilla.spec
+++ b/FileZilla.spec
@@ -10,12 +10,13 @@ Summary(ru.UTF-8):  FTP клиент для X Window
 Summary(uk.UTF-8):     FTP клієнт для X Window
 Name:          FileZilla
 Version:       3.61.0
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications/Networking
 Source0:       https://download.filezilla-project.org/client/%{name}_%{version}_src.tar.bz2
 # Source0-md5: 0b005ce25f7e887a55a220387efbf305
 Patch0:                %{name}-desktop.patch
+Patch1:                disable-avx-on-i686.patch
 URL:           https://filezilla-project.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1.6
@@ -57,6 +58,7 @@ opcjami oraz intuicyjnym interfejsem.
 %prep
 %setup -q -n filezilla-%{version}
 %patch0 -p1
+%patch1 -p1
 
 cd locales
 %{__mv} bg{_BG,}.po

diff --git a/disable-avx-on-i686.patch b/disable-avx-on-i686.patch
new file mode 100644 (file)
index 0000000..8139259
--- /dev/null
+++ b/disable-avx-on-i686.patch
@@ -0,0 +1,25 @@
+--- filezilla-3.60.1/src/putty/sshsh256.c
++++ filezilla-3.60.1/src/putty/sshsh256.c
+@@ -22,8 +22,7 @@
+ #       define HW_SHA256 HW_SHA256_NI
+ #   endif
+ #elif defined(__GNUC__)
+-#    if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) && \
+-        (defined(__x86_64__) || defined(__i386))
++#    if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) && defined(__x86_64__)
+ #       define HW_SHA256 HW_SHA256_NI
+ #    endif
+ #elif defined (_MSC_VER)
+--- filezilla-3.60.1/src/putty/sshsha.c
++++ filezilla-3.60.1/src/putty/sshsha.c
+@@ -22,8 +22,7 @@
+ #       define HW_SHA1 HW_SHA1_NI
+ #   endif
+ #elif defined(__GNUC__)
+-#    if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) && \
+-        (defined(__x86_64__) || defined(__i386))
++#    if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) && defined(__x86_64__)
+ #       define HW_SHA1 HW_SHA1_NI
+ #    endif
+ #elif defined (_MSC_VER)
+