summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartins Mozeiko2017-05-30 13:59:33 -0700
committerMartins Mozeiko2017-05-30 13:59:33 -0700
commitb3a638428916d18d9edf3f377aea1db520b3c47c (patch)
tree07567978a0c3830094c7da03a9c6c5dedbd6282a
parent2e69e1522c4894af722fd2fccfc3aa997307d4d9 (diff)
downloadaur-b3a638428916d18d9edf3f377aea1db520b3c47c.tar.gz
fixed build for latest upstream
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--far2l.patch24
3 files changed, 29 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 53946ceca215..d5e5043eb001 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = far2l-git
pkgdesc = Linux port of FAR v2
- pkgver = r785.ab24037
+ pkgver = r787.1330e85
pkgrel = 1
url = https://github.com/elfmz/far2l
arch = i686
@@ -16,7 +16,7 @@ pkgbase = far2l-git
source = far2l.patch
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 068b54cccc807c90a3874ac0c4cbf6891a8f4e53ea384a566b9f4cba358c2a52
+ sha256sums = a0f97d7262f450aa1757408301746e6be21fabf18dae31ffe17fee69b30de65d
pkgname = far2l-git
diff --git a/PKGBUILD b/PKGBUILD
index c74797606c1b..d250c9b4a54f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Martins Mozeiko <martins.mozeiko@gmail.com>
pkgname=far2l-git
-pkgver=r785.ab24037
+pkgver=r787.1330e85
pkgrel=1
pkgdesc='Linux port of FAR v2'
url='https://github.com/elfmz/far2l'
@@ -12,7 +12,8 @@ source=('git+https://github.com/elfmz/far2l'
'far2l.patch')
sha256sums=('SKIP'
'SKIP'
- '068b54cccc807c90a3874ac0c4cbf6891a8f4e53ea384a566b9f4cba358c2a52')
+ 'a0f97d7262f450aa1757408301746e6be21fabf18dae31ffe17fee69b30de65d'
+ )
makedepends=('git' 'cmake')
depends=('wxgtk' 'gtkmm3' 'openssl-1.0')
diff --git a/far2l.patch b/far2l.patch
index bfc628ebdfe1..afd3d65dd474 100644
--- a/far2l.patch
+++ b/far2l.patch
@@ -35,4 +35,28 @@ 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>
+diff --git a/WinPort/src/CallInMain.h b/WinPort/src/CallInMain.h
+index 78828b6..6cd058e 100644
+--- a/WinPort/src/CallInMain.h
++++ b/WinPort/src/CallInMain.h
+@@ -1,6 +1,7 @@
+ #pragma once
+ #include <mutex>
+ #include <condition_variable>
++#include <functional>
+
+ template<class RV, class FN>
+ class InMainCaller