diff options
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | PKGBUILD | 42 | ||||
| -rw-r--r-- | far2l-add-gvfs.patch | 12 | ||||
| -rw-r--r-- | far2l-desktop.patch | 15 |
4 files changed, 30 insertions, 65 deletions
@@ -1,24 +1,26 @@ pkgbase = far2l-git pkgdesc = Linux port of FAR v2 - pkgver = r1127.4c12ff1 - pkgrel = 2 + pkgver = r3850.fe3da218 + pkgrel = 1 url = https://github.com/elfmz/far2l arch = i686 arch = x86_64 license = GPL2 makedepends = git makedepends = cmake - depends = wxgtk - depends = gtkmm3 - depends = openssl-1.0 + depends = xerces-c + depends = fmt + depends = uchardet + depends = wxwidgets-gtk3 + optdepends = libxi: TTY X11 backend + optdepends = openssl: FTPS support in NetRocks + optdepends = libssh: SFTP support in NetRocks + optdepends = smbclient: SMB support in NetRocks + optdepends = libnfs: NFS support in NetRocks + optdepends = neon: WebDAV support in NetRocks + optdepends = pcre: custom archives support in multiarc + optdepends = libarchive: more archive type support in multiarc source = git+https://github.com/elfmz/far2l - source = git+https://github.com/cycleg/far-gvfs#commit=7ea1a87fbe3e0c6cc42a4c2e7067d04758587894 - source = far2l-add-gvfs.patch - source = far2l-desktop.patch sha256sums = SKIP - sha256sums = SKIP - sha256sums = d75dcd5ac96d0b7d2b7964620191d9e81733380ddf47dedf8b5aef1255686fd7 - sha256sums = 56aca91c73d5fa5072c422d8e3df567a931d01850f92d3f5c046f27bc957c8c3 pkgname = far2l-git - @@ -1,45 +1,35 @@ # Maintainer: Martins Mozeiko <martins.mozeiko@gmail.com> pkgname=far2l-git -pkgver=r1127.4c12ff1 -pkgrel=2 +pkgver=r3850.fe3da218 +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' - 'git+https://github.com/cycleg/far-gvfs#commit=7ea1a87fbe3e0c6cc42a4c2e7067d04758587894' - 'far2l-add-gvfs.patch' - 'far2l-desktop.patch') -sha256sums=('SKIP' - 'SKIP' - 'd75dcd5ac96d0b7d2b7964620191d9e81733380ddf47dedf8b5aef1255686fd7' - '56aca91c73d5fa5072c422d8e3df567a931d01850f92d3f5c046f27bc957c8c3' - ) +source=('git+https://github.com/elfmz/far2l') +sha256sums=('SKIP') makedepends=('git' 'cmake') -depends=('wxgtk' 'gtkmm3' 'openssl-1.0') +depends=('xerces-c' 'fmt' 'uchardet' 'wxwidgets-gtk3') +optdepends=( + 'libxi: TTY X11 backend' + 'openssl: FTPS support in NetRocks' + 'libssh: SFTP support in NetRocks' + 'smbclient: SMB support in NetRocks' + 'libnfs: NFS support in NetRocks' + 'neon: WebDAV support in NetRocks' + 'pcre: custom archives support in multiarc' + 'libarchive: more archive type support in multiarc' +) pkgver() { cd "$srcdir"/far2l printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -prepare() { - cd "$srcdir"/far2l - - patch -p1 -i "$srcdir"/far2l-add-gvfs.patch - patch -p1 -i "$srcdir"/far2l-desktop.patch -} - package() { - cd "$srcdir"/far2l - rm -rf far-gvfs - mv "$srcdir"/far-gvfs ./ - PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig cmake . -DCMAKE_INSTALL_PREFIX="$pkgdir"/usr -DCMAKE_BUILD_TYPE=Release + 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-add-gvfs.patch b/far2l-add-gvfs.patch deleted file mode 100644 index dd11dee73414..000000000000 --- a/far2l-add-gvfs.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-desktop.patch b/far2l-desktop.patch deleted file mode 100644 index a78694c2ed4f..000000000000 --- a/far2l-desktop.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/far2l/DE/far2l.desktop b/far2l/DE/far2l.desktop -index ba70e73..67eb2ce 100644 ---- a/far2l/DE/far2l.desktop -+++ b/far2l/DE/far2l.desktop -@@ -3,8 +3,8 @@ Type=Application - Name=far2l - GenericName=far2l - Comment=File and archieve manager --Exec=${CMAKE_INSTALL_PREFIX}/bin/far2l --TryExec=${CMAKE_INSTALL_PREFIX}/bin/far2l -+Exec=/usr/bin/far2l -+TryExec=/usr/bin/far2l - Terminal=false - Categories=Utility;FileManager; - Icon=far2l |