webkit2gtk and gemacs rebuild (#5900)

* webkit2gtk and gemacs rebuild

* ccache is build only

packages/gemacs.rb

@@ -4,24 +4,24 @@ class Gemacs < Package
   description 'An extensible, customizable, free/libre text editor - and more.'
   homepage 'https://www.gnu.org/software/emacs/'
   @_ver = '28.0.50.1'
-  version "#{@_ver}-7a7b"
+  version "#{@_ver}-01b0"
   license 'GPL-3+, FDL-1.3+, BSD, HPND, MIT, W3C, unicode, PSF-2'
   compatibility 'all'
   source_url 'https://git.savannah.gnu.org/git/emacs.git'
   git_branch 'feature/pgtk'
-  git_hashtag '7a7bc15242896b20c7af49f77f0e22c3d78e4d88'
+  git_hashtag '01b0a909b5ca858a09484821cc866127652f4153'
 
   binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/gemacs/28.0.50.1-7a7b_armv7l/gemacs-28.0.50.1-7a7b-chromeos-armv7l.tar.xz',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/gemacs/28.0.50.1-7a7b_armv7l/gemacs-28.0.50.1-7a7b-chromeos-armv7l.tar.xz',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/gemacs/28.0.50.1-7a7b_i686/gemacs-28.0.50.1-7a7b-chromeos-i686.tar.xz',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/gemacs/28.0.50.1-7a7b_x86_64/gemacs-28.0.50.1-7a7b-chromeos-x86_64.tar.xz'
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/gemacs/28.0.50.1-01b0_armv7l/gemacs-28.0.50.1-01b0-chromeos-armv7l.tpxz',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/gemacs/28.0.50.1-01b0_armv7l/gemacs-28.0.50.1-01b0-chromeos-armv7l.tpxz',
+       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/gemacs/28.0.50.1-01b0_i686/gemacs-28.0.50.1-01b0-chromeos-i686.tpxz',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/gemacs/28.0.50.1-01b0_x86_64/gemacs-28.0.50.1-01b0-chromeos-x86_64.tpxz'
   })
   binary_sha256({
-    aarch64: '74066f8609ca1403609962454feff1a85aedb24a3d56dbfcae4a3aad8d00f836',
-     armv7l: '74066f8609ca1403609962454feff1a85aedb24a3d56dbfcae4a3aad8d00f836',
-       i686: '401243600795df8a6c375a7e581b939e258d1697595e9a43573860fca34656c0',
-     x86_64: '702ac1d56095b1032d387a2e4736e6f8ac49d4d16a165cbc1142cb5ffe394454'
+    aarch64: '8ba0433113a23361cf961d372c8e7db79206c5baf3046255bebec0acd1d73452',
+     armv7l: '8ba0433113a23361cf961d372c8e7db79206c5baf3046255bebec0acd1d73452',
+       i686: 'e1a0efa63cf40683ddfd90ca181f43e50d87bbf6179774f976e6cc8f917f0205',
+     x86_64: '8f462f3de1a19f67a36e6752124da213add709a075cd8bc52815452d9bf68b16'
   })
 
   depends_on 'alsa_lib'

packages/webkit2gtk_4.rb

@@ -4,27 +4,28 @@ class Webkit2gtk_4 < Package
   description 'Web content engine for GTK'
   homepage 'https://webkitgtk.org'
   @_ver = '2.32.1'
