ubuntu-touch-coreapps-reviewers team mailing list archive

[Carlos Jose Mazieri <carlos.mazieri@xxxxxxxxx>]

Carlos Jose Mazieri has proposed merging lp:~carlos-mazieri/ubuntu-filemanager-app/samba-crash into lp:ubuntu-filemanager-app.

Commit message:
Fixes the crash in Samba browsing files related to the "struct stat" accessing files using 32 bits only.

Requested reviews:
  Ubuntu File Manager Developers (ubuntu-filemanager-dev)

For more details, see:
https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/samba-crash/+merge/272998

Fixes the crash in Samba browsing files related to the "struct stat" accessing files using 32 bits only.
-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~carlos-mazieri/ubuntu-filemanager-app/samba-crash into lp:ubuntu-filemanager-app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-08 10:45:41 +0000
+++ CMakeLists.txt	2015-09-30 23:27:32 +0000
@@ -21,6 +21,10 @@
 set(CONTENT_HUB_EXPORTER hub-exporter.json)
 set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
 
+# global FILE definitions for stat system call, it works for any sub module
+add_definitions(-D_LARGEFILE_SOURCE)
+add_definitions(-D_FILE_OFFSET_BITS=64)
+
 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
         set(BZR_SOURCE "lp:${LP_PROJECT}")

=== modified file 'po/be.po'
--- po/be.po	2015-09-28 06:14:27 +0000
+++ po/be.po	2015-09-30 23:27:32 +0000
@@ -8,16 +8,26 @@
 "Project-Id-Version: ubuntu-filemanager-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2015-03-12 21:23+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2015-09-14 15:41+0000\n"
 "Last-Translator: Siamion Šachalevič <semen.shah@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2015-09-14 15:41+0000\n"
+"Last-Translator: Arsień Šachalevič <semen.shah@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Belarusian <be@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2015-09-28 06:14+0000\n"
 "X-Generator: Launchpad (build 17754)\n"
+=======
+"X-Launchpad-Export-Date: 2015-09-15 05:42+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/components/FolderIconView.qml:57
 #: ../src/app/qml/components/FolderListView.qml:35

=== modified file 'po/gl.po'
--- po/gl.po	2015-09-28 06:14:27 +0000
+++ po/gl.po	2015-09-30 23:27:32 +0000
@@ -15,8 +15,13 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2015-09-28 06:14+0000\n"
 "X-Generator: Launchpad (build 17754)\n"
+=======
+"X-Launchpad-Export-Date: 2015-09-19 05:34+0000\n"
+"X-Generator: Launchpad (build 17746)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/components/FolderIconView.qml:57
 #: ../src/app/qml/components/FolderListView.qml:35

=== modified file 'po/pl.po'
--- po/pl.po	2015-09-28 06:14:27 +0000
+++ po/pl.po	2015-09-30 23:27:32 +0000
@@ -16,8 +16,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2015-09-28 06:14+0000\n"
 "X-Generator: Launchpad (build 17754)\n"
+=======
+"X-Launchpad-Export-Date: 2015-08-31 05:19+0000\n"
+"X-Generator: Launchpad (build 17690)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/components/FolderIconView.qml:57
 #: ../src/app/qml/components/FolderListView.qml:35

=== modified file 'po/sr.po'
--- po/sr.po	2015-09-28 06:14:27 +0000
+++ po/sr.po	2015-09-30 23:27:32 +0000
@@ -16,8 +16,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2015-09-28 06:14+0000\n"
 "X-Generator: Launchpad (build 17754)\n"
+=======
+"X-Launchpad-Export-Date: 2015-09-09 05:40+0000\n"
+"X-Generator: Launchpad (build 17706)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/components/FolderIconView.qml:57
 #: ../src/app/qml/components/FolderListView.qml:35

=== modified file 'src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri'
--- src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri	2015-07-15 17:42:37 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri	2015-09-30 23:27:32 +0000
@@ -24,4 +24,6 @@
 CONFIG    *= link_pkgconfig
 PKGCONFIG *= smbclient
 
+DEFINES *= _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
+
 INCLUDEPATH += $$PWD/src