Page MenuHomeSolus
Files F10861622

D2591.id6329.diff
No OneTemporary
Actions

D2591.id6329.diff
View Options

Index: Makefile
===================================================================
--- /dev/null
+++ Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
Index: abi_used_libs
===================================================================
--- /dev/null
+++ abi_used_libs
@@ -0,0 +1,16 @@
+libc.so.6
+libgcc_s.so.1
+libgdk_pixbuf-2.0.so.0
+libgio-2.0.so.0
+libglib-2.0.so.0
+libgobject-2.0.so.0
+libgtk-x11-2.0.so.0
+libm.so.6
+libpthread.so.0
+libstdc++.so.6
+libwx_baseu-3.0.so.0
+libwx_baseu_net-3.0.so.0
+libwx_gtk2u_adv-3.0.so.0
+libwx_gtk2u_aui-3.0.so.0
+libwx_gtk2u_core-3.0.so.0
+libz.so.1
Index: files/0001-remove-wxwidgets3-1-functions.patch
===================================================================
--- /dev/null
+++ files/0001-remove-wxwidgets3-1-functions.patch
@@ -0,0 +1,25 @@
+diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
+index f0804a4..2982c16 100755
+--- a/FreeFileSync/Source/ui/small_dlgs.cpp
++++ b/FreeFileSync/Source/ui/small_dlgs.cpp
+@@ -961,7 +961,6 @@ ActivationDlg::ActivationDlg(wxWindow* parent,
+ //setMainInstructionFont(*m_staticTextMain);
+
+ m_bitmapActivation->SetBitmap(getResourceImage(L"website"));
+- m_textCtrlOfflineActivationKey->ForceUpper();
+
+ m_textCtrlLastError ->ChangeValue(lastErrorMsg);
+ m_textCtrlManualActivationUrl ->ChangeValue(manualActivationUrl);
+diff --git a/wx+/grid.cpp b/wx+/grid.cpp
+index 3092df8..7f009d8 100755
+--- a/wx+/grid.cpp
++++ b/wx+/grid.cpp
+@@ -1169,7 +1169,7 @@ private:
+ {
+ if (overlapPix != 0)
+ {
+- const double scrollSpeed = wnd_.ToDIP(overlapPix) * mouseDragSpeedIncScrollU; //unit: [scroll units / sec]
++ const double scrollSpeed = 6; //unit: [scroll units / sec]
+ toScroll += scrollSpeed * deltaSecs;
+ }
+ else
Index: files/0002-warn-static.patch
===================================================================
--- /dev/null
+++ files/0002-warn-static.patch
@@ -0,0 +1,12 @@
+diff --git a/FreeFileSync/Source/lib/dir_lock.cpp b/FreeFileSync/Source/lib/dir_lock.cpp
+index ef3bb8e..025233f 100755
+--- a/FreeFileSync/Source/lib/dir_lock.cpp
++++ b/FreeFileSync/Source/lib/dir_lock.cpp
+@@ -15,6 +15,7 @@
+ #include <zen/optional.h>
+ #include <wx/log.h>
+ #include <wx/app.h>
++#include <zen/warn_static.h>
+
+ #include <fcntl.h> //open()
+ #include <sys/stat.h> //
Index: files/0003-xbrz.patch
===================================================================
--- /dev/null
+++ files/0003-xbrz.patch
@@ -0,0 +1,24 @@
+diff --git a/FreeFileSync/Source/Makefile b/FreeFileSync/Source/Makefile
+index 3319726..7537d45 100755
+--- a/FreeFileSync/Source/Makefile
++++ b/FreeFileSync/Source/Makefile
+@@ -90,6 +90,7 @@ CPP_LIST+=../../wx+/image_resources.cpp
+ CPP_LIST+=../../wx+/popup_dlg.cpp
+ CPP_LIST+=../../wx+/popup_dlg_generated.cpp
+ CPP_LIST+=../../wx+/zlib_wrap.cpp
++CPP_LIST+=../../xBRZ/src/xbrz.cpp
+
+ OBJECT_LIST = $(CPP_LIST:%.cpp=../Obj/FFS_GCC_Make_Release/ffs/src/%.o)
+
+diff --git a/FreeFileSync/Source/RealTimeSync/Makefile b/FreeFileSync/Source/RealTimeSync/Makefile
+index baf4ef6..cc57936 100755
+--- a/FreeFileSync/Source/RealTimeSync/Makefile
++++ b/FreeFileSync/Source/RealTimeSync/Makefile
+@@ -36,6 +36,7 @@ CPP_LIST+=../../../wx+/image_tools.cpp
+ CPP_LIST+=../../../wx+/image_resources.cpp
+ CPP_LIST+=../../../wx+/popup_dlg.cpp
+ CPP_LIST+=../../../wx+/popup_dlg_generated.cpp
++CPP_LIST+=../../../xBRZ/src/xbrz.cpp
+
+ OBJECT_LIST=$(CPP_LIST:%.cpp=../../Obj/RTS_GCC_Make_Release/ffs/src/rts/%.o)
+
Index: files/FreeFileSync.desktop
===================================================================
--- /dev/null
+++ files/FreeFileSync.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=FreeFileSync
+GenericName=Folder Synchronization
+Comment=Visual folder comparison and synchronization
+Exec=FreeFileSync
+Terminal=false
+Type=Application
+Icon=FreeFileSync
+Categories=Utility;
+StartupNotify=true
Index: files/RealTimeSync.desktop
===================================================================
--- /dev/null
+++ files/RealTimeSync.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=RealTimeSync
+GenericName=Realtime Synchronization
+Comment=Realtime folder synchronization
+Exec=RealTimeSync
+Terminal=false
+Type=Application
+Icon=RealTimeSync
+Categories=Utility;
+StartupNotify=true
+Keywords=freefilesync;
Index: files/series
===================================================================
--- /dev/null
+++ files/series
@@ -0,0 +1,3 @@
+0001-remove-wxwidgets3-1-functions.patch -p1
+0002-warn-static.patch -p1
+0003-xbrz.patch -p1
Index: package.yml
===================================================================
--- /dev/null
+++ package.yml
@@ -0,0 +1,52 @@
+name : freefilesync
+version : 9.9
+release : 1
+source :
+ - https://www.freefilesync.org/download/FreeFileSync_9.9_Source.zip : 43edd3c8546bd5a44c5d353811389a68b148f0655c006c13f4357f3579b9a970
+ - https://sourceforge.net/projects/xbrz/files/xBRZ/xBRZ_1.6.zip : 8d51e52a9264d09117cf434b7fcb46a17ee4285a00432554ba47fa86ac4511ce
+license : GPL-3.0
+component : network.util
+summary : Free backup software to synchronize files and folders
+description: |
+ FreeFileSync is a folder comparison and synchronization software that creates and manages backup copies of all your important files.
+builddeps :
+ - pkgconfig(gtk+-2.0)
+ - libboost-devel
+ - wxwidgets-devel
+setup : |
+ pushd ..
+ %apply_patches
+
+ XBRZ_NAME=$(basename $sources/xBRZ*.zip)
+ mkdir -p xBRZ/src
+ unzip $sources/$XBRZ_NAME -d xBRZ/src
+ popd
+build : |
+ pushd Source
+ %make
+ pushd RealTimeSync
+ %make
+ popd
+ popd
+install : |
+ install -dm00755 $installdir/usr/bin
+ cp Build/FreeFileSync $installdir/usr/bin
+ cp Build/RealTimeSync $installdir/usr/bin
+
+ install -dm00644 $installdir/usr/share/FreeFileSync
+ cp -R Build/Languages/ \
+ Build/Help/ \
+ Build/*.wav \
+ Build/Resources.zip \
+ $installdir/usr/share/FreeFileSync
+
+ install -dm00644 $installdir/usr/share/doc/FreeFileSync
+ cp ../Changelog.txt $installdir/usr/share/doc/FreeFileSync/changelog
+ gzip $installdir/usr/share/doc/FreeFileSync/changelog
+
+ install -Dm00644 $pkgfiles/FreeFileSync.desktop $installdir/usr/share/applications/FreeFileSync.desktop
+ install -Dm00644 $pkgfiles/RealTimeSync.desktop $installdir/usr/share/applications/RealTimeSync.desktop
+
+ unzip Build/Resources.zip FreeFileSync.png RealTimeSync.png
+ install -Dm00644 FreeFileSync.png $installdir/usr/share/pixmaps/FreeFileSync.png
+ install -Dm00644 RealTimeSync.png $installdir/usr/share/pixmaps/RealTimeSync.png
Index: pspec_x86_64.xml
===================================================================
--- /dev/null
+++ pspec_x86_64.xml
@@ -0,0 +1,146 @@
+<PISI>
+ <Source>
+ <Name>freefilesync</Name>
+ <Packager>
+ <Name>Longwu Ou</Name>
+ <Email>oulongwu@mit.edu</Email>
+ </Packager>
+ <License>GPL-3.0</License>
+ <PartOf>network.util</PartOf>
+ <Summary xml:lang="en">Free backup software to synchronize files and folders</Summary>
+ <Description xml:lang="en">FreeFileSync is a folder comparison and synchronization software that creates and manages backup copies of all your important files.
+</Description>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ </Source>
+ <Package>
+ <Name>freefilesync</Name>
+ <Summary xml:lang="en">Free backup software to synchronize files and folders</Summary>
+ <Description xml:lang="en">FreeFileSync is a folder comparison and synchronization software that creates and manages backup copies of all your important files.
+</Description>
+ <PartOf>network.util</PartOf>
+ <Files>
+ <Path fileType="executable">/usr/bin</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/FreeFileSync.hhc</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/FreeFileSync.hhp</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/base.css</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/command-line.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/comparison-settings.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/daylight-saving-time.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/exclude-items.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/expert-settings.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/external-applications.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/freefilesync.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/macros.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/realtimesync.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/run-as-service.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/schedule-a-batch-job.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/synchronization-settings.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/synchronize-with-sftp.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/tips-and-tricks.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/variable-drive-letters.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/versioning.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/html/volume-shadow-copy.html</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/add-folder-pair.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/automator-file-dropped.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/basic-step-choose-folders.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/basic-step-compare.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/basic-step-start-sync.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/basic-step-sync-config.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/calendar-job-added.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/com-settings-context.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/command-line-syntax.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/comparison-settings.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/comparison-variant-double-click.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/config-double-click.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/config-multiple-selection.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/copy-alternative-path.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/dialog-drag-move.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/direct-synchronize.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/explorer-context.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/filter-context.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/filter-zero-file-size.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/filter.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/freefilesync-logo.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/gnome-scheduler.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/ignore-time-shift.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/launch-automator.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/main-window.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/new-calendar-alarm.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/open-finder-items.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/path-by-volume-name.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/realtimesync-create-shortcut.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/realtimesync-logo.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/realtimesync-main-window.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/realtimesync-monitor-usb.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/realtimesync-schedule.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/realtimesync-shortcut-properties.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/remove-drop-down-path.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/remove-local-settings.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/save-automator.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/select-time-span.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/setup-batch-job.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/sftp-cloud-picker.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/sftp-login.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/sftp-performance.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/show-thumbnails.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/sync-settings-context.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/synchronization-settings.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/synchronization-variant-double-click.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/two-folder-drop.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/versioning.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/view-filter-default.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/windows-scheduler.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Help/images/xp-scheduler.png</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/arabic.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/bulgarian.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/chinese_simple.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/chinese_traditional.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/croatian.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/czech.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/danish.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/dutch.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/english_uk.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/finnish.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/french.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/german.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/greek.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/hebrew.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/hindi.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/hungarian.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/italian.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/japanese.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/korean.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/lithuanian.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/norwegian.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/polish.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/portuguese.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/portuguese_br.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/romanian.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/russian.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/slovak.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/slovenian.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/spanish.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/swedish.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/turkish.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Languages/ukrainian.lng</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/Resources.zip</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/ding.wav</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/gong.wav</Path>
+ <Path fileType="data">/usr/share/FreeFileSync/harp.wav</Path>
+ <Path fileType="data">/usr/share/applications/FreeFileSync.desktop</Path>
+ <Path fileType="data">/usr/share/applications/RealTimeSync.desktop</Path>
+ <Path fileType="doc">/usr/share/doc</Path>
+ <Path fileType="data">/usr/share/pixmaps/FreeFileSync.png</Path>
+ <Path fileType="data">/usr/share/pixmaps/RealTimeSync.png</Path>
+ </Files>
+ </Package>
+ <History>
+ <Update release="1">
+ <Date>2018-03-22</Date>
+ <Version>9.9</Version>
+ <Comment>Packaging update</Comment>
+ <Name>Longwu Ou</Name>
+ <Email>oulongwu@mit.edu</Email>
+ </Update>
+ </History>
+</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Jun 17 2023, 3:05 PM (7 w, 6 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5820356
Default Alt Text
D2591.id6329.diff (18 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.