evince + evince/epiphany prereqs/updates (#5550)

* evince + evince/epiphany prereqs/updates

* add gs

* add libwpe update

* only put parent runtime deps in packages

* Add back some logical depends to gtk3

* add back logical depends to gtk4

* Update gtk3.rb
Co-authored-by: Ed Reel <edreel@gmail.com>

packages/cairo.rb

@@ -22,10 +22,16 @@ class Cairo < Package
      x86_64: 'b12d21a683f06db69052f2d927039f6e893aecdc993de1b384af9267d25ff93e'
   })
 
+  depends_on 'fontconfig'
+  depends_on 'freetype'
+  depends_on 'glib'
   depends_on 'libpng'
+  depends_on 'libx11'
+  depends_on 'libxcb'
+  depends_on 'libxrender'
   depends_on 'lzo'
-  depends_on 'pixman'
   depends_on 'mesa'
+  depends_on 'pixman'
 
   def self.build
     system "meson #{CREW_MESON_LTO_OPTIONS} \

packages/djvulibre.rb

+# Adapted from Arch Linux djvulibre PKGBUILD at:
+# https://github.com/archlinux/svntogit-packages/raw/packages/djvulibre/trunk/PKGBUILD
+
+require 'package'
+
+class Djvulibre < Package
+  description 'Suite to create, manipulate and view DjVu déjà vu documents'
+  homepage 'http://djvu.sourceforge.net/'
+  version '3.5.28'
+  license 'GPL2'
+  compatibility 'all'
+  source_url "https://downloads.sourceforge.net/project/djvu/DjVuLibre/#{version}/djvulibre-#{version}.tar.gz"
+  source_sha256 'fcd009ea7654fde5a83600eb80757bd3a76998e47d13c66b54c8db849f8f2edc'
+
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/djvulibre-3.5.28-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/djvulibre-3.5.28-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/djvulibre-3.5.28-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/djvulibre-3.5.28-chromeos-x86_64.tar.xz'
+  })
+  binary_sha256({
+    aarch64: '2a662b5b95e3e5c24531cb4ae0f5b33c044895f33fc88c562026a4124ff15295',
+     armv7l: '2a662b5b95e3e5c24531cb4ae0f5b33c044895f33fc88c562026a4124ff15295',
+       i686: 'a0cf591f8e04fc89a0c2f45f0ad67c7c907971dcf85371a2184c3ea54e605da4',
+     x86_64: 'd17ec121e01aea869ea74b421aebcf4b8f019e8b32268859256aadd32019aab5'
+  })
+ 
+  depends_on 'libjpeg'
+  depends_on 'libtiff'
+  depends_on 'librsvg' => :build
+
+  def self.build
+    system "env CFLAGS='-pipe -flto=auto' \
+      CXXFLAGS='-pipe -flto=auto' \
+      LDFLAGS='-flto=auto' \
+      ./configure #{CREW_OPTIONS} \
+      --disable-desktopfiles"
+    system 'make'
+  end
+
+  def self.install
+    system "make DESTDIR=#{CREW_DEST_DIR} install"
+    @desktopfiles = %w[22 32 48 64]
+    @desktopfiles.each do |item|
+      FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/icons/hicolor/#{item}x#{item}/mimetypes"
+      FileUtils.install "desktopfiles/prebuilt-hi#{item}-djvu.png",
+                        "#{CREW_DEST_PREFIX}/share/icons/hicolor/#{item}x#{item}/mimetypes/image-vnd.djvu.mime.png", mode: 0o644
+    end
+  end
+end

packages/evince.rb

