Mageia Bugzilla – Attachment 14096 Details for
Bug 31905
When starting FreeFileSync and choosing "compare" FreeFileSync exits
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
1st patch : ffs_devuan_gtk3.patch
ffs_devuan_gtk3.patch (text/plain), 4.20 KB, created by
Philippe Didier
on 2023-10-26 17:29:52 CEST
(
hide
)
Description:
1st patch : ffs_devuan_gtk3.patch
Filename:
MIME Type:
Creator:
Philippe Didier
Created:
2023-10-26 17:29:52 CEST
Size:
4.20 KB
patch
obsolete
>Author: B Stack >Source: Original research >Date: 2020-08-31 >Message: Main patch to compile on GTK3. >--- a/FreeFileSync/Source/ffs_paths.cpp >+++ b/FreeFileSync/Source/ffs_paths.cpp >@@ -55,7 +55,7 @@ > > Zstring fff::getResourceDirPath() > { >- return appendPath(getProcessParentFolderPath(), Zstr("Resources")); >+ return Zstr("/usr/share/freefilesync/"); > } > > >--- a/FreeFileSync/Source/ui/small_dlgs.cpp >+++ b/FreeFileSync/Source/ui/small_dlgs.cpp >@@ -137,9 +137,9 @@ > > wxImage::AddHandler(new wxJPEGHandler /*ownership passed*/); //activate support for .jpg files > >- wxImage animalImg(utfTo<wxString>(appendPath(getResourceDirPath(), Zstr("Animal.dat"))), wxBITMAP_TYPE_JPEG); >- convertToVanillaImage(animalImg); >- assert(animalImg.IsOk()); >+ //wxImage animalImg(utfTo<wxString>(appendPath(getResourceDirPath(), Zstr("Animal.dat"))), wxBITMAP_TYPE_JPEG); >+ //convertToVanillaImage(animalImg); >+ //assert(animalImg.IsOk()); > > //-------------------------------------------------------------------------- > //have animal + text match *final* dialog width >@@ -153,7 +153,7 @@ > 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 >--- a/FreeFileSync/Source/Makefile >+++ b/FreeFileSync/Source/Makefile >@@ -1,11 +1,12 @@ > CXX ?= g++ >-exeName = FreeFileSync_$(shell arch) >+exeName = FreeFileSync > > CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ > -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ > -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread > >-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread >+LDFLAGS += `wx-config --libs std, aui, richtext --debug=no` -pthread >+LDFLAGS += -lz > > > CXXFLAGS += `pkg-config --cflags openssl` >@@ -18,9 +18,10 @@ > CXXFLAGS += `pkg-config --cflags libssh2` > LDFLAGS += `pkg-config --libs libssh2` > >-CXXFLAGS += `pkg-config --cflags gtk+-2.0` >+CXXFLAGS += `pkg-config --cflags gtk+-3.0` >+LDFLAGS += `pkg-config --libs gtk+-3.0` > #treat as system headers so that warnings are hidden: >-CXXFLAGS += -isystem/usr/include/gtk-2.0 >+CXXFLAGS += -isystem/usr/include/gtk-3.0 > > #support for SELinux (optional) > SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) >@@ -124,7 +125,7 @@ > > $(tmpPath)/ffs/src/%.o : % > mkdir -p $(dir $@) >- $(CXX) $(CXXFLAGS) -c $< -o $@ >+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ > > clean: > rm -rf $(tmpPath) >--- a/FreeFileSync/Source/RealTimeSync/Makefile >+++ b/FreeFileSync/Source/RealTimeSync/Makefile >@@ -1,16 +1,17 @@ > CXX ?= g++ >-exeName = RealTimeSync_$(shell arch) >+exeName = RealTimeSync > > CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ > -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ > -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread > >-LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread >- >+LDFLAGS += -s `wx-config --libs std, aui, richtext --debug=no` -pthread >+LDFLAGS += -lz > #Gtk - support "no button border" >-CXXFLAGS += `pkg-config --cflags gtk+-2.0` >+CXXFLAGS += `pkg-config --cflags gtk+-3.0` >+LDFLAGS += `pkg-config --libs gtk+-3.0` > #treat as system headers so that warnings are hidden: >-CXXFLAGS += -isystem/usr/include/gtk-2.0 >+CXXFLAGS += -isystem/usr/include/gtk-3.0 > > cppFiles= > cppFiles+=application.cpp >@@ -60,7 +61,7 @@ > > $(tmpPath)/ffs/src/rts/%.o : % > mkdir -p $(dir $@) >- $(CXX) $(CXXFLAGS) -c $< -o $@ >+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ > > clean: > rm -rf $(tmpPath)
Author: B Stack Source: Original research Date: 2020-08-31 Message: Main patch to compile on GTK3. --- a/FreeFileSync/Source/ffs_paths.cpp +++ b/FreeFileSync/Source/ffs_paths.cpp @@ -55,7 +55,7 @@ Zstring fff::getResourceDirPath() { - return appendPath(getProcessParentFolderPath(), Zstr("Resources")); + return Zstr("/usr/share/freefilesync/"); } --- a/FreeFileSync/Source/ui/small_dlgs.cpp +++ b/FreeFileSync/Source/ui/small_dlgs.cpp @@ -137,9 +137,9 @@ wxImage::AddHandler(new wxJPEGHandler /*ownership passed*/); //activate support for .jpg files - wxImage animalImg(utfTo<wxString>(appendPath(getResourceDirPath(), Zstr("Animal.dat"))), wxBITMAP_TYPE_JPEG); - convertToVanillaImage(animalImg); - assert(animalImg.IsOk()); + //wxImage animalImg(utfTo<wxString>(appendPath(getResourceDirPath(), Zstr("Animal.dat"))), wxBITMAP_TYPE_JPEG); + //convertToVanillaImage(animalImg); + //assert(animalImg.IsOk()); //-------------------------------------------------------------------------- //have animal + text match *final* dialog width @@ -153,7 +153,7 @@ 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 --- a/FreeFileSync/Source/Makefile +++ b/FreeFileSync/Source/Makefile @@ -1,11 +1,12 @@ CXX ?= g++ -exeName = FreeFileSync_$(shell arch) +exeName = FreeFileSync CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread +LDFLAGS += `wx-config --libs std, aui, richtext --debug=no` -pthread +LDFLAGS += -lz CXXFLAGS += `pkg-config --cflags openssl` @@ -18,9 +18,10 @@ CXXFLAGS += `pkg-config --cflags libssh2` LDFLAGS += `pkg-config --libs libssh2` -CXXFLAGS += `pkg-config --cflags gtk+-2.0` +CXXFLAGS += `pkg-config --cflags gtk+-3.0` +LDFLAGS += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: -CXXFLAGS += -isystem/usr/include/gtk-2.0 +CXXFLAGS += -isystem/usr/include/gtk-3.0 #support for SELinux (optional) SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) @@ -124,7 +125,7 @@ $(tmpPath)/ffs/src/%.o : % mkdir -p $(dir $@) - $(CXX) $(CXXFLAGS) -c $< -o $@ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ clean: rm -rf $(tmpPath) --- a/FreeFileSync/Source/RealTimeSync/Makefile +++ b/FreeFileSync/Source/RealTimeSync/Makefile @@ -1,16 +1,17 @@ CXX ?= g++ -exeName = RealTimeSync_$(shell arch) +exeName = RealTimeSync CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread -LDFLAGS += -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread - +LDFLAGS += -s `wx-config --libs std, aui, richtext --debug=no` -pthread +LDFLAGS += -lz #Gtk - support "no button border" -CXXFLAGS += `pkg-config --cflags gtk+-2.0` +CXXFLAGS += `pkg-config --cflags gtk+-3.0` +LDFLAGS += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: -CXXFLAGS += -isystem/usr/include/gtk-2.0 +CXXFLAGS += -isystem/usr/include/gtk-3.0 cppFiles= cppFiles+=application.cpp @@ -60,7 +61,7 @@ $(tmpPath)/ffs/src/rts/%.o : % mkdir -p $(dir $@) - $(CXX) $(CXXFLAGS) -c $< -o $@ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ clean: rm -rf $(tmpPath)
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 31905
:
14080
|
14094
|
14095
| 14096 |
14097
|
14098
|
14099
|
14100
|
14101
|
14102
|
14103
|
14104
|
14105