summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_devuan.patch
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-06-01 00:33:51 +0000
committerB. Stack <bgstack15@gmail.com>2022-06-01 00:33:51 +0000
commitaedc987064ddb4f01551ae07d1d1a169d619f1d6 (patch)
treec1bbb293d01364ffec442c4de2941b7006243410 /freefilesync/debian/patches/ffs_devuan.patch
parentMerge branch 'newmoon-bump' into 'master' (diff)
parentdisable package note file (diff)
downloadstackrpms-aedc987064ddb4f01551ae07d1d1a169d619f1d6.tar.gz
stackrpms-aedc987064ddb4f01551ae07d1d1a169d619f1d6.tar.bz2
stackrpms-aedc987064ddb4f01551ae07d1d1a169d619f1d6.zip
Merge branch 'freefilesync-bump' into 'master'
Freefilesync bump See merge request bgstack15/stackrpms!299
Diffstat (limited to 'freefilesync/debian/patches/ffs_devuan.patch')
-rw-r--r--freefilesync/debian/patches/ffs_devuan.patch25
1 files changed, 24 insertions, 1 deletions
diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index fc4db2d..5726b87 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -61,4 +61,27 @@ diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/RealTimeSyn
#Gtk - support "no button border"
cxxFlags += `pkg-config --cflags gtk+-2.0`
-
+Message: Fix some sloppiness by Zenju.
+diff -Naur -x '*.orig' -x '*.rej' -x .git 11.21-0/FreeFileSync/Source/application.cpp 11.21-1/FreeFileSync/Source/application.cpp
+--- 11.21-0/FreeFileSync/Source/application.cpp 2022-05-22 17:09:32.234809499 -0400
++++ 11.21-1/FreeFileSync/Source/application.cpp 2022-05-24 08:36:51.949159500 -0400
+@@ -92,7 +92,7 @@
+ ZEN_ON_SCOPE_EXIT(if (error) ::g_error_free(error));
+
+ ::gtk_css_provider_load_from_path(provider, //GtkCssProvider* css_provider,
+- (getResourceDirPf() + fileName).c_str(), //const gchar* path,
++ (getResourceDirPath() + fileName).c_str(), //const gchar* path,
+ &error); //GError** error
+ if (error)
+ throw SysError(formatGlibError("gtk_css_provider_load_from_path", error));
+--- 11.21-0/FreeFileSync/Source/RealTimeSync/application.cpp 2022-05-22 17:09:32.226809398 -0400
++++ 11.21-1/FreeFileSync/Source/RealTimeSync/application.cpp 2022-05-25 09:15:00.262617987 -0400
+@@ -68,7 +68,7 @@
+ ZEN_ON_SCOPE_EXIT(if (error) ::g_error_free(error));
+
+ ::gtk_css_provider_load_from_path(provider, //GtkCssProvider* css_provider,
+- (fff::getResourceDirPf() + fileName).c_str(), //const gchar* path,
++ (fff::getResourceDirPath() + fileName).c_str(), //const gchar* path,
+ &error); //GError** error
+ if (error)
+ throw SysError(formatGlibError("gtk_css_provider_load_from_path", error));
bgstack15