+# Adapted from Arch Linux evince PKGBUILD at:
+# https://github.com/archlinux/svntogit-packages/raw/packages/evince/trunk/PKGBUILD
+
+require 'package'
+
+class Evince < Package
+  description 'Document viewer PDF, PostScript, XPS, djvu, dvi, tiff, cbr, cbz, cb7, cbt'
+  homepage 'https://wiki.gnome.org/Apps/Evince'
+  version '40.1'
+  license 'GPL'
+  compatibility 'all'
+  source_url "https://gitlab.gnome.org/GNOME/evince/-/archive/#{version}/evince-#{version}.tar.bz2"
+  source_sha256 '1c438051423334a49311c941f44924195c4823f64c2fcc55285eb529ef9bff06'
+
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/evince-40.1-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/evince-40.1-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/evince-40.1-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/evince-40.1-chromeos-x86_64.tar.xz'
+  })
+  binary_sha256({
+    aarch64: 'ff53c6f065e9d3efe0db2528ced3cf03124201fbe072ad3e113ee4dcc348c1d3',
+     armv7l: 'ff53c6f065e9d3efe0db2528ced3cf03124201fbe072ad3e113ee4dcc348c1d3',
+       i686: 'b3fa8f819fae5d173de436bf2ca2886763e04777c5a05fe81ce27a6e7e98dd57',
+     x86_64: 'e9a5508adad335debaef3105f753fb3e2b821d554edcd8fcecf2da8c5a9bf5c5'
+  })
+
+  depends_on 'atk'
+  depends_on 'cairo'
+  depends_on 'djvulibre'
+  depends_on 'docbook_xsl' => ':build'
+  depends_on 'gdk_pixbuf'
+  depends_on 'glib'
+  depends_on 'gnome_desktop'
+  depends_on 'gobject_introspection' => ':build'
+  depends_on 'gst_plugins_base'
+  depends_on 'gstreamer'
+  depends_on 'gtk3'
+  depends_on 'gtk_doc' => ':build'
+  depends_on 'libarchive'
+  depends_on 'libgxps'
+  depends_on 'libhandy'
+  depends_on 'libsecret'
+  depends_on 'libspectre'
+  depends_on 'libtiff'
+  depends_on 'nautilus'
+  depends_on 'pango'
+  depends_on 'poppler'
+
+  def self.build
+    system "meson #{CREW_MESON_LTO_OPTIONS} \
+      -Dgtk_doc=false \
+      -Dps=enabled \
+      -Dsystemduserunitdir=no \
+      builddir"
+    system 'meson configure builddir'
+    system 'ninja -C builddir'
+  end
+
+  def self.install
+    system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install"
+  end
+
+  def self.postinstall
+    system "glib-compile-schemas #{CREW_PREFIX}/share/glib-2.0/schemas/"
+  end
+end

packages/ghostscript.rb

@@ -3,40 +3,80 @@ require 'package'
 class Ghostscript < Package
   description 'Interpreter for the PostScript language'
   homepage 'https://www.ghostscript.com/'
-  version '9.52'
+  version '9.54'
   license 'AGPL-3+'
   compatibility 'all'
-  source_url 'https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/ghostscript-9.52.tar.xz'
-  source_sha256 '57442acf8b46453a9b5fc6fec738fbbb7e13a3d3e00f1aaaa0975529bc203c7c'
+  source_url 'https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9540/ghostpdl-9.54.0.tar.xz'
+  source_sha256 'ecbaa2e79e6d82cab8d0fbdfd899aa4fc68ffb43f6901d547d33ca7008fe1871'
 
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/ghostscript-9.52-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/ghostscript-9.52-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/ghostscript-9.52-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/ghostscript-9.52-chromeos-x86_64.tar.xz',
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/ghostscript-9.54-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/ghostscript-9.54-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/ghostscript-9.54-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/ghostscript-9.54-chromeos-x86_64.tar.xz'
   })
