add gvfs plugin

4 files changed, 47 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f1733c5c10d..53946ceca215 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = far2l-git
 	pkgdesc = Linux port of FAR v2
-	pkgver = r680.c87ad2f
-	pkgrel = 3
+	pkgver = r785.ab24037
+	pkgrel = 1
 	url = https://github.com/elfmz/far2l
 	arch = i686
 	arch = x86_64
@@ -9,10 +9,14 @@ pkgbase = far2l-git
 	makedepends = git
 	makedepends = cmake
 	depends = wxgtk
+	depends = gtkmm3
+	depends = openssl-1.0
 	source = git+https://github.com/elfmz/far2l
-	source = far2l_install.patch
+	source = git+https://github.com/cycleg/far-gvfs
+	source = far2l.patch
 	sha256sums = SKIP
-	sha256sums = 22ed1b899a2855afd4adb8e1cb81703dd56ade20e6449f893181232999b4cab4
+	sha256sums = SKIP
+	sha256sums = 068b54cccc807c90a3874ac0c4cbf6891a8f4e53ea384a566b9f4cba358c2a52
 
 pkgname = far2l-git
 
diff --git a/.gitignore b/.gitignore
index a41e7aef8bb4..de5b7092351c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 far2l
+far-gvfs
 src
 pkg
 *.pkg.tar*
diff --git a/PKGBUILD b/PKGBUILD
index 7ae4ee3b8bc6..c74797606c1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,20 @@
 # Maintainer: Martins Mozeiko <martins.mozeiko@gmail.com>
 
 pkgname=far2l-git
-pkgver=r680.c87ad2f
-pkgrel=3
+pkgver=r785.ab24037
+pkgrel=1
 pkgdesc='Linux port of FAR v2'
 url='https://github.com/elfmz/far2l'
 arch=('i686' 'x86_64')
 license=('GPL2')
 source=('git+https://github.com/elfmz/far2l'
-        'far2l_install.patch')
+        'git+https://github.com/cycleg/far-gvfs'
+        'far2l.patch')
 sha256sums=('SKIP'
-            '22ed1b899a2855afd4adb8e1cb81703dd56ade20e6449f893181232999b4cab4')
+            'SKIP'
+            '068b54cccc807c90a3874ac0c4cbf6891a8f4e53ea384a566b9f4cba358c2a52')
 makedepends=('git' 'cmake')
-depends=('wxgtk')
+depends=('wxgtk' 'gtkmm3' 'openssl-1.0')
 
 pkgver() {
   cd "$srcdir"/far2l
@@ -22,16 +24,17 @@ pkgver() {
 prepare() {
   cd "$srcdir"/far2l
 
-  patch -p1 -i "$srcdir"/far2l_install.patch
+  patch -p1 -i "$srcdir"/far2l.patch
 }
 
 package() {
 
   cd "$srcdir"/far2l
-  cmake . -DCMAKE_INSTALL_PREFIX="$pkgdir"/usr -DCMAKE_BUILD_TYPE=Release
-  cmake --build .
+  rm -rf far-gvfs
+  mv "$srcdir"/far-gvfs ./
 
-  make install
+  PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig cmake . -DCMAKE_INSTALL_PREFIX="$pkgdir"/usr -DCMAKE_BUILD_TYPE=Release
+  cmake --build . --target install
 
   ln -sf ../../bin/far2l "$pkgdir"/usr/lib/far2l/far2l_askpass
   ln -sf ../../bin/far2l "$pkgdir"/usr/lib/far2l/far2l_sudoapp
diff --git a/far2l_install.patch b/far2l.patch
index def307b5ffee..bfc628ebdfe1 100644
--- a/far2l_install.patch
+++ b/far2l.patch
@@ -1,19 +1,5 @@
-diff --git a/far2l/CMakeLists.txt b/far2l/CMakeLists.txt
-index 7213211..3aa507d 100644
---- a/far2l/CMakeLists.txt
-+++ b/far2l/CMakeLists.txt
-@@ -187,6 +187,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()
-[mmozeiko@BHQKCX1 far2l]$ git diff CMakeLists.txt  far2l/CMakeLists.txt
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ca2753..52d1442 100644
+index 5f3f133..08463ec 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -6,9 +6,9 @@ if(NOT CMAKE_BUILD_TYPE)
@@ -25,3 +11,28 @@ index 4ca2753..52d1442 100644
     set(CMAKE_INSTALL_PREFIX "/usr")
 -#endif()
 +endif()
+ 
+ 
+ 
+@@ -53,6 +53,7 @@ add_subdirectory (editcase)
+ add_subdirectory (align)
+ add_subdirectory (autowrap)
+ add_subdirectory (drawline)
++add_subdirectory (far-gvfs)
+ 
+ install(PROGRAMS "${INSTALL_DIR}/far2l" DESTINATION "bin" )
+ 
+diff --git a/far2l/CMakeLists.txt b/far2l/CMakeLists.txt
+index 7213211..b894d7d 100644
+--- a/far2l/CMakeLists.txt
++++ b/far2l/CMakeLists.txt
+@@ -187,6 +187,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()
+