P11kit 0.23.22 & Libfilezilla 0.26 (#4808)

* Update libfilezilla.rb
* add p11kit dep
* Update p11kit.rb
* i686 fix
* Filezilla -> 0.26
* add binaries

packages/libfilezilla.rb

@@ -3,24 +3,31 @@ require 'package'
 class Libfilezilla < Package
   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/'
-  version '0.24.1'
+  version '0.26'
   compatibility 'all'
-  source_url 'https://download.filezilla-project.org/libfilezilla/libfilezilla-0.24.1.tar.bz2'
-  source_sha256 'fdd5b4ee1916af7b1d402e7dd467f05df7624bb65fb95a0875a03712ecc2d6fd'
+  source_url 'https://download.filezilla-project.org/libfilezilla/libfilezilla-0.26.0.tar.bz2'
+  source_sha256 '17ed226593e8e466ce3c3f8ce583b36c79f163189ead54d631613cc3da5c80bd'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.24.1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.24.1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.24.1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.24.1-chromeos-x86_64.tar.xz',
+     aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.26-chromeos-armv7l.tar.xz',
+      armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.26-chromeos-armv7l.tar.xz',
+        i686: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.26-chromeos-i686.tar.xz',
+      x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libfilezilla-0.26-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: '1dbede14eac9364679565683f4473cb11996bf126b2317f8e707ff00337481ea',
-     armv7l: '1dbede14eac9364679565683f4473cb11996bf126b2317f8e707ff00337481ea',
-       i686: 'a105e9a6c565aad505e85cdf0618a272cd4d4efde09fb20fed768172bc8f841a',
-     x86_64: '7e61216d322cf0acc5c564cfc5b83663b8593ec420f22410943572ebde1f2aea',
+     aarch64: '7f2ff4e1a1f55bac7e9450fc0d85f84ec21ec2a62f2c45c02c6342c7670dbfd3',
+      armv7l: '7f2ff4e1a1f55bac7e9450fc0d85f84ec21ec2a62f2c45c02c6342c7670dbfd3',
+        i686: 'd07c70bf760ed003bf5d2365ae23bb5adc4da0091aa07b69eaa14b5e9d27ee97',
+      x86_64: '982dbdceeeb0889dc516156785218bf520d25e1e1602cada0523f6cc7f14774e',
   })
 
+
+  depends_on 'p11kit'
+
+  def self.patch
+    system 'filefix'
+  end
+
   def self.build
     system "./configure #{CREW_OPTIONS}"
     system 'make'

packages/p11kit.rb

@@ -3,42 +3,36 @@ require 'package'
 class P11kit < Package
   description "Provides a standard configuration setup for installing PKCS#11 modules in such a way that they're discoverable."
   homepage 'https://p11-glue.freedesktop.org/p11-kit.html'
-  version '0.23.18.1'
+  version '0.23.22'
   compatibility 'all'
-  source_url 'https://github.com/p11-glue/p11-kit/releases/download/0.23.18.1/p11-kit-0.23.18.1.tar.gz'
-  source_sha256 '34c3bd8c0050dd7c4e6228aecf0f168de0a1b34562ddbf74a1c70904c2523c6f'
+  source_url 'https://github.com/p11-glue/p11-kit/archive/0.23.22.tar.gz'
+  source_sha256 'e4bf1e374b3c0950a724cf367bd52201519f4b7025c8e9902a274123cc232560'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/p11kit-0.23.18.1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/p11kit-0.23.18.1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/p11kit-0.23.18.1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/p11kit-0.23.18.1-chromeos-x86_64.tar.xz',
+     aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/p11kit-0.23.22-chromeos-armv7l.tar.xz',
+      armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/p11kit-0.23.22-chromeos-armv7l.tar.xz',
+        i686: 'https://dl.bintray.com/chromebrew/chromebrew/p11kit-0.23.22-chromeos-i686.tar.xz',
+      x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/p11kit-0.23.22-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: 'd9e24ea10a619d622b2ae47cab26e7e53f35767eddf2705e551c9c26c6cebd81',
-     armv7l: 'd9e24ea10a619d622b2ae47cab26e7e53f35767eddf2705e551c9c26c6cebd81',
-       i686: 'ae93ca980625bd990428c37beee0debc92bcb50a9bf25b1a3a889f6759ae15a1',
-     x86_64: '92f3d0916b20eb2019fc4372f855d34e18d1a661aada22bfac72df0abb58464f',
+     aarch64: 'd62b5c7216b9b271584147ec0b5c432ef1f993c0985be2c77ec7b681981eb2a8',
+      armv7l: 'd62b5c7216b9b271584147ec0b5c432ef1f993c0985be2c77ec7b681981eb2a8',
+        i686: 'e7a2a1566f4219929789357682f26a6a3f2582f030d1a29fa75bfe53d1010472',
+      x86_64: 'fbbf0478445e54d17f6db35d79ae9c5b7fdf5fcfe88e2fb429eb7e5c1c933035',
   })
 
   depends_on 'libffi'
   depends_on 'libtasn1'
 
   def self.build
-    system './configure',
-           "--prefix=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}",
-           '--disable-static',
-           '--enable-shared',
-           '--with-pic'
-    system 'make'
+    system "meson setup #{CREW_MESON_OPTIONS} \
+      build"
+    system "meson configure build"
+    system "ninja -C build"
   end
 
   def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
+    system "DESTDIR=#{CREW_DEST_DIR} ninja -C build install"
   end
 
-  def self.check
-    system 'make', 'check'
-  end
 end