-  binary_sha256 ({
-    aarch64: '5a3ae66fa14e6b58b61e7375fb8796330a991305a7f448ffa7636392f3bc5df0',
-     armv7l: '5a3ae66fa14e6b58b61e7375fb8796330a991305a7f448ffa7636392f3bc5df0',
-       i686: 'c05ca55a65c57d6d084be7ea407dd96d068ca2ac7c7e78bd48d0e79cbff4703a',
-     x86_64: '09dfcff8a2477779f9d8dcb677bcda0b99b5064cb343d56495b51240d2a0f988',
+  binary_sha256({
+    aarch64: 'a2fee20357654918f2deac0d7af356c84898e282d008906ede6b424fd95fd549',
+     armv7l: 'a2fee20357654918f2deac0d7af356c84898e282d008906ede6b424fd95fd549',
+       i686: 'f68277f2d042311835bf70828dcae6ce281d5cb376e4d525d63e1858012ab30d',
+     x86_64: '92ac6123594ea3fe04474e7654785a599f65b57884f5931b71bfeb63100b0741'
   })
 
-  depends_on 'dbus'
+  depends_on 'atk'
+  depends_on 'cairo'
+  depends_on 'cups'
   depends_on 'fontconfig'
-  depends_on 'jasper'
-  depends_on 'gsfonts'
+  depends_on 'freetype'
+  depends_on 'gdk_pixbuf'
+  depends_on 'glib'
+  depends_on 'gtk3'
+  depends_on 'harfbuzz'
   depends_on 'lcms'
+  depends_on 'libice'
+  depends_on 'libjpeg'
+  depends_on 'libpaper'
+  depends_on 'libpng'
+  depends_on 'libsm'
+  depends_on 'libtiff'
+  depends_on 'libx11'
   depends_on 'libxext'
   depends_on 'libxt'
   depends_on 'openjpeg'
-  depends_on 'libpaper'
-  depends_on 'cups'
+  depends_on 'pango'
+
+  case ARCH
+  when 'armv7l', 'aarch64'
+    @ltoflags = ''
+  when 'x86_64', 'i686'
+    @ltoflags = '-flto'
+  end
+
+  def self.patch
+    system 'rm -r cups/libs expat ijs jpeg lcms2mt libpng openjpeg tiff zlib'
+  end
 
   def self.build
-    system "CPPFLAGS='-DPNG_ARM_NEON_OPT=0' ./configure #{CREW_OPTIONS} --disable-dependency-tracking -disable-static"
+    system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh'
+    system 'filefix'
+    system "env CFLAGS='-pipe -fuse-ld=gold #{@ltoflags}' \
+      CXXFLAGS='-pipe -fuse-ld=gold #{@ltoflags}' \
+      ./configure #{CREW_OPTIONS} \
+      --disable-compile-inits \
+      --enable-dynamic \
+      --enable-fontconfig \
+      --enable-freetype \
+      --enable-openjpeg \
+      --with-drivers=ALL \
+      --with-fontpath=#{CREW_PREFIX}/share/fonts/gsfonts \
+      --with-ijs \
+      --with-jbig2dec \
+      --with-libpaper \
+      --with-openprinting \
+      --without-luratech \
+      --with-system-libtiff \
+      --with-x"
     system 'make'
-    system "make so" # Make libgs
+    system 'make so' # Make libgs
   end
 
   def self.install

packages/libdazzle.rb

@@ -3,27 +3,30 @@ require 'package'
 class Libdazzle < Package
   description 'The libdazzle library is a companion library to GObject and Gtk+.'
   homepage 'https://gitlab.gnome.org/GNOME/libdazzle/'
-  version '3.37.1'
+  version '3.40.0'
   license 'GPL-3+'
   compatibility 'all'
-  source_url 'https://gitlab.gnome.org/GNOME/libdazzle/-/archive/3.37.1/libdazzle-3.37.1.tar.bz2'
-  source_sha256 'f786a9c3007011a03c721c3402f86ec69642797f64a4bdaa6f1a9c10628aa0cf'
+  source_url "https://gitlab.gnome.org/GNOME/libdazzle/-/archive/#{version}/libdazzle-#{version}.tar.bz2"
+  source_sha256 'a31f80a3134332d9621d46d74276788ba22e55d1197edab07182ea6be8468989'
 
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libdazzle-3.37.1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libdazzle-3.37.1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libdazzle-3.37.1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libdazzle-3.37.1-chromeos-x86_64.tar.xz',
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libdazzle-3.40.0-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libdazzle-3.40.0-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libdazzle-3.40.0-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libdazzle-3.40.0-chromeos-x86_64.tar.xz'
   })
