summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--far2l.patch12
3 files changed, 6 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5cc357f704f..cefb94a05048 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = far2l-git
pkgdesc = Linux port of FAR v2
pkgver = r800.de1a692
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/elfmz/far2l
arch = i686
arch = x86_64
@@ -12,11 +12,11 @@ pkgbase = far2l-git
depends = gtkmm3
depends = openssl-1.0
source = git+https://github.com/elfmz/far2l
- source = git+https://github.com/cycleg/far-gvfs
+ source = git+https://github.com/cycleg/far-gvfs#commit=7ea1a87fbe3e0c6cc42a4c2e7067d04758587894
source = far2l.patch
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 4f48df42b7c503e26f911b9d5523fc79706dbc8bd40822d9bacd50dc3be5d583
+ sha256sums = 447ba9d12883642c19510ef2dfd5091a78a80886939640009cad1710f5da19c0
pkgname = far2l-git
diff --git a/PKGBUILD b/PKGBUILD
index 7fcc35a4d496..c9cdd94cb143 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,17 @@
pkgname=far2l-git
pkgver=r800.de1a692
-pkgrel=1
+pkgrel=2
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'
- 'git+https://github.com/cycleg/far-gvfs'
+ 'git+https://github.com/cycleg/far-gvfs#commit=7ea1a87fbe3e0c6cc42a4c2e7067d04758587894'
'far2l.patch')
sha256sums=('SKIP'
'SKIP'
- '4f48df42b7c503e26f911b9d5523fc79706dbc8bd40822d9bacd50dc3be5d583'
+ '447ba9d12883642c19510ef2dfd5091a78a80886939640009cad1710f5da19c0'
)
makedepends=('git' 'cmake')
depends=('wxgtk' 'gtkmm3' 'openssl-1.0')
diff --git a/far2l.patch b/far2l.patch
index f07d7eca45ae..34241b66e8cb 100644
--- a/far2l.patch
+++ b/far2l.patch
@@ -35,15 +35,3 @@ index 7213211..b894d7d 100644
+ 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()
-diff --git a/WinPort/src/APIClipboard.cpp b/WinPort/src/APIClipboard.cpp
-index 3c668cd..041010c 100644
---- a/WinPort/src/APIClipboard.cpp
-+++ b/WinPort/src/APIClipboard.cpp
-@@ -12,6 +12,7 @@
- #include <iostream>
- #include <fstream>
- #include <mutex>
-+#include <functional>
- #include <condition_variable>
- #include <wx/wx.h>
- #include <wx/display.h>