diff options
| -rw-r--r-- | freefilesync/ffs_distro_fedora.patch | 10 | ||||
| -rw-r--r-- | freefilesync/freefilesync.spec | 24 |
2 files changed, 22 insertions, 12 deletions
diff --git a/freefilesync/ffs_distro_fedora.patch b/freefilesync/ffs_distro_fedora.patch index 78502ab..6a49f21 100644 --- a/freefilesync/ffs_distro_fedora.patch +++ b/freefilesync/ffs_distro_fedora.patch @@ -99,12 +99,12 @@ Message: some random sloppiness with a missing graphical asset. It's not importa //-------------------------------------------------------------------------- //have animal + text match *final* dialog width -@@ -152,7 +152,7 @@ - const int imageWidth = (m_panelDonate->GetSize().GetWidth() - 5 - 5 /* grey border*/) / 2; - const int textWidth = m_panelDonate->GetSize().GetWidth() - 5 - 5 - imageWidth; +@@ -152,8 +154,6 @@ + const int imageWidth = (m_panelDonate->GetSize().GetWidth() - 5 - 5 - 5 /* grey border*/) / 2; + const int textWidth = m_panelDonate->GetSize().GetWidth() - 5 - 5 - 5 - imageWidth; - setImage(*m_bitmapAnimalSmall, shrinkImage(animalImg, imageWidth, -1 /*maxHeight*/)); -+ //setImage(*m_bitmapAnimalSmall, shrinkImage(animalImg, imageWidth, -1 /*maxHeight*/)); - +- m_staticTextDonate->Show(); m_staticTextDonate->Wrap(textWidth - 10 /*left gap*/); //wrap *after* changing font size + } diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index c46312f..821cdf8 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -36,7 +36,7 @@ %undefine _package_note_file %endif Name: freefilesync -Version: 11.25 +Version: 12.1 Release: 1%{?dist} Summary: A file synchronization utility @@ -52,9 +52,11 @@ Source3: %{name}.xml # all rpm distros use these Patch0: 00_allow_parallel_ops.patch Patch1: 01_no_check_updates.patch -Patch2: 02_no_wx311.patch +# fc37 has wxGTK which uses wx 3.2 +#Patch2: 02_no_wx311.patch Patch3: 03_sftp.patch -Patch4: 04_revert_zenju_aggressive_upstreamisms.patch +# fc37 this is more wx < 3.2 patches which are no longer necessary +#Patch4: 04_revert_zenju_aggressive_upstreamisms.patch Patch5: 05_traditional_view.patch Patch6: 06_icon_loader.patch Patch7: 07_libssh2.patch @@ -75,7 +77,7 @@ Patch72: ffs_libcurl_7.79.1.patch Packager: B. Stack <bgstack15@gmail.com> BuildRequires: brotli-devel -BuildRequires: wxGTK3-devel +BuildRequires: wxGTK-devel BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: ImageMagick @@ -91,7 +93,7 @@ BuildRequires: %{libssh2_name}-devel %endif BuildRequires: patch BuildRequires: pkgconfig(giomm-2.4) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(zlib) # We need the binary so we can check version number @@ -126,9 +128,9 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ -exec %{__sed} -i -r -e 's/\r$//' {} + %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %patch3 -p1 -%patch4 -p1 +#%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -174,6 +176,9 @@ case "%{libcurl_ver}" in 7.79.1) %patch72 -p1 ;; + 7.85.0) + echo "no patch necessary for libcurl %{libcurl_ver}" + ;; *) %patch71 -p1 ;; @@ -269,6 +274,11 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Tue Feb 21 2023 B. Stack <bgstack15@gmail.com> - 12.1-1 +- version bump +- use wxGTK (which provides version 3.2) +- use GTK3 because upstream uses it now too + * Wed Sep 07 2022 B. Stack <bgstack15@gmail.com> - 11.25-1 - version bump |