-  binary_sha256 ({
-    aarch64: '4c0e49a34616ca9e6eea5c26b0b64016ca9ea0b4ed92ed557500eb9787c9dd5a',
-     armv7l: '4c0e49a34616ca9e6eea5c26b0b64016ca9ea0b4ed92ed557500eb9787c9dd5a',
-       i686: 'e0bbfadef81daeb2d572e07e9f06a9a019da8dbc2f89f9cb2244894b9668f857',
-     x86_64: 'd0305eb7f99c8a516d72f9951ba1ebab75cc0d0954f3e6afa412dbf765c48c71',
+  binary_sha256({
+    aarch64: 'c11c683320703431a0ead7f365e25e5fb7db17933967d0c23a7c12c62b269c86',
+     armv7l: 'c11c683320703431a0ead7f365e25e5fb7db17933967d0c23a7c12c62b269c86',
+       i686: 'cd1ad492b66fe8e6c52c7a67d51b117237f2b9395edfa282e63095cf916ed6dd',
+     x86_64: '132e15b726324b2d08b450637d2a7435f8dd6b471fb2218b368835fe43c05fca'
   })
 
-  depends_on 'gobject_introspection'
+  depends_on 'cairo'
+  depends_on 'gdk_pixbuf'
+  depends_on 'glib'
   depends_on 'gtk3'
+  depends_on 'pango'
   depends_on 'vala' => :build
 
   def self.prebuild

packages/libgxps.rb

+# Adapted from Arch Linux libgxps PKGBUILD at:
+# https://github.com/archlinux/svntogit-packages/raw/packages/libgxps/trunk/PKGBUILD
+
+require 'package'
+
+class Libgxps < Package
+  description 'XPS Documents library'
+  homepage 'https://wiki.gnome.org/Projects/libgxps'
+  version '0.3.2'
+  license 'GPL2'
+  compatibility 'all'
+  source_url "https://gitlab.gnome.org/GNOME/libgxps/-/archive/#{version}/libgxps-#{version}.tar.bz2"
+  source_sha256 'ffbc656e801233a64ea5b6ab5532691e8b91f72cce3ea957615fe8523696d42a'
+
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libgxps-0.3.2-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libgxps-0.3.2-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libgxps-0.3.2-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libgxps-0.3.2-chromeos-x86_64.tar.xz'
+  })
+  binary_sha256({
+    aarch64: '47a8cac375a3ea3dace3d0498c79511d3973b2e39b6fd8d8593804e6de84dfeb',
+     armv7l: '47a8cac375a3ea3dace3d0498c79511d3973b2e39b6fd8d8593804e6de84dfeb',
+       i686: '7b6f550b505c2453841539b0ce36b5d8404ab098bdc2fa8f8c5f7f27cdda6ac8',
+     x86_64: '87bf32455bded966594a39131bf79ad198e06617df4ccc0327932c413b3d78b6'
+  })
+
+  depends_on 'cairo'
+  depends_on 'cups'
+  depends_on 'fontconfig'
+  depends_on 'freetype'
+  depends_on 'glib'
+  depends_on 'gobject_introspection' => ':build'
+  depends_on 'gtk_doc' => ':build'
+  depends_on 'lcms'
+  depends_on 'libarchive'
+  depends_on 'libjpeg'
+  depends_on 'libpaper'
+  depends_on 'libpng'
+  depends_on 'libtiff'
+  depends_on 'openjpeg'
+
+  def self.build
+    system "meson #{CREW_MESON_LTO_OPTIONS} \
+      builddir"
+    system 'meson configure builddir'
+    system 'ninja -C builddir'
+  end
+
+  def self.install
+    system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install"
+  end
+end

packages/libtiff.rb

@@ -22,11 +22,17 @@ class Libtiff < Package
      x86_64: '3a30356473a84f4c024c3dc399487782c6f585896a18c641b866ecad6cf528a8'
   })
 
-  depends_on 'libx11'
+  depends_on 'freeglut'
+  depends_on 'imake' => :build
+  depends_on 'libdeflate'
+  depends_on 'libglu'
+  depends_on 'libice'
   depends_on 'libjpeg'
+  depends_on 'libsm'
   depends_on 'libwebp'
-  depends_on 'libdeflate'
-  depends_on 'imake' => :build
+  depends_on 'libx11'
+  depends_on 'libxi'
+  depends_on 'mesa'
 
   def self.build
     system 'env NOCONFIGURE=1 ./autogen.sh'

packages/libwpe.rb

@@ -3,24 +3,24 @@ require 'package'
 class Libwpe < Package
   description 'General-purpose library for WPE WebKit'
   homepage 'https://wpewebkit.org'
-  @_ver = '1.8.0'
+  @_ver = '1.10.0'
   version @_ver
   license 'BSD-2'
   compatibility 'all'
   source_url "https://github.com/WebPlatformForEmbedded/libwpe/releases/download/#{@_ver}/libwpe-#{@_ver}.tar.xz"
-  source_sha256 'a6f00a7d091cbd4db57fe7ee3b4c12c6350921d654ed79812800a26c888481d2'
+  source_sha256 '2415e270d45e3595ed4052bc105f733744dc2d3677e12ff4a831e5029841084d'
 
-  binary_url ({
-     aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libwpe-1.8.0-chromeos-armv7l.tar.xz',
-      armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libwpe-1.8.0-chromeos-armv7l.tar.xz',
-        i686: 'https://dl.bintray.com/chromebrew/chromebrew/libwpe-1.8.0-chromeos-i686.tar.xz',
-      x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libwpe-1.8.0-chromeos-x86_64.tar.xz',
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libwpe-1.10.0-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libwpe-1.10.0-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libwpe-1.10.0-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libwpe-1.10.0-chromeos-x86_64.tar.xz'
   })
