From b57bf58068082f29dd5cb9450bf886347e46d752 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Mon, 6 Jul 2020 13:50:43 +0300
Subject: [PATCH 1/4] Use std::vector in CArray realization. Deprecated class!

---
 Common/base.pri              | 2 ++
 DesktopEditor/common/Array.h | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Common/base.pri b/Common/base.pri
index e07c164c74..db6f9ab3bd 100644
--- a/Common/base.pri
+++ b/Common/base.pri
@@ -67,6 +67,8 @@ isEqual(QT_MAJOR_VERSION, 5) {
     }
 }
 
+DEFINES += INTERNAL_USE_ARRAY_AS_VECTOR
+
 ios {
     CONFIG += core_ios
     DEFINES += _IOS IOS LINUX _LINUX MAC _MAC _XCODE
diff --git a/DesktopEditor/common/Array.h b/DesktopEditor/common/Array.h
index 94b91e8b85..286feea4e0 100644
--- a/DesktopEditor/common/Array.h
+++ b/DesktopEditor/common/Array.h
@@ -35,7 +35,9 @@
 #include "Types.h"
 #include <string.h>
 
-#if 0 //__APPLE__
+#ifdef INTERNAL_USE_ARRAY_AS_VECTOR
+
+// Use std::vector instead this class
 
 #include <vector>
 

From a52bcb32056c40b357c752d5cff425a25eff8604 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Mon, 6 Jul 2020 14:05:06 +0300
Subject: [PATCH 2/4] Fix previous commit

---
 DesktopEditor/common/Array.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/DesktopEditor/common/Array.h b/DesktopEditor/common/Array.h
index 286feea4e0..3dd8ebf6b9 100644
--- a/DesktopEditor/common/Array.h
+++ b/DesktopEditor/common/Array.h
@@ -89,7 +89,7 @@ public:
         
         for (int i = 0; i < nAllocSize; i++)
             Add();
-        
+
         return TRUE;
     }
     
@@ -139,6 +139,11 @@ public:
         }
         return m_aT[nIndex];
     }
+
+	T* GetData()
+	{
+		return m_aT.data();
+	}
     
 private:
     

From 0e7a8c1af940ee3024844ee51277b2d2d376e023 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Mon, 6 Jul 2020 16:14:41 +0300
Subject: [PATCH 3/4] Fix rpath instead runpath

---
 Common/base.pri                       | 6 ++++--
 UnicodeConverter/UnicodeConverter.pro | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Common/base.pri b/Common/base.pri
index db6f9ab3bd..1988c4218e 100644
--- a/Common/base.pri
+++ b/Common/base.pri
@@ -6,7 +6,7 @@ BUILD_NUMBER = $$(BUILD_NUMBER)
 !isEmpty(PRODUCT_VERSION){
     !isEmpty(BUILD_NUMBER){
         VERSION = $${PRODUCT_VERSION}.$${BUILD_NUMBER}
-	}
+    }
 }
 
 DEFINES += INTVER=$$VERSION
@@ -160,7 +160,9 @@ core_windows {
 
 core_linux {
     equals(TEMPLATE, app) {
-        QMAKE_LFLAGS += -Wl,--rpath=./:./system
+        QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\'"
+        QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN/system\'"
+        QMAKE_LFLAGS += -Wl,--disable-new-dtags
     }
 }
 
diff --git a/UnicodeConverter/UnicodeConverter.pro b/UnicodeConverter/UnicodeConverter.pro
index 45adf72c35..01c3bd2873 100644
--- a/UnicodeConverter/UnicodeConverter.pro
+++ b/UnicodeConverter/UnicodeConverter.pro
@@ -15,8 +15,8 @@ include(../Common/base.pri)
 
 DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY
 
-core_linux {
-    QMAKE_LFLAGS += -Wl,--rpath=./
+core_linux {    
+    QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\'"
 }
 
 core_ios {

From d197c0da15c73b841765f1665385fbb504676135 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Mon, 6 Jul 2020 16:55:04 +0300
Subject: [PATCH 4/4] .

---
 UnicodeConverter/UnicodeConverter.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UnicodeConverter/UnicodeConverter.pro b/UnicodeConverter/UnicodeConverter.pro
index 01c3bd2873..06139dd5d7 100644
--- a/UnicodeConverter/UnicodeConverter.pro
+++ b/UnicodeConverter/UnicodeConverter.pro
@@ -17,6 +17,7 @@ DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY
 
 core_linux {    
     QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\'"
+    QMAKE_LFLAGS += -Wl,--disable-new-dtags
 }
 
 core_ios {