Update gtk3.rb

packages/gtk3.rb

@@ -11,44 +11,32 @@ class Gtk3 < Package
   # source_url "https://download.gnome.org/sources/gtk/#{@_ver_prelastdot}/gtk-#{@_ver}.tar.xz"
   source_sha256 'dbc3b14ae0d8e44bc8caeac91d62b4d2403a881d837cb4e9bcfb8d138712c3a3'
 
-  binary_url({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/gtk3-3.24.27-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/gtk3-3.24.27-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/gtk3-3.24.27-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/gtk3-3.24.27-chromeos-x86_64.tar.xz'
-  })
-  binary_sha256({
-    aarch64: '840b06f1ccf18e6b85e7944e1af74e9a08385053a46f0277c8f395fa02c20f2a',
-     armv7l: '840b06f1ccf18e6b85e7944e1af74e9a08385053a46f0277c8f395fa02c20f2a',
-       i686: 'f07416c233166be3cf0777be1745d61ed6f3574137a7918c300779acc39593d8',
-     x86_64: 'bdd162ae2fd29f1500e2dd6a7ed7378023b2e20d3af73c42c3017ef10f4d905f'
-  })
-
-  depends_on 'cups'
+  depends_on 'atk'
   depends_on 'at_spi2_atk'
+  depends_on 'cantarell_fonts'
+  depends_on 'cups'
+  depends_on 'gdk_pixbuf'
   depends_on 'gnome_icon_theme'
   depends_on 'gobject_introspection'
-  depends_on 'gdk_pixbuf'
   depends_on 'graphene'
+  depends_on 'graphite'
   depends_on 'hicolor_icon_theme'
   depends_on 'iso_codes'
   depends_on 'json_glib'
+  depends_on 'libdeflate'
   depends_on 'libepoxy'
   depends_on 'libxkbcommon'
   depends_on 'shared_mime_info'
   depends_on 'six' => :build
   depends_on 'xdg_base'
-  depends_on 'atk'
-  depends_on 'graphite'
-  depends_on 'libdeflate'
 
   def self.build
     system "meson #{CREW_MESON_LTO_OPTIONS} \
-            -Dbroadway_backend=true \
-            -Dgtk_doc=false \
-            -Ddemos=false \
-            -Dexamples=false \
-            builddir"
+      -Dbroadway_backend=true \
+      -Ddemos=false \
+      -Dexamples=false \
+      -Dgtk_doc=false \
+      builddir"
     system 'meson configure builddir'
     system 'ninja -C builddir'
   end
@@ -56,6 +44,16 @@ class Gtk3 < Package
   def self.install
     system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install"
     system "sed -i 's,null,,g'  #{CREW_DEST_LIB_PREFIX}/pkgconfig/gtk*.pc"
+    @gtk3settings = <<~GTK3_CONFIG_HEREDOC
+      [Settings]
+      gtk-icon-theme-name = Adwaita
+      gtk-fallback-icon-theme = gnome
+      gtk-theme-name = Adwaita
+      gtk-font-name = Cantarell 11
+      gtk-application-prefer-dark-theme = false
+    GTK3_CONFIG_HEREDOC
+    FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/gtk-3.0"
+    File.write("#{CREW_DEST_PREFIX}/etc/gtk-3.0/settings.ini", @gtk3settings)
   end
 
   def self.postinstall
@@ -63,19 +61,5 @@ class Gtk3 < Package
     system "glib-compile-schemas #{CREW_PREFIX}/share/glib-2.0/schemas"
     # update mime database
     system "update-mime-database #{CREW_PREFIX}/share/mime"
-    @xdg_config_home = ENV['XDG_CONFIG_HOME']
-    @gtk3settings = <<~GTK3_CONFIG_HEREDOC
-      [Settings]
-      gtk-application-prefer-dark-theme = false
-      gtk-icon-theme-name = hicolor
-      gtk-fallback-icon-theme = gnome
-      gtk-font-name = Arial 10
-    GTK3_CONFIG_HEREDOC
-    unless File.exist?("#{@xdg_config_home}/gtk-3.0/settings.ini")
-      puts
-      puts 'Adding basic gtk4 settings to XDG_CONFIG_HOME/gtk-3.0/settings.ini'.lightblue
-      FileUtils.mkdir_p "#{@xdg_config_home}/gtk-3.0"
-      File.write("#{@xdg_config_home}/gtk-3.0/settings.ini", @gtk3settings)
-    end
   end
 end