-  binary_sha256 ({
-     aarch64: '2ac2dfad4b4ada47f50eb01de8e4f48629de8f4d88a7808173c0164f8cfc7978',
-      armv7l: '2ac2dfad4b4ada47f50eb01de8e4f48629de8f4d88a7808173c0164f8cfc7978',
-        i686: 'c6ea7fb4281d48faf071f6a701e372863046ebfca86d3c9bb644f405e2192bf7',
-      x86_64: 'fb76a33b0eaed0ebb0ed586ee019a12d6f5a77e2b3b1e99ccc3ecd9884e43b20',
+  binary_sha256({
+    aarch64: '44c64f96d2051025c83162c7a556400156eb8657fb4965a1da8f3d6919e44d47',
+     armv7l: '44c64f96d2051025c83162c7a556400156eb8657fb4965a1da8f3d6919e44d47',
+       i686: '4f376503f92ed5e655fcef91ec6518fb147250a352f59b941f52797eadadcfdc',
+     x86_64: 'f7bf29748a591772836b70aa213e1c8dc67236c7ea3f2ea72717bfe928a39d69'
   })
 
   depends_on 'libxkbcommon'
@@ -28,8 +28,8 @@ class Libwpe < Package
   def self.build
     system "meson #{CREW_MESON_LTO_OPTIONS} \
     builddir"
-    system "meson configure builddir"
-    system "ninja -C builddir"
+    system 'meson configure builddir'
+    system 'ninja -C builddir'
   end
 
   def self.install

packages/pango.rb

@@ -22,15 +22,17 @@ class Pango < Package
      x86_64: '0e334cadaaa118649dec9a8a35a6982f349338bed3c974fa3992786bf329b906'
   })
 
-  depends_on 'harfbuzz'
-  depends_on 'freetype'
   depends_on 'cairo'
+  depends_on 'fontconfig'
+  depends_on 'freetype'
+  depends_on 'fribidi' # Gets built inside install automatically.
   depends_on 'glib'
   depends_on 'gobject_introspection' # add this package to build gtk+, avoid compilation error
+  depends_on 'harfbuzz'
+  depends_on 'libx11'
+  depends_on 'libxft'
   depends_on 'libxrender'
-  depends_on 'fribidi' # Gets built inside install automatically.
   depends_on 'six'
-  depends_on 'fontconfig'
 
   def self.build
     system "meson #{CREW_MESON_LTO_OPTIONS} \

packages/poppler.rb

@@ -3,33 +3,30 @@ require 'package'
 class Poppler < Package
   description 'Poppler is a PDF rendering library based on the xpdf-3.0 code base.'
   homepage 'https://poppler.freedesktop.org/'
-  @_ver = '21.03.0'
+  @_ver = '21.04.0'
   version "#{@_ver}-1"
   license 'GPL-2'
   compatibility 'all'
   source_url "https://poppler.freedesktop.org/poppler-#{@_ver}.tar.xz"
-  source_sha256 'fd51ead4aac1d2f4684fa6e7b0ec06f0233ed21667e720a4e817e4455dd63d27'
+  source_sha256 '5e2219656c6bbd36154133fef2e12b7d0938464518827098b29a10b1697ea79c'
 
   binary_url({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/poppler-21.03.0-1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/poppler-21.03.0-1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/poppler-21.03.0-1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/poppler-21.03.0-1-chromeos-x86_64.tar.xz'
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/poppler-21.04.0-1-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/poppler-21.04.0-1-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/poppler-21.04.0-1-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/poppler-21.04.0-1-chromeos-x86_64.tar.xz'
   })
   binary_sha256({
-    aarch64: '97b54286c9ff1d7c041ea465e586f797a3bf3e426ce16fc39b753feef2380161',
-     armv7l: '97b54286c9ff1d7c041ea465e586f797a3bf3e426ce16fc39b753feef2380161',
-       i686: 'b2bee26bfa243a2eb3290b9784b619215b0d46e0edf802a0088a96944ef6caa1',
-     x86_64: 'b1be0800a8af1881d28ad9c4f7f6ccabf351155d39787717da5a834f3aec59e8'
+    aarch64: '4ee2c4b1b30d7a39d18dd6b3b5b45f284c730cf83d7f46cabd6ba4a64e518f4f',
+     armv7l: '4ee2c4b1b30d7a39d18dd6b3b5b45f284c730cf83d7f46cabd6ba4a64e518f4f',
+       i686: '3921cca2f9d5da0d24263bb6297f77027230fa36dd434e216d4d6fef3b2c14cc',
+     x86_64: 'f44903cd9abb9a0c58ef0f9554f5f877752cfbbc701620b1a81ef7c71e049b93'
   })
 
