fixed build for latest upstream

4 files changed, 19 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a83c9bef58e0..6c8eae7ac50e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = far2l-git
 	pkgdesc = Linux port of FAR v2
-	pkgver = r816.3f8f764
+	pkgver = r1127.4c12ff1
 	pkgrel = 1
 	url = https://github.com/elfmz/far2l
 	arch = i686
@@ -13,10 +13,10 @@ pkgbase = far2l-git
 	depends = openssl-1.0
 	source = git+https://github.com/elfmz/far2l
 	source = git+https://github.com/cycleg/far-gvfs#commit=7ea1a87fbe3e0c6cc42a4c2e7067d04758587894
-	source = far2l.patch
+	source = far2l-add-gvfs.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 7d340146a96a8e0822ff87833766997a5dc83f9e2d232bd6539f5cfb6bbacbe6
+	sha256sums = d75dcd5ac96d0b7d2b7964620191d9e81733380ddf47dedf8b5aef1255686fd7
 
 pkgname = far2l-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ea90b20840c5..b51b10ca14cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Martins Mozeiko <martins.mozeiko@gmail.com>
 
 pkgname=far2l-git
-pkgver=r816.3f8f764
+pkgver=r1127.4c12ff1
 pkgrel=1
 pkgdesc='Linux port of FAR v2'
 url='https://github.com/elfmz/far2l'
@@ -9,10 +9,10 @@ arch=('i686' 'x86_64')
 license=('GPL2')
 source=('git+https://github.com/elfmz/far2l'
         'git+https://github.com/cycleg/far-gvfs#commit=7ea1a87fbe3e0c6cc42a4c2e7067d04758587894'
-        'far2l.patch')
+        'far2l-add-gvfs.patch')
 sha256sums=('SKIP'
             'SKIP'
-            '7d340146a96a8e0822ff87833766997a5dc83f9e2d232bd6539f5cfb6bbacbe6'
+            'd75dcd5ac96d0b7d2b7964620191d9e81733380ddf47dedf8b5aef1255686fd7'
            )
 makedepends=('git' 'cmake')
 depends=('wxgtk' 'gtkmm3' 'openssl-1.0')
@@ -25,7 +25,7 @@ pkgver() {
 prepare() {
   cd "$srcdir"/far2l
 
-  patch -p1 -i "$srcdir"/far2l.patch
+  patch -p1 -i "$srcdir"/far2l-add-gvfs.patch
 }
 
 package() {
diff --git a/far2l-add-gvfs.patch b/far2l-add-gvfs.patch
new file mode 100644
index 000000000000..dd11dee73414
--- /dev/null
+++ b/far2l-add-gvfs.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13b92c4..63e463c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,6 +54,7 @@ add_subdirectory (editcase)
+ add_subdirectory (align)
+ add_subdirectory (autowrap)
+ add_subdirectory (drawline)
++add_subdirectory (far-gvfs)
+ add_subdirectory (editorcomp)
+ 
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/far2l.patch b/far2l.patch
deleted file mode 100644
index 340509c1f95e..000000000000
--- a/far2l.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13b92c4..63e463c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,9 +6,9 @@ if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release")
- endif()
- 
--#if(NOT CMAKE_INSTALL_PREFIX)
-+if(NOT CMAKE_INSTALL_PREFIX)
-    set(CMAKE_INSTALL_PREFIX "/usr")
--#endif()
-+endif()
- 
- 
- 
-@@ -54,6 +54,7 @@ add_subdirectory (editcase)
- add_subdirectory (align)
- add_subdirectory (autowrap)
- add_subdirectory (drawline)
-+add_subdirectory (far-gvfs)
- add_subdirectory (editorcomp)
- 
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-diff --git a/far2l/CMakeLists.txt b/far2l/CMakeLists.txt
-index cfde084..aa30aa1 100644
---- a/far2l/CMakeLists.txt
-+++ b/far2l/CMakeLists.txt
-@@ -188,6 +188,6 @@ add_custom_command(TARGET far2l POST_BUILD
- if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- #TODO
- else()
--    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/DE/icons" DESTINATION "/usr/share" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*")
--    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l.desktop" DESTINATION "/usr/share/applications")
-+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/DE/icons" DESTINATION "${CMAKE_INSTALL_PREFIX}/share" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*")
-+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
- endif()