From b33bacdb10038aca57a004fd254990a3fba00f5e Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Mon, 27 Nov 2023 11:15:43 -0500 Subject: ffs 13.2 dpkg rc1 --- freefilesync/debian/patches/ffs_devuan.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'freefilesync/debian/patches/ffs_devuan.patch') diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch index 1973b60..a835ccb 100644 --- a/freefilesync/debian/patches/ffs_devuan.patch +++ b/freefilesync/debian/patches/ffs_devuan.patch @@ -5,7 +5,7 @@ Last-Version: 12.5 Message: Main patch to compile on Devuan. --- a/FreeFileSync/Source/ffs_paths.cpp +++ b/FreeFileSync/Source/ffs_paths.cpp -@@ -55,7 +55,7 @@ Zstring fff::getInstallDirPath() +@@ -54,7 +54,7 @@ Zstring fff::getInstallDirPath() Zstring fff::getResourceDirPath() { @@ -32,7 +32,7 @@ Message: Main patch to compile on Devuan. CXXFLAGS += `pkg-config --cflags openssl` --- a/FreeFileSync/Source/ui/small_dlgs.cpp +++ b/FreeFileSync/Source/ui/small_dlgs.cpp -@@ -87,6 +87,8 @@ AboutDlg::AboutDlg(wxWindow* parent) : A +@@ -90,6 +90,8 @@ AboutDlg::AboutDlg(wxWindow* parent) : A build += LTR_MARK; //fix Arabic build += utfTo(cpuArchName); @@ -41,7 +41,7 @@ Message: Main patch to compile on Devuan. build += SPACED_BULLET; build += utfTo(formatTime(formatDateTag, getCompileTime())); -@@ -137,9 +139,9 @@ AboutDlg::AboutDlg(wxWindow* parent) : A +@@ -140,9 +142,9 @@ AboutDlg::AboutDlg(wxWindow* parent) : A wxImage::AddHandler(new wxJPEGHandler /*ownership passed*/); //activate support for .jpg files @@ -54,12 +54,11 @@ Message: Main patch to compile on Devuan. //-------------------------------------------------------------------------- //have animal + text match *final* dialog width -@@ -153,7 +155,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : A +@@ -156,7 +158,6 @@ AboutDlg::AboutDlg(wxWindow* parent) : A 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*/)); +- setImage(*m_bitmapAnimalSmall, shrinkImage(animalImg, wxsizeToScreen(imageWidth), -1 /*maxHeight*/)); m_staticTextDonate->Show(); m_staticTextDonate->Wrap(textWidth - 10 /*left gap*/); //wrap *after* changing font size -- cgit