-  depends_on 'boost'
   depends_on 'cairo'
   depends_on 'fontconfig'
-  depends_on 'freeglut'
   depends_on 'freetype'
   depends_on 'glib'
-  depends_on 'harfbuzz'
   depends_on 'lcms'
   depends_on 'libjpeg'
   depends_on 'libpng'
@@ -37,9 +34,7 @@ class Poppler < Package
   depends_on 'nspr'
   depends_on 'nss'
   depends_on 'openjpeg'
-  depends_on 'poppler_data'
   depends_on 'qtbase'
-  depends_on 'qttools'
 
   def self.build
     Dir.mkdir 'builddir'

packages/t1lib.rb

+# Adapted from Arch Linux t1lib PKGBUILD at:
+# https://github.com/archlinux/svntogit-packages/raw/packages/t1lib/trunk/PKGBUILD
+
+require 'package'
+
+class T1lib < Package
+  description 'Library for generating character- and string-glyphs from Adobe Type 1 fonts'
+  homepage 'https://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html'
+  version '5.1.2'
+  license 'GPL'
+  compatibility 'x86_64 aarch64 armv7l'
+  source_url "https://www.ibiblio.org/pub/Linux/libs/graphics/t1lib-#{version}.tar.gz"
+  source_sha256 '821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59'
+
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/t1lib-5.1.2-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/t1lib-5.1.2-chromeos-armv7l.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/t1lib-5.1.2-chromeos-x86_64.tar.xz'
+  })
+  binary_sha256({
+    aarch64: '2f4799df219c60ac0ece07da29347d070b16671e3d003e988d586baf18018ecb',
+     armv7l: '2f4799df219c60ac0ece07da29347d070b16671e3d003e988d586baf18018ecb',
+     x86_64: '5d5639a6ef9375aedda35def52d0d178d87cd1d725dd36a67544e8c5e8fc11d2'
+  })
+
+  depends_on 'hashpipe' => :build
+  depends_on 'libice'
+  depends_on 'libsm'
+  depends_on 'libx11'
+  depends_on 'libxaw'
+  depends_on 'libxext'
+  depends_on 'libxmu'
+  depends_on 'libxpm'
+  depends_on 'libxt'
+
+  def self.patch
+    system 'curl -Ls https://github.com/archlinux/svntogit-packages/raw/packages/t1lib/trunk/lib-cleanup.diff | \
+      hashpipe sha256 5b161f4e0f4ad297ad8eea70ea99620f5db6f7e487bbd63a819b6a9958540961 | patch -Np1 --binary'
+    system 'curl -Ls https://github.com/archlinux/svntogit-packages/raw/packages/t1lib/trunk/format-security.diff | \
+      hashpipe sha256 89b0aa7ca57fd8e9753336033c1d3e3e58c6c79e943144430e8af9a4626fdd25 | patch -Np1 --binary'
+    system 'curl -Ls https://github.com/archlinux/svntogit-packages/raw/packages/t1lib/trunk/CVE-2011-0764.diff | \
+      hashpipe sha256 a763650bdcffd33a61cd2cecef766b8d6baa9999561463ae9dfdc20d55caef04 | patch -Np1 --binary'
+    system 'curl -Ls https://github.com/archlinux/svntogit-packages/raw/packages/t1lib/trunk/CVE-2011-1552_1553_1554.patch | \
+      hashpipe sha256 4bc34e092fdec37e06b38b5b7a3b02194732dbe6a39edbd174b36c2db1f113ac | patch -Np1 --binary'
+    system 'curl -Ls https://github.com/archlinux/svntogit-packages/raw/packages/t1lib/trunk/CVE-2010-2642.patch | \
+      hashpipe sha256 dcd9064f368e0fc1f3ede0a45e61b364f6b5d3607dccae78ac07e74ca315a27d | patch -Np1 --binary'
+  end
+
+  def self.build
+    system "env CFLAGS='-pipe -flto=auto' \
+      CXXFLAGS='-pipe -flto=auto' \
+      LDFLAGS='-flto=auto' \
+      ./configure #{CREW_OPTIONS}"
+    system 'make without_doc'
+  end
+
+  def self.install
+    system "make DESTDIR=#{CREW_DEST_DIR} install"
+  end
+end