Skip to content

Commit 2a05cb3

Browse files
author
livecodeali
committed
Merge branch 'develop-8.0' of github.com:livecode/livecode into community-docs
2 parents 2dcd2cd + 69a2fb3 commit 2a05cb3

File tree

7 files changed

+22
-12
lines changed

7 files changed

+22
-12
lines changed

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[submodule "ide"]
22
path = ide
33
url = https://github.com/runrev/livecode-ide
4-
branch = develop
4+
branch = develop-8.0
55
[submodule "thirdparty"]
66
path = thirdparty
77
url = https://github.com/runrev/livecode-thirdparty
8-
branch = develop
8+
branch = develop-8.0
99
[submodule "libcpptest/googletest"]
1010
path = libcpptest/googletest
1111
url = https://github.com/google/googletest.git

‎Installer/package.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -746,9 +746,13 @@ component Externals.CEF.Linux
746746
file linux-[[TargetArchitecture]]:CEF/cef_100_percent.pak
747747
file linux-[[TargetArchitecture]]:CEF/cef_200_percent.pak
748748
file linux-[[TargetArchitecture]]:CEF/icudtl.dat
749+
file linux-[[TargetArchitecture]]:CEF/natives_blob.bin
750+
file linux-[[TargetArchitecture]]:CEF/snapshot_blob.bin
749751
// Horrible workaround for a libCEF bug
750752
into [[TargetFolder]] place
751753
file linux-[[TargetArchitecture]]:CEF/icudtl.dat
754+
file linux-[[TargetArchitecture]]:CEF/natives_blob.bin
755+
file linux-[[TargetArchitecture]]:CEF/snapshot_blob.bin
752756
executable linux-[[TargetArchitecture]]:revbrowser-cefprocess
753757
executable linux-[[TargetArchitecture]]:libbrowser-cefprocess
754758

@@ -769,6 +773,8 @@ component Externals.CEF.Windows
769773
file windows:CEF/cef_100_percent.pak
770774
file windows:CEF/cef_200_percent.pak
771775
file windows:CEF/icudtl.dat
776+
file windows:CEF/natives_blob.bin
777+
file windows:CEF/snapshot_blob.bin
772778

773779
////////////////////////////////////////////////////////////////////////////////
774780

‎docs/notes/bugfix-11118.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix potential crash when cancelling photo picking on Android.

‎docs/notes/bugfix-17327.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix CEF crash on Linux when using browser widget

‎engine/src/mblandroidcamera.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,9 @@ bool MCSystemAcquirePhoto(MCPhotoSourceType p_source, int32_t p_max_width, int32
134134
{
135135
if (s_pick_photo_err != nil)
136136
{
137-
/* UNCHECKED */ MCStringCreateWithCString(s_pick_photo_err, r_result);
138-
delete s_pick_photo_err;
137+
/* UNCHECKED */ MCStringCreateWithCString(s_pick_photo_err, r_result);
138+
MCCStringFree(s_pick_photo_err);
139+
s_pick_photo_err = nil;
139140
}
140141
else
141142
/* UNCHECKED */MCStringCreateWithCString("cancel", r_result);

‎ide-support/revsaveasstandalone.livecodescript‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,8 +2039,13 @@ private command revCopyCEFResources pPlatform, pStandalonePath, pCopyRevBrowserR
20392039
// make sure we only copy the required helper process executable
20402040
put revListFiles(tCEFResources) into tCEFFiles
20412041
filter lines of tCEFFiles not matching "*-cefprocess"
2042-
// icudtl.dat needs to be placed alongside the executable
2043-
filter lines of tCEFFiles not matching "icudtl.dat"
2042+
2043+
// The following files need to be placed alongside the executable
2044+
local tCefTopLevelFiles = "icudtl.dat,natives_blob.bin,snapshot_blob.bin"
2045+
replace comma with return in tCefTopLevelFiles
2046+
repeat for each line tFile in tCefTopLevelFiles
2047+
filter lines of tCEFFiles not matching tFile
2048+
end repeat
20442049

20452050
// Copy files to CEF resource folder.
20462051
repeat for each line tCEFFile in tCEFFiles
@@ -2056,7 +2061,7 @@ private command revCopyCEFResources pPlatform, pStandalonePath, pCopyRevBrowserR
20562061
end if
20572062

20582063
// Copy files to standalone folder
2059-
put "icudtl.dat" & return into tCEFFiles
2064+
put tCefTopLevelFiles & return into tCEFFiles
20602065
if pCopyRevBrowserResources then
20612066
put "revbrowser-cefprocess" & return after tCEFFiles
20622067
end if

‎ide-support/revsblibrary.livecodescript‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,21 +237,17 @@ private command __revSBCopyFolder pSource, pTarget, pCallback, pCallbackTarget
237237
exit repeat
238238
end if
239239
if the platform is "macos" then -- stat it and set some flags
240-
local tUser, tGroup, tPermissions
240+
local tUser, tGroup
241241
set the itemDelimiter to "/"
242242
set the defaultFolder to pSource & "/" & item 1 to -2 of tResource
243243
get the detailed folders
244244
filter it with (the urlEncode of item -1 of tResource) & "*"
245245
set the itemDelimiter to ","
246246
put item 8 of it into tUser
247247
put item 9 of it into tGroup
248-
put item 10 of it into tPermissions
249248
if tUser is not empty or tGroup is not empty then
250249
get shell("chown" && tUser & ":" & tGroup && quote & pTarget & "/" & char 1 to -2 of tResource & quote)
251250
end if
252-
if tPermissions is not empty and tPermissions is a number then
253-
get shell("chmod" && tPermissions && quote & pTarget & "/" & char 1 to -2 of tResource & quote)
254-
end if
255251
end if
256252
# Creating a folder takes no time, so do not send a callback.
257253
else if tResource is not empty then

0 commit comments

Comments
 (0)