Skip to content

C
chromebrew
Commit 9528ecec authored by Ed Reel's avatar Ed Reel
Browse files
Options

Resolve merge conflicts with v2ray, libfilezilla, filezilla and curl

parents 40d13b8d 5b35fd6b
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 64 deletions
packages/curl.rb
View file @ 9528ecec
...@@ -3,22 +3,22 @@ require 'package' ...@@ -3,22 +3,22 @@ require 'package'
class Curl < Package class Curl < Package
description 'Command line tool and library for transferring data with URLs.' description 'Command line tool and library for transferring data with URLs.'
homepage 'https://curl.haxx.se/' homepage 'https://curl.haxx.se/'
version '7.69.1' version '7.70.0'
compatibility 'all' compatibility 'all'
source_url 'https://curl.haxx.se/download/curl-7.69.1.tar.xz' source_url 'https://curl.haxx.se/download/curl-7.70.0.tar.xz'
source_sha256 '03c7d5e6697f7b7e40ada1b2256e565a555657398e6c1fcfa4cb251ccd819d4f' source_sha256 '032f43f2674008c761af19bf536374128c16241fb234699a55f9fb603fcfbae7'
binary_url ({ binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.69.1-chromeos-armv7l.tar.xz', aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.70.0-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.69.1-chromeos-armv7l.tar.xz', armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.70.0-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.69.1-chromeos-i686.tar.xz', i686: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.70.0-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.69.1-chromeos-x86_64.tar.xz', x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.70.0-chromeos-x86_64.tar.xz',
}) })
binary_sha256 ({ binary_sha256 ({
aarch64: '991776840afbdf259a7d0e2c04669cfdbc6732f99c1f967541ede6be8d4b3623', aarch64: '267a2e42282fe8d75d2ea5f2b7a85d06a34b002a7f2ee6e5f473a1082bf6b79a',
armv7l: '991776840afbdf259a7d0e2c04669cfdbc6732f99c1f967541ede6be8d4b3623', armv7l: '267a2e42282fe8d75d2ea5f2b7a85d06a34b002a7f2ee6e5f473a1082bf6b79a',
i686: '62ed095da0b4344ef7e6d73d474d76899a5d8c3c62b8b337159d2707e5b494b3', i686: '9c1341459a7febb56423108c4a60f0d6c7ea0d616c96fc36b4fbc2e01fe8ff76',
x86_64: 'ad171822283ad474aa1235ce385541c66e08f299441d6e0d718b2272c5e56cbf', x86_64: '8a66e93101ff728ef712d05080cfbb028a57f344fe7c4548c01efa2c6ef1d955',
}) })
depends_on 'groff' => :build depends_on 'groff' => :build
...@@ -32,20 +32,8 @@ class Curl < Package ...@@ -32,20 +32,8 @@ class Curl < Package
def self.build def self.build
ENV['LIBRARY_PATH'] = CREW_LIB_PREFIX ENV['LIBRARY_PATH'] = CREW_LIB_PREFIX
ENV['TMPDIR'] = "#{CREW_PREFIX}/tmp" ENV['TMPDIR'] = "#{CREW_PREFIX}/tmp"
system './configure', system "./configure #{CREW_OPTIONS} --disable-maintainer-mode --enable-libcurl-option --with-libmetalink \
"--prefix=#{CREW_PREFIX}", --disable-static --disable-debug --with-libssh2 --with-nghttp2 --with-brotli --enable-ldap --with-ssl"
"--libdir=#{CREW_LIB_PREFIX}",
'--disable-dependency-tracking',
'--disable-maintainer-mode',
'--enable-libcurl-option',
'--with-libmetalink',
'--disable-static',
'--disable-debug',
'--with-libssh2',
'--with-nghttp2',
'--with-brotli',
'--enable-ldap',
'--with-ssl'
system 'make' system 'make'
end end
......
packages/filezilla.rb
View file @ 9528ecec
...@@ -3,22 +3,22 @@ require 'package' ...@@ -3,22 +3,22 @@ require 'package'
class Filezilla < Package class Filezilla < Package
description 'FileZilla Client is a free FTP solution.' description 'FileZilla Client is a free FTP solution.'
homepage 'https://filezilla-project.org/' homepage 'https://filezilla-project.org/'
version '3.46.3' version '3.48.1'
compatibility 'all' compatibility 'all'
source_url 'https://download.filezilla-project.org/client/FileZilla_3.46.3_src.tar.bz2' source_url 'https://download.filezilla-project.org/client/FileZilla_3.48.1_src.tar.bz2'
source_sha256 'f1c5bff0a99c39447a5ea9fdfcc16cc408876ef52fa8d5e7bf041ea0717a7395' source_sha256 'abffd877ff9006e8e50ce4957393f0a27cc0a7360e626123ef15974eee13ef5d'
binary_url ({ binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/filezilla-3.46.3-chromeos-armv7l.tar.xz', aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/filezilla-3.48.1-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/filezilla-3.46.3-chromeos-armv7l.tar.xz', armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/filezilla-3.48.1-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/filezilla-3.46.3-chromeos-i686.tar.xz', i686: 'https://dl.bintray.com/chromebrew/chromebrew/filezilla-3.48.1-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/filezilla-3.46.3-chromeos-x86_64.tar.xz', x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/filezilla-3.48.1-chromeos-x86_64.tar.xz',
}) })
binary_sha256 ({ binary_sha256 ({
aarch64: '47a8469458b831385a5120538a967ffe947d4e072c9075f19d0c9f15e4a2ccab', aarch64: 'c513db2c717525df2ef6736ef4c4f04244fbb4a972b0ac3f4cd68b315a26799b',
armv7l: '47a8469458b831385a5120538a967ffe947d4e072c9075f19d0c9f15e4a2ccab', armv7l: 'c513db2c717525df2ef6736ef4c4f04244fbb4a972b0ac3f4cd68b315a26799b',
i686: '2c1aa841ff739162478e8bef80097229f1fe66437db2fd41f6f517070c35116f', i686: '29d47a963482a86e3aa8a1b93e0cb333fa1760e885b7c6d074916bf8a694d9c3',
x86_64: '8f3c9199aa0dadec311daba0c0e1c0a06d407376a882da4e4468278b5d806b08', x86_64: '7dbc80bf57b891a2165eb601b0abe2f5079129f8171c17622e4ce2dcd1aa18e8',
}) })
depends_on 'dbus' depends_on 'dbus'
...@@ -32,15 +32,11 @@ class Filezilla < Package ...@@ -32,15 +32,11 @@ class Filezilla < Package
depends_on 'sommelier' depends_on 'sommelier'
def self.build def self.build
system './configure', system "./configure #{CREW_OPTIONS} --disable-maintainer-mode --with-pugixml=builtin"
"--prefix=#{CREW_PREFIX}",
"--libdir=#{CREW_LIB_PREFIX}",
'--disable-maintainer-mode',
'--with-pugixml=builtin'
system 'make' system 'make'
end end
def self.install def self.install
system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
end end
end end
packages/girara.rb 0 → 100644
View file @ 9528ecec
require 'package'
class Girara < Package
description 'Girara is a library that implements a user interface that focuses on simplicity and minimalism'
homepage 'https://pwmt.org/projects/girara/'
version '0.3.4'
source_url 'https://git.pwmt.org/pwmt/girara/-/archive/0.3.4/girara-0.3.4.tar.bz2'
source_sha256 'e78257e4218a0f7f59cc1bea472c7c6794fa51cd9261d87affbe731c1e22c6a5'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/girara-0.3.4-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/girara-0.3.4-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/girara-0.3.4-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/girara-0.3.4-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: '80227f425ebf691df7460693665197e0b1a2fdfbf147a2c94b49e2b446123cad',
armv7l: '80227f425ebf691df7460693665197e0b1a2fdfbf147a2c94b49e2b446123cad',
i686: '57c818963505dd97b50c3776f9b1a3e78ec9b6ef51b22940a5f477bfbcbb0542',
x86_64: '3b3f8d2c75abbe4a2f00b42a94239a988b293857450ca63afa827d4fbd9c436f',
})
depends_on 'gtk3'
depends_on 'glib'
def self.build
system "meson --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} builddir"
system "ninja -C builddir"
end
def self.install
system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install"
end
end
packages/libfilezilla.rb
View file @ 9528ecec
...@@ -3,32 +3,30 @@ require 'package' ...@@ -3,32 +3,30 @@ require 'package'
class Libfilezilla < Package class Libfilezilla < Package
description 'libfilezilla is a small and modern C++ library, offering some basic functionality to build high-performing, platform-independent programs.' description 'libfilezilla is a small and modern C++ library, offering some basic functionality to build high-performing, platform-independent programs.'
homepage 'https://lib.filezilla-project.org/' homepage 'https://lib.filezilla-project.org/'
version '0.19.3' version '0.22.0'
compatibility 'all' compatibility 'all'
source_url 'https://download.filezilla-project.org/libfilezilla/libfilezilla-0.19.3.tar.bz2' source_url 'https://download.filezilla-project.org/libfilezilla/libfilezilla-0.22.0.tar.bz2'
source_sha256 'a43d49f86d5550e9a81aee2394bac066333d5bb47943e92c629cb9d52037b43a' source_sha256 'c5f660c4b339ed6a9e89ec0bafd5d39ba53cb3a3b52051bc571bb74e03ef8f7a'
binary_url ({ binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.19.3-chromeos-armv7l.tar.xz', aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.22.0-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.19.3-chromeos-armv7l.tar.xz', armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.22.0-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.19.3-chromeos-i686.tar.xz', i686: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.22.0-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.19.3-chromeos-x86_64.tar.xz', x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.22.0-chromeos-x86_64.tar.xz',
}) })
binary_sha256 ({ binary_sha256 ({
aarch64: '4dcaebe877dfcb68dc6dda313e7121c6c220979716eef419960e88529caf6eca', aarch64: 'a86846ce4e33b0f3cbf474962491b04cb9f0536e7d1f6c6d15c9c149f1ec497f',
armv7l: '4dcaebe877dfcb68dc6dda313e7121c6c220979716eef419960e88529caf6eca', armv7l: 'a86846ce4e33b0f3cbf474962491b04cb9f0536e7d1f6c6d15c9c149f1ec497f',
i686: '7e4e7f219a6447fcb7ca6ce3010fa560122853e0831de19b8d89c58afd9bfd30', i686: '372b9c3d341d6cfc68c47056b6e3d4f46826a1fa6cb1a85f94b895d99fa82cf5',
x86_64: 'cad527db909fae46126213f99de2ec8a1bff297be41068ebb133f61fbf7492e6', x86_64: '490464fc52e9639e0ff88fc40efbc2064487f9b5344301be92565b15a88bffb8',
}) })
def self.build def self.build
system './configure', system "./configure #{CREW_OPTIONS}"
"--prefix=#{CREW_PREFIX}",
"--libdir=#{CREW_LIB_PREFIX}"
system 'make' system 'make'
end end
def self.install def self.install
system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
end end
end end
packages/v2ray.rb
View file @ 9528ecec
...@@ -3,19 +3,19 @@ require 'package' ...@@ -3,19 +3,19 @@ require 'package'
class V2ray < Package class V2ray < Package
description 'A platform for building proxies to bypass network restrictions.' description 'A platform for building proxies to bypass network restrictions.'
homepage 'https://www.v2ray.com/' homepage 'https://www.v2ray.com/'
version 'v4.23.3' version 'v4.23.4'
compatibility 'all' compatibility 'all'
case ARCH case ARCH
when 'aarch64', 'armv7l' when 'aarch64', 'armv7l'
source_url 'https://github.com/v2ray/v2ray-core/releases/download/v4.23.3/v2ray-linux-arm.zip' source_url 'https://github.com/v2ray/v2ray-core/releases/download/v4.23.4/v2ray-linux-arm.zip'
source_sha256 '0b5f2dc349739d1e712798c04ef5cf94156729329dd66ff2c4c3e9927dd3f255' source_sha256 '96ea08331b4f61208810c26263fc828c115d7eee863f9cd6f35e89890d10535f'
when 'i686' when 'i686'
source_url 'https://github.com/v2ray/v2ray-core/releases/download/v4.23.3/v2ray-linux-32.zip' source_url 'https://github.com/v2ray/v2ray-core/releases/download/v4.23.4/v2ray-linux-32.zip'
source_sha256 '0657b335261edd6ffb24a29f1f594e92414901cc56e09711d9532e94a03f395b' source_sha256 '78f98992e4bff6f44d1c7bc493c5e82d183a8510f555f65fa359995282c99249'
when 'x86_64' when 'x86_64'
source_url 'https://github.com/v2ray/v2ray-core/releases/download/v4.23.3/v2ray-linux-64.zip' source_url 'https://github.com/v2ray/v2ray-core/releases/download/v4.23.4/v2ray-linux-64.zip'
source_sha256 'ad3c272b03cd682a427c70c4ea6079bfbf614bf5978f69a0d1b77d673aa913ae' source_sha256 '38f02c2d3f054ec228f0f29a4185431b89f06f7b6a7a8f795e12ae48eaa591ba'
end end
def self.install def self.install
......
packages/zathura.rb 0 → 100644
View file @ 9528ecec
require 'package'
class Zathura < Package
description 'zathura is a highly customizable and functional PDF document viewer'
homepage 'https://pwmt.org/projects/zathura/'
version '0.4.5'
source_url 'https://pwmt.org/projects/zathura/download/zathura-0.4.5.tar.xz'
source_sha256 '0c3997aafbcdaaae60a4522f208adadfdd2758b432ce94ea16fbcee937cb762c'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/zathura-0.4.5-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/zathura-0.4.5-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/zathura-0.4.5-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/zathura-0.4.5-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: 'ec4a508b374e3169f04fe2018ae95d3fe9b7a88a2604bfcfe1a7a1ecd1f0aa6e',
armv7l: 'ec4a508b374e3169f04fe2018ae95d3fe9b7a88a2604bfcfe1a7a1ecd1f0aa6e',
i686: 'a1e6e108ff1747f6297faa3497bca3d4ad88fb4969955f5aacbfba5116168eed',
x86_64: '05b3d7cd6b2ee0548041bb6a8a3743560962ad84350f547642a3a30b1fa89dda',
})
depends_on 'girara'
depends_on 'zathura_poppler_pdf'
def self.build
system "meson --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} builddir"
system "ninja -C builddir"
end
def self.install
system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install"
end
end
packages/zathura_poppler_pdf.rb 0 → 100644
View file @ 9528ecec
require 'package'
class Zathura_poppler_pdf < Package
description 'The zathura_poppler_pdf plugin adds PDF support to zathura by using the poppler rendering engine.'
homepage 'https://pwmt.org/projects/zathura-pdf-poppler/'
version '0.3.0'
source_url 'https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-0.3.0.tar.xz'
source_sha256 'd5cc3a7dae49471b85b503bbb9049c6f8d10903f4a611d721a2e0fefe726d4ed'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/zathura_poppler_pdf-0.3.0-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/zathura_poppler_pdf-0.3.0-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/zathura_poppler_pdf-0.3.0-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/zathura_poppler_pdf-0.3.0-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: '8f0a5457aa3ed3f5eed6f602b4439967ab6957b3d1e04e7f9a9468d77713f1ea',
armv7l: '8f0a5457aa3ed3f5eed6f602b4439967ab6957b3d1e04e7f9a9468d77713f1ea',
i686: 'cc192c10e8188c90ca55162e60aba590e0cebe4235ee93e58a9c868115224f3f',
x86_64: '2a45979d58fa1ca321cd4432a2591f6e6737212ebef0abb30d9e25f5b8f1b3d0',
})
depends_on 'poppler'
def self.build
system "meson --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} builddir"
system "ninja -C builddir"
end
def self.install
system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install"
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7