Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-crash-fix into lp:ubuntu-filemanager-app

Proposed by Carlos Jose Mazieri on 2015-09-30
Status: Merged
Approved by: Arto Jalkanen on 2015-10-01
Approved revision: 473
Merged at revision: 475
Proposed branch: lp:~carlos-mazieri/ubuntu-filemanager-app/samba-crash-fix
Merge into: lp:ubuntu-filemanager-app
Diff against target: 25 lines (+6/-0)
2 files modified
CMakeLists.txt (+4/-0)
src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri (+2/-0)
To merge this branch: bzr merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-crash-fix
Reviewer Review Type Date Requested Status
Arto Jalkanen 2015-09-30 Approve on 2015-10-01
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-09-30
Review via email: mp+273000@code.launchpad.net

Commit message

Fixes Samba browsing crash on he phone related to the "struct stat" addressing files using 32 bits only instead of 64 bits

Description of the change

Fixes Samba browsing crash on he phone related to the "struct stat" addressing files using 32 bits only instead of 64 bits

To post a comment you must log in.
review: Approve (continuous-integration)
Arto Jalkanen (ajalkane) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-09-08 10:45:41 +0000
3+++ CMakeLists.txt 2015-09-30 23:42:20 +0000
4@@ -21,6 +21,10 @@
5 set(CONTENT_HUB_EXPORTER hub-exporter.json)
6 set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
7
8+# global FILE definitions for stat system call, it works for any sub module
9+add_definitions(-D_LARGEFILE_SOURCE)
10+add_definitions(-D_FILE_OFFSET_BITS=64)
11+
12 if(CLICK_MODE)
13 if(NOT DEFINED BZR_SOURCE)
14 set(BZR_SOURCE "lp:${LP_PROJECT}")
15
16=== modified file 'src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri'
17--- src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri 2015-07-15 17:42:37 +0000
18+++ src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri 2015-09-30 23:42:20 +0000
19@@ -24,4 +24,6 @@
20 CONFIG *= link_pkgconfig
21 PKGCONFIG *= smbclient
22
23+DEFINES *= _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
24+
25 INCLUDEPATH += $$PWD/src

Subscribers

People subscribed via source and target branches