-  version @_ver
+  version "#{@_ver}-1"
   license 'LGPL-2+ and BSD-2'
   compatibility 'all'
   source_url "https://webkitgtk.org/releases/webkitgtk-#{@_ver}.tar.xz"
   source_sha256 '136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917'
 
   binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/webkit2gtk_4/2.32.1_armv7l/webkit2gtk_4-2.32.1-chromeos-armv7l.tpxz',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/webkit2gtk_4/2.32.1_armv7l/webkit2gtk_4-2.32.1-chromeos-armv7l.tpxz',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/webkit2gtk_4/2.32.1_i686/webkit2gtk_4-2.32.1-chromeos-i686.tpxz',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/webkit2gtk_4/2.32.1_x86_64/webkit2gtk_4-2.32.1-chromeos-x86_64.tpxz'
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/webkit2gtk_4/2.32.1-1_armv7l/webkit2gtk_4-2.32.1-1-chromeos-armv7l.tpxz',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/webkit2gtk_4/2.32.1-1_armv7l/webkit2gtk_4-2.32.1-1-chromeos-armv7l.tpxz',
+       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/webkit2gtk_4/2.32.1-1_i686/webkit2gtk_4-2.32.1-1-chromeos-i686.tpxz',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/webkit2gtk_4/2.32.1-1_x86_64/webkit2gtk_4-2.32.1-1-chromeos-x86_64.tpxz'
   })
   binary_sha256({
-    aarch64: '6c5cbf8c55706aa5253e2bbe5fccd9478103c35ff9ac7c68056099c2a18fe85f',
-     armv7l: '6c5cbf8c55706aa5253e2bbe5fccd9478103c35ff9ac7c68056099c2a18fe85f',
-       i686: 'ab5cc183f6b51d9bd971c7bac70f617485d66efb0436dfbd941d153d32f5bf8d',
-     x86_64: '34d1284e175e6ebdf078ce0ba7e08b404ebb125849470668a35162d2aa2d1daf'
+    aarch64: '64e118160d7101af91e8ffd1505d7eaf2b03a32f6a6bede1f16402d9e40e265b',
+     armv7l: '64e118160d7101af91e8ffd1505d7eaf2b03a32f6a6bede1f16402d9e40e265b',
+       i686: 'cfa921effe347074bb318eaf9cc00e2940262e2c6da452a799cf54ef9c41f12c',
+     x86_64: '45c58419c27cfa20d74f025cf6778acb79a31d7f0a7de0cf2d403f9afbd2ac9a'
   })
 
   depends_on 'atk'
   depends_on 'cairo'
+  depends_on 'ccache' => :build
   depends_on 'dav1d'
   depends_on 'enchant'
   depends_on 'fontconfig'
@@ -56,22 +57,55 @@ class Webkit2gtk_4 < Package
   depends_on 'mesa'
   depends_on 'openjpeg'
   depends_on 'pango'
+  depends_on 'valgrind' => :build
   depends_on 'wayland'
   depends_on 'woff2'
   depends_on 'wpebackend_fdo'
 
+  def self.patch
+    open('CMakeLists.txt', 'a') do |f|
+      f.puts 'set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")'
+      f.puts 'set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")'
+    end
+  end
+
   def self.build
     # This builds webkit2gtk4 (which uses gtk3)
     Dir.mkdir 'builddir4'
     Dir.chdir 'builddir4' do
-      # -flto breaks x86_64 builds
-      # system "env #{CREW_ENV_OPTIONS} \
       # Bubblewrap sandbox breaks on epiphany with
       # bwrap: Can't make symlink at /var/run: File exists
-      # ccache currently breaks gcc builds of webkit-gtk
-      system "cmake \
+      case ARCH
+      when 'x86_64'
+        system "CC=clang CXX=clang++ LD=lld NM=llvm-nm cmake \
+          -G Ninja \
+          #{CREW_CMAKE_OPTIONS.gsub('-flto', '').gsub('-ffat-lto-objects', '')} \
+          -DLTO_MODE=thin \
+          -DCMAKE_LINKER=$(which ld.lld) \
+          -DCMAKE_AR=$(which llvm-ar) \
+          -DCMAKE_RANLIB=$(which llvm-ranlib) \
+          -DCMAKE_SKIP_RPATH=ON \
+          -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
+          -DENABLE_GAMEPAD=OFF \
+          -DENABLE_GLES2=ON \
+          -DENABLE_GTKDOC=OFF \
+          -DENABLE_INTROSPECTION=ON \
+          -DENABLE_MINIBROWSER=ON \
+          -DENABLE_VIDEO=ON \
+          -DENABLE_WAYLAND_TARGET=ON \
+          -DENABLE_WEB_AUDIO=OFF \
+          -DPORT=GTK \
+          -DUSE_GTK4=OFF \
+          -DUSE_SOUP2=ON \
+          -DUSE_SYSTEMD=OFF \
+          -DUSE_AVIF=ON \
+          -DPYTHON_EXECUTABLE=`which python` \
+          .."
+      when 'i686', 'armv7l', 'aarch64'
+        system "cmake \
         -G Ninja \
-        #{CREW_CMAKE_FNO_LTO_OPTIONS} \
+        #{CREW_CMAKE_OPTIONS.gsub('-flto', '')} \
+        -DLTO_MODE=auto \
         -DCMAKE_SKIP_RPATH=ON \
         -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
         -DENABLE_GAMEPAD=OFF \
@@ -89,6 +123,7 @@ class Webkit2gtk_4 < Package
         -DUSE_AVIF=ON \
         -DPYTHON_EXECUTABLE=`which python` \
         .."
+      end
     end
     system 'ninja -C builddir4'
   end