diff --git a/.github/workflows/Build-Allowing-Failures.yml b/.github/workflows/Build-Allowing-Failures.yml index 616ce0f4b..89ff303ff 100644 --- a/.github/workflows/Build-Allowing-Failures.yml +++ b/.github/workflows/Build-Allowing-Failures.yml @@ -337,8 +337,8 @@ jobs: rm -rf /tmp/pr.txt echo -e "## Description" >> /tmp/pr.txt echo -e "- This PR has built package updates using the Build Allowing Failures.yml workflow, which was pointed to the ${{ env.BRANCH }} branch.\n" >> /tmp/pr.txt - echo -e "Please double check to see if any failures were expected.\n" >> /tmp/pr.txt - echo -e "Updated packages:" >> /tmp/pr.txt + echo -e "#### _Please double check to see if any failures were expected._\n" >> /tmp/pr.txt + echo -e "### Packages with Updated versions or Changed package files:" >> /tmp/pr.txt for file in ${CHANGED_PACKAGES} do echo "- ${file}" >> /tmp/pr.txt diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 0c5ed1647..b44cd072e 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -337,7 +337,7 @@ jobs: rm -rf /tmp/pr.txt echo -e "## Description" >> /tmp/pr.txt echo -e "- This PR has built package updates using the Build.yml workflow, which was pointed to the ${{ env.BRANCH }} branch.\n" >> /tmp/pr.txt - echo -e "Updated packages:" >> /tmp/pr.txt + echo -e "### Packages with Updated versions or Changed package files:" >> /tmp/pr.txt for file in ${CHANGED_PACKAGES} do echo "- ${file}" >> /tmp/pr.txt diff --git a/bin/crew b/bin/crew index e578a2da7..6b3bde415 100755 --- a/bin/crew +++ b/bin/crew @@ -712,12 +712,12 @@ def build_and_preconfigure(target_dir) begin @pkg.build - rescue StandardError + rescue StandardError => e if CREW_CACHE_FAILED_BUILD cache_build - abort 'There was a build error, caching build directory.'.lightred + abort "There was a build error, caching build directory.\n#{e}".lightred end - abort 'There was a build error.'.lightred + abort "There was a build error.\n#{e}".lightred end @pkg.in_build = false # wipe crew destdir diff --git a/lib/buildsystems/autotools.rb b/lib/buildsystems/autotools.rb index 982cbe566..d1c35d7c8 100644 --- a/lib/buildsystems/autotools.rb +++ b/lib/buildsystems/autotools.rb @@ -1,29 +1,16 @@ require 'fileutils' -require 'package' -require 'require_gem' +require_relative '../package' +require_relative '../require_gem' +require_relative '../report_buildsystem_methods' class Autotools < Package - property :configure_options, :pre_configure_options, :configure_build_extras, :configure_install_extras + property :autotools_configure_options, :autotools_pre_configure_options, :autotools_build_extras, :autotools_install_extras def self.build - puts "Additional #{superclass.to_s.capitalize} options being used:".orange - method_list = methods.grep(/configure_/).delete_if { |i| send(i).blank? } - require_gem 'method_source' - method_blocks = [] - method_strings = [] - method_list.sort.each do |method| - @method_info = send method - if @method_info.is_a? String - method_strings << "#{method}: #{@method_info}".orange - else - method_blocks << @method_info.source.to_s.orange - end - end - puts method_strings - puts method_blocks + extend ReportBuildsystemMethods + print_buildsystem_methods unless File.file?('Makefile') && CREW_CACHE_BUILD - puts "Additional configure_options being used: #{@pre_configure_options.nil? ? '' : @pre_configure_options} #{@configure_options.nil? ? '' : @configure_options}".orange # Run autoreconf if necessary unless File.executable? './configure' if File.executable? './autogen.sh' @@ -37,15 +24,15 @@ class Autotools < Package abort 'configure script not found!'.lightred unless File.file?('configure') FileUtils.chmod('+x', 'configure') system 'filefix', exception: false - system "#{@pre_configure_options} ./configure #{CREW_CONFIGURE_OPTIONS} #{@configure_options}" + system "#{@autotools_pre_configure_options} ./configure #{CREW_CONFIGURE_OPTIONS} #{@autotools_configure_options}" end system 'make' - @configure_build_extras&.call + @autotools_build_extras&.call end def self.install system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' - @configure_install_extras&.call + @autotools_install_extras&.call end def self.check diff --git a/lib/buildsystems/cmake.rb b/lib/buildsystems/cmake.rb index 91d59fcad..103d7fbe2 100644 --- a/lib/buildsystems/cmake.rb +++ b/lib/buildsystems/cmake.rb @@ -1,5 +1,6 @@ -require 'package' -require 'require_gem' +require_relative '../package' +require_relative '../require_gem' +require_relative '../report_buildsystem_methods' class CMake < Package property :cmake_build_extras, :cmake_build_relative_dir, :cmake_install_extras, :cmake_options, :pre_cmake_options @@ -7,21 +8,9 @@ class CMake < Package def self.build @cmake_build_relative_dir ||= '.' @crew_cmake_options = @no_lto ? CREW_CMAKE_OPTIONS.gsub('-flto=auto', '-fno-lto').sub('-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE', '') : CREW_CMAKE_OPTIONS - puts "Additional #{superclass.to_s.capitalize} options being used:".orange - method_list = methods.grep(/cmake_/).delete_if { |i| send(i).blank? } - require_gem 'method_source' - method_blocks = [] - method_strings = [] - method_list.sort.each do |method| - @method_info = send method - if @method_info.is_a? String - method_strings << "#{method}: #{@method_info}".orange - else - method_blocks << @method_info.source.to_s.orange - end - end - puts method_strings - puts method_blocks + + extend ReportBuildsystemMethods + print_buildsystem_methods system "#{@pre_cmake_options} cmake -S #{@cmake_build_relative_dir} -B #{@cmake_build_relative_dir}/builddir -G Ninja #{@crew_cmake_options} #{@cmake_options}" system "#{CREW_NINJA} -C #{@cmake_build_relative_dir}/builddir" diff --git a/lib/buildsystems/meson.rb b/lib/buildsystems/meson.rb index 1791b5b35..10be41459 100644 --- a/lib/buildsystems/meson.rb +++ b/lib/buildsystems/meson.rb @@ -1,26 +1,15 @@ -require 'package' -require 'require_gem' +require_relative '../package' +require_relative '../require_gem' +require_relative '../report_buildsystem_methods' class Meson < Package property :meson_options, :pre_meson_options, :meson_build_extras, :meson_install_extras def self.build @crew_meson_options = @no_lto ? CREW_MESON_OPTIONS.sub('-Db_lto=true', '-Db_lto=false') : CREW_MESON_OPTIONS - puts "Additional #{superclass.to_s.capitalize} options being used:".orange - method_list = methods.grep(/meson_/).delete_if { |i| send(i).blank? } - require_gem 'method_source' - method_blocks = [] - method_strings = [] - method_list.sort.each do |method| - @method_info = send method - if @method_info.is_a? String - method_strings << "#{method}: #{@method_info}".orange - else - method_blocks << @method_info.source.to_s.orange - end - end - puts method_strings - puts method_blocks + + extend ReportBuildsystemMethods + print_buildsystem_methods system "#{@pre_meson_options} meson setup #{@crew_meson_options} #{@meson_options} builddir" system 'meson configure --no-pager builddir' diff --git a/lib/buildsystems/perl.rb b/lib/buildsystems/perl.rb index 10bb05f5d..deec84b20 100644 --- a/lib/buildsystems/perl.rb +++ b/lib/buildsystems/perl.rb @@ -1,25 +1,13 @@ -require 'package' -require 'require_gem' +require_relative '../package' +require_relative '../require_gem' +require_relative '../report_buildsystem_methods' class PERL < Package property :pre_perl_options, :perl_build_extras, :perl_install_extras def self.prebuild - puts "Additional #{superclass.to_s.capitalize} options being used:".orange - method_list = methods.grep(/perl_/).delete_if { |i| send(i).blank? } - require_gem 'method_source' - method_blocks = [] - method_strings = [] - method_list.sort.each do |method| - @method_info = send method - if @method_info.is_a? String - method_strings << "#{method}: #{@method_info}".orange - else - method_blocks << @method_info.source.to_s.orange - end - end - puts method_strings - puts method_blocks + extend ReportBuildsystemMethods + print_buildsystem_methods system "#{@pre_perl_options} perl Makefile.PL" system "sed -i 's,/usr/local,#{CREW_PREFIX},g' Makefile" diff --git a/lib/buildsystems/pip.rb b/lib/buildsystems/pip.rb index 1b27fad9d..5a1ee81ca 100644 --- a/lib/buildsystems/pip.rb +++ b/lib/buildsystems/pip.rb @@ -1,8 +1,9 @@ Encoding.default_external = Encoding::UTF_8 Encoding.default_internal = Encoding::UTF_8 require 'json' -require 'package' -require 'require_gem' +require_relative '../package' +require_relative '../require_gem' +require_relative '../report_buildsystem_methods' def get_pip_info(pip_pkg_name = nil) @pip_show = nil @@ -37,21 +38,8 @@ class Pip < Package property :pip_install_extras, :pip_pre_configure_options def self.install - puts "Additional #{superclass.to_s.capitalize} options being used:".orange - method_list = methods.grep(/pip_/).delete_if { |i| send(i).blank? } - require_gem 'method_source' - method_blocks = [] - method_strings = [] - method_list.sort.each do |method| - @method_info = send method - if @method_info.is_a? String - method_strings << "#{method}: #{@method_info}".orange - else - method_blocks << @method_info.source.to_s.orange - end - end - puts method_strings - puts method_blocks + extend ReportBuildsystemMethods + print_buildsystem_methods @pip_cache_dir = `pip cache dir`.chomp @pip_cache_dest_dir = File.join(CREW_DEST_DIR, @pip_cache_dir) diff --git a/lib/buildsystems/python.rb b/lib/buildsystems/python.rb index 19596f4f5..693859405 100644 --- a/lib/buildsystems/python.rb +++ b/lib/buildsystems/python.rb @@ -1,25 +1,13 @@ -require 'package' -require 'require_gem' +require_relative '../package' +require_relative '../require_gem' +require_relative '../report_buildsystem_methods' class Python < Package property :python_build_extras, :python_build_options, :python_build_relative_dir, :python_install_extras, :python_install_options, :python_no_svem def self.build - puts "Additional #{superclass.to_s.capitalize} options being used:".orange - method_list = methods.grep(/python_/).delete_if { |i| send(i).blank? } - require_gem 'method_source' - method_blocks = [] - method_strings = [] - method_list.sort.each do |method| - @method_info = send method - if @method_info.is_a? String - method_strings << "#{method}: #{@method_info}".orange - else - method_blocks << @method_info.source.to_s.orange - end - end - puts method_strings - puts method_blocks + extend ReportBuildsystemMethods + print_buildsystem_methods @python_build_relative_dir ||= '.' Dir.chdir(@python_build_relative_dir) do diff --git a/lib/buildsystems/qmake.rb b/lib/buildsystems/qmake.rb index de5937b82..459e40e08 100644 --- a/lib/buildsystems/qmake.rb +++ b/lib/buildsystems/qmake.rb @@ -1,25 +1,13 @@ -require 'package' -require 'require_gem' +require_relative '../package' +require_relative '../require_gem' +require_relative '../report_buildsystem_methods' class Qmake < Package property :qmake_build_extras, :qmake_install_extras def self.build - puts "Additional #{superclass.to_s.capitalize} options being used:".orange - method_list = methods.grep(/qmake_/).delete_if { |i| send(i).blank? } - require_gem 'method_source' - method_blocks = [] - method_strings = [] - method_list.sort.each do |method| - @method_info = send method - if @method_info.is_a? String - method_strings << "#{method}: #{@method_info}".orange - else - method_blocks << @method_info.source.to_s.orange - end - end - puts method_strings - puts method_blocks + extend ReportBuildsystemMethods + print_buildsystem_methods system "QMAKE_CXX='g++ #{ARCH == 'x86_64' && Gem::Version.new(LIBC_VERSION.to_s) >= Gem::Version.new('2.35') ? File.join(CREW_LIB_PREFIX, 'libC.so.6').to_s : ''}' qmake" system 'make' diff --git a/lib/buildsystems/ruby.rb b/lib/buildsystems/ruby.rb index f4a4b6aef..4aca17a06 100644 --- a/lib/buildsystems/ruby.rb +++ b/lib/buildsystems/ruby.rb @@ -1,8 +1,9 @@ -require 'color' -require 'gem_compact_index_client' -require 'package' -require 'package_utils' -require 'require_gem' +require_relative '../color' +require_relative '../gem_compact_index_client' +require_relative '../package' +require_relative '../package_utils' +require_relative '../report_buildsystem_methods' +require_relative '../require_gem' require_gem('activesupport', 'active_support/core_ext/object/blank') @@ -110,21 +111,8 @@ class RUBY < Package def self.build return unless !no_compile_needed? || @gem_binary_build_needed - puts "Additional #{superclass.to_s.capitalize} options being used:".orange - method_list = methods.grep(/ruby_/).delete_if { |i| send(i).blank? } - require_gem 'method_source' - method_blocks = [] - method_strings = [] - method_list.sort.each do |method| - @method_info = send method - if @method_info.is_a? String - method_strings << "#{method}: #{@method_info}".orange - else - method_blocks << @method_info.source.to_s.orange - end - end - puts method_strings - puts method_blocks + extend ReportBuildsystemMethods + print_buildsystem_methods Kernel.system "gem fetch #{@ruby_gem_name} --platform=ruby --version=#{@ruby_gem_version}" Kernel.system "gem unpack #{@ruby_gem_name}-#{@ruby_gem_version}.gem" diff --git a/lib/buildsystems/rust.rb b/lib/buildsystems/rust.rb index a35bbd48f..60286a9c3 100644 --- a/lib/buildsystems/rust.rb +++ b/lib/buildsystems/rust.rb @@ -1,5 +1,6 @@ -require 'package' -require 'require_gem' +require_relative '../package' +require_relative '../require_gem' +require_relative '../report_buildsystem_methods' class RUST < Package property :rust_features, :rust_options, :rust_release_profile, :rust_targets, :pre_rust_options, :rust_build_extras, :rust_install_extras @@ -12,21 +13,8 @@ class RUST < Package PATH: "#{CREW_PREFIX}/share/cargo/bin:" + ENV.fetch('PATH', nil) }.transform_keys(&:to_s) - puts "Additional #{superclass.to_s.capitalize} options being used:".orange - method_list = methods.grep(/rust_/).delete_if { |i| send(i).blank? } - require_gem 'method_source' - method_blocks = [] - method_strings = [] - method_list.sort.each do |method| - @method_info = send method - if @method_info.is_a? String - method_strings << "#{method}: #{@method_info}".orange - else - method_blocks << @method_info.source.to_s.orange - end - end - puts method_strings - puts method_blocks + extend ReportBuildsystemMethods + print_buildsystem_methods system rust_env, "rustup target add #{@rust_targets}" unless @rust_targets.to_s.empty? system rust_env, "#{@pre_rust_options} cargo fetch" diff --git a/lib/const.rb b/lib/const.rb index 10850b13f..58e651e21 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -3,7 +3,7 @@ require 'etc' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' -CREW_VERSION ||= '1.61.3' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION +CREW_VERSION ||= '1.61.4' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION # Kernel architecture. KERN_ARCH ||= Etc.uname[:machine] diff --git a/lib/fixup.rb b/lib/fixup.rb index 206fa769e..f67f58346 100644 --- a/lib/fixup.rb +++ b/lib/fixup.rb @@ -162,6 +162,7 @@ renamed_packages = Set[ deprecated_packages = Set[ { pkg_name: 'epydoc', comments: 'Abandoned upstream, only supports Python 2.' }, + { pkg_name: 'gfbgraph', commwnts: 'Deprecated upstteam.' }, { pkg_name: 'git_prompt', comments: 'Integrated into git package.' }, { pkg_name: 'glibc_build223', comments: 'We are moving away from system glibc.' }, { pkg_name: 'glibc_build227', comments: 'We are moving away from system glibc.' }, diff --git a/lib/package.rb b/lib/package.rb index f2650df71..4f27e69df 100644 --- a/lib/package.rb +++ b/lib/package.rb @@ -74,7 +74,7 @@ class Package elsif File.directory? config_object identifier = 'directory' else - puts "Cannot identify #{config_object}.".lightred + crewlog "Cannot remove #{config_object}." return end if agree_default_no("Would you like to remove the config #{identifier}: #{config_object} ") diff --git a/lib/report_buildsystem_methods.rb b/lib/report_buildsystem_methods.rb new file mode 100644 index 000000000..b654b0a2f --- /dev/null +++ b/lib/report_buildsystem_methods.rb @@ -0,0 +1,21 @@ +module ReportBuildsystemMethods + def print_buildsystem_methods + method_list = methods.grep(/#{superclass.to_s.downcase}_/).delete_if { |i| send(i).blank? } + unless method_list.empty? + require_gem 'method_source' + method_blocks = [] + method_strings = [] + method_list.sort.each do |method| + @method_info = send method + if @method_info.is_a? String + method_strings << "#{method}: #{@method_info}".orange + else + method_blocks << @method_info.source.to_s.orange + end + end + puts "Additional #{superclass.to_s.capitalize} options being used:".orange + puts method_strings + puts method_blocks + end + end +end diff --git a/manifest/armv7l/g/gnome_weather.filelist b/manifest/armv7l/g/gnome_weather.filelist index 30769c5c3..5fa6914ea 100644 --- a/manifest/armv7l/g/gnome_weather.filelist +++ b/manifest/armv7l/g/gnome_weather.filelist @@ -5,6 +5,7 @@ /usr/local/share/glib-2.0/schemas/org.gnome.Weather.gschema.xml /usr/local/share/gnome-shell/search-providers/org.gnome.Weather.search-provider.ini /usr/local/share/icons/hicolor/scalable/apps/org.gnome.Weather.svg +/usr/local/share/icons/hicolor/scalable/status/checkmark-symbolic.svg /usr/local/share/icons/hicolor/scalable/status/temperature-symbolic.svg /usr/local/share/icons/hicolor/scalable/status/weather-clear-large.svg /usr/local/share/icons/hicolor/scalable/status/weather-clear-night-large.svg @@ -40,7 +41,9 @@ /usr/local/share/locale/ar/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/as/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/be/LC_MESSAGES/org.gnome.Weather.mo +/usr/local/share/locale/be@latin/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/bg/LC_MESSAGES/org.gnome.Weather.mo +/usr/local/share/locale/bn/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/bn_IN/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/bs/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ca/LC_MESSAGES/org.gnome.Weather.mo @@ -57,6 +60,7 @@ /usr/local/share/locale/eu/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/fa/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/fi/LC_MESSAGES/org.gnome.Weather.mo +/usr/local/share/locale/fil/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/fr/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/fur/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/fy/LC_MESSAGES/org.gnome.Weather.mo @@ -72,6 +76,7 @@ /usr/local/share/locale/it/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ja/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ka/LC_MESSAGES/org.gnome.Weather.mo +/usr/local/share/locale/kab/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/kk/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/kn/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ko/LC_MESSAGES/org.gnome.Weather.mo @@ -90,6 +95,7 @@ /usr/local/share/locale/pt_BR/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ro/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ru/LC_MESSAGES/org.gnome.Weather.mo +/usr/local/share/locale/rw/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/sk/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/sl/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/sr/LC_MESSAGES/org.gnome.Weather.mo diff --git a/manifest/armv7l/l/libadwaita.filelist b/manifest/armv7l/l/libadwaita.filelist index fec33e6e4..64979ef8c 100644 --- a/manifest/armv7l/l/libadwaita.filelist +++ b/manifest/armv7l/l/libadwaita.filelist @@ -32,6 +32,7 @@ /usr/local/include/libadwaita-1/adw-flap.h /usr/local/include/libadwaita-1/adw-fold-threshold-policy.h /usr/local/include/libadwaita-1/adw-header-bar.h +/usr/local/include/libadwaita-1/adw-inline-view-switcher.h /usr/local/include/libadwaita-1/adw-layout-slot.h /usr/local/include/libadwaita-1/adw-layout.h /usr/local/include/libadwaita-1/adw-leaflet.h @@ -68,6 +69,7 @@ /usr/local/include/libadwaita-1/adw-timed-animation.h /usr/local/include/libadwaita-1/adw-toast-overlay.h /usr/local/include/libadwaita-1/adw-toast.h +/usr/local/include/libadwaita-1/adw-toggle-group.h /usr/local/include/libadwaita-1/adw-toolbar-view.h /usr/local/include/libadwaita-1/adw-version.h /usr/local/include/libadwaita-1/adw-view-stack.h @@ -76,6 +78,8 @@ /usr/local/include/libadwaita-1/adw-view-switcher.h /usr/local/include/libadwaita-1/adw-window-title.h /usr/local/include/libadwaita-1/adw-window.h +/usr/local/include/libadwaita-1/adw-wrap-box.h +/usr/local/include/libadwaita-1/adw-wrap-layout.h /usr/local/include/libadwaita-1/adwaita.h /usr/local/lib/girepository-1.0/Adw-1.typelib /usr/local/lib/libadwaita-1.so @@ -96,6 +100,7 @@ /usr/local/share/locale/eu/LC_MESSAGES/libadwaita.mo /usr/local/share/locale/fa/LC_MESSAGES/libadwaita.mo /usr/local/share/locale/fi/LC_MESSAGES/libadwaita.mo +/usr/local/share/locale/fil/LC_MESSAGES/libadwaita.mo /usr/local/share/locale/fr/LC_MESSAGES/libadwaita.mo /usr/local/share/locale/fur/LC_MESSAGES/libadwaita.mo /usr/local/share/locale/gl/LC_MESSAGES/libadwaita.mo diff --git a/manifest/armv7l/l/libarchive.filelist b/manifest/armv7l/l/libarchive.filelist index 3d2bbc4fd..bb1073e23 100644 --- a/manifest/armv7l/l/libarchive.filelist +++ b/manifest/armv7l/l/libarchive.filelist @@ -8,7 +8,7 @@ /usr/local/lib/libarchive.la /usr/local/lib/libarchive.so /usr/local/lib/libarchive.so.13 -/usr/local/lib/libarchive.so.13.7.4 +/usr/local/lib/libarchive.so.13.8.0 /usr/local/lib/pkgconfig/libarchive.pc /usr/local/share/man/man1/bsdcat.1.zst /usr/local/share/man/man1/bsdcpio.1.zst diff --git a/manifest/armv7l/l/libavif.filelist b/manifest/armv7l/l/libavif.filelist index a2651524b..64b14ee1b 100644 --- a/manifest/armv7l/l/libavif.filelist +++ b/manifest/armv7l/l/libavif.filelist @@ -1,5 +1,6 @@ /usr/local/bin/avifdec /usr/local/bin/avifenc +/usr/local/bin/avifgainmaputil /usr/local/include/avif/avif.h /usr/local/include/avif/avif_cxx.h /usr/local/lib/cmake/libavif/libavif-config-release.cmake @@ -8,8 +9,6 @@ /usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-avif.so /usr/local/lib/libavif.so /usr/local/lib/libavif.so.16 -/usr/local/lib/libavif.so.16.1.0 +/usr/local/lib/libavif.so.16.3.0 /usr/local/lib/pkgconfig/libavif.pc -/usr/local/share/man/man1/avifdec.1.zst -/usr/local/share/man/man1/avifenc.1.zst /usr/local/share/thumbnailers/avif.thumbnailer diff --git a/manifest/armv7l/l/libjpeg_turbo.filelist b/manifest/armv7l/l/libjpeg_turbo.filelist index 9299f28bf..49f44ccf5 100644 --- a/manifest/armv7l/l/libjpeg_turbo.filelist +++ b/manifest/armv7l/l/libjpeg_turbo.filelist @@ -19,7 +19,7 @@ /usr/local/lib/libjpeg.so.62.4.0 /usr/local/lib/libturbojpeg.so /usr/local/lib/libturbojpeg.so.0 -/usr/local/lib/libturbojpeg.so.0.3.0 +/usr/local/lib/libturbojpeg.so.0.4.0 /usr/local/lib/pkgconfig/libjpeg.pc /usr/local/lib/pkgconfig/libturbojpeg.pc /usr/local/share/doc/libjpeg-turbo/LICENSE.md @@ -28,7 +28,9 @@ /usr/local/share/doc/libjpeg-turbo/example.c /usr/local/share/doc/libjpeg-turbo/libjpeg.txt /usr/local/share/doc/libjpeg-turbo/structure.txt -/usr/local/share/doc/libjpeg-turbo/tjexample.c +/usr/local/share/doc/libjpeg-turbo/tjcomp.c +/usr/local/share/doc/libjpeg-turbo/tjdecomp.c +/usr/local/share/doc/libjpeg-turbo/tjtran.c /usr/local/share/doc/libjpeg-turbo/usage.txt /usr/local/share/doc/libjpeg-turbo/wizard.txt /usr/local/share/man/man1/cjpeg.1.zst diff --git a/manifest/armv7l/l/libshumate.filelist b/manifest/armv7l/l/libshumate.filelist index b167aeb3a..1660c778c 100644 --- a/manifest/armv7l/l/libshumate.filelist +++ b/manifest/armv7l/l/libshumate.filelist @@ -63,10 +63,12 @@ /usr/local/share/locale/is/LC_MESSAGES/shumate1.mo /usr/local/share/locale/it/LC_MESSAGES/shumate1.mo /usr/local/share/locale/ka/LC_MESSAGES/shumate1.mo +/usr/local/share/locale/kab/LC_MESSAGES/shumate1.mo /usr/local/share/locale/kk/LC_MESSAGES/shumate1.mo /usr/local/share/locale/ko/LC_MESSAGES/shumate1.mo /usr/local/share/locale/lt/LC_MESSAGES/shumate1.mo /usr/local/share/locale/lv/LC_MESSAGES/shumate1.mo +/usr/local/share/locale/ml/LC_MESSAGES/shumate1.mo /usr/local/share/locale/ne/LC_MESSAGES/shumate1.mo /usr/local/share/locale/nl/LC_MESSAGES/shumate1.mo /usr/local/share/locale/oc/LC_MESSAGES/shumate1.mo diff --git a/manifest/armv7l/l/libxml2.filelist b/manifest/armv7l/l/libxml2.filelist index cd4dbabfd..a6866952e 100644 --- a/manifest/armv7l/l/libxml2.filelist +++ b/manifest/armv7l/l/libxml2.filelist @@ -47,13 +47,13 @@ /usr/local/include/libxml2/libxml/xpath.h /usr/local/include/libxml2/libxml/xpathInternals.h /usr/local/include/libxml2/libxml/xpointer.h -/usr/local/lib/cmake/libxml2-2.13.4/libxml2-config-version.cmake -/usr/local/lib/cmake/libxml2-2.13.4/libxml2-config.cmake -/usr/local/lib/cmake/libxml2-2.13.4/libxml2-export-release.cmake -/usr/local/lib/cmake/libxml2-2.13.4/libxml2-export.cmake +/usr/local/lib/cmake/libxml2-2.13.7/libxml2-config-version.cmake +/usr/local/lib/cmake/libxml2-2.13.7/libxml2-config.cmake +/usr/local/lib/cmake/libxml2-2.13.7/libxml2-export-release.cmake +/usr/local/lib/cmake/libxml2-2.13.7/libxml2-export.cmake /usr/local/lib/libxml2.so /usr/local/lib/libxml2.so.2 -/usr/local/lib/libxml2.so.2.13.4 +/usr/local/lib/libxml2.so.2.13.7 /usr/local/lib/pkgconfig/libxml-2.0.pc /usr/local/share/aclocal/libxml.m4 /usr/local/share/doc/libxml2/devhelp/general.html diff --git a/manifest/armv7l/l/libxml2_autotools.filelist b/manifest/armv7l/l/libxml2_autotools.filelist index 334e2b345..092ffac8b 100644 --- a/manifest/armv7l/l/libxml2_autotools.filelist +++ b/manifest/armv7l/l/libxml2_autotools.filelist @@ -51,7 +51,7 @@ /usr/local/lib/libxml2.la /usr/local/lib/libxml2.so /usr/local/lib/libxml2.so.2 -/usr/local/lib/libxml2.so.2.13.3 +/usr/local/lib/libxml2.so.2.13.7 /usr/local/lib/pkgconfig/libxml-2.0.pc /usr/local/share/aclocal/libxml.m4 /usr/local/share/doc/libxml2/xmlcatalog.html diff --git a/manifest/armv7l/l/libyuv.filelist b/manifest/armv7l/l/libyuv.filelist index 8c7728c87..b30197778 100644 --- a/manifest/armv7l/l/libyuv.filelist +++ b/manifest/armv7l/l/libyuv.filelist @@ -8,6 +8,7 @@ /usr/local/include/libyuv/convert_from.h /usr/local/include/libyuv/convert_from_argb.h /usr/local/include/libyuv/cpu_id.h +/usr/local/include/libyuv/cpu_support.h /usr/local/include/libyuv/loongson_intrinsics.h /usr/local/include/libyuv/macros_msa.h /usr/local/include/libyuv/mjpeg_decoder.h @@ -16,6 +17,7 @@ /usr/local/include/libyuv/rotate_argb.h /usr/local/include/libyuv/rotate_row.h /usr/local/include/libyuv/row.h +/usr/local/include/libyuv/row_sve.h /usr/local/include/libyuv/scale.h /usr/local/include/libyuv/scale_argb.h /usr/local/include/libyuv/scale_rgb.h diff --git a/manifest/armv7l/p/py3_libxml2.filelist b/manifest/armv7l/p/py3_libxml2.filelist index 8ab9cf942..bd64bcd90 100644 --- a/manifest/armv7l/p/py3_libxml2.filelist +++ b/manifest/armv7l/p/py3_libxml2.filelist @@ -1,13 +1,12 @@ -/usr/local/.cache/pip/libxml2_python-2.13.4-cp313-cp313-linux_armv8l.whl /usr/local/lib/python3.13/site-packages/__pycache__/drv_libxml2.cpython-313.pyc /usr/local/lib/python3.13/site-packages/__pycache__/libxml2.cpython-313.pyc /usr/local/lib/python3.13/site-packages/drv_libxml2.py /usr/local/lib/python3.13/site-packages/libxml2.py -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/INSTALLER -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/METADATA -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/RECORD -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/REQUESTED -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/WHEEL -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/direct_url.json -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/top_level.txt +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/INSTALLER +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/METADATA +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/RECORD +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/REQUESTED +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/WHEEL +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/direct_url.json +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/top_level.txt /usr/local/lib/python3.13/site-packages/libxml2mod.cpython-313-arm-linux-gnueabihf.so diff --git a/manifest/armv7l/p/py3_pycairo.filelist b/manifest/armv7l/p/py3_pycairo.filelist index ea2663ca5..8961ed594 100644 --- a/manifest/armv7l/p/py3_pycairo.filelist +++ b/manifest/armv7l/p/py3_pycairo.filelist @@ -4,8 +4,8 @@ /usr/local/lib/python3.13/site-packages/cairo/_cairo.cpython-313-arm-linux-gnueabihf.so /usr/local/lib/python3.13/site-packages/cairo/include/py3cairo.h /usr/local/lib/python3.13/site-packages/cairo/py.typed -/usr/local/lib/python3.13/site-packages/pycairo-1.27.0.dist-info/INSTALLER -/usr/local/lib/python3.13/site-packages/pycairo-1.27.0.dist-info/METADATA -/usr/local/lib/python3.13/site-packages/pycairo-1.27.0.dist-info/RECORD -/usr/local/lib/python3.13/site-packages/pycairo-1.27.0.dist-info/REQUESTED -/usr/local/lib/python3.13/site-packages/pycairo-1.27.0.dist-info/WHEEL +/usr/local/lib/python3.13/site-packages/pycairo-1.28.0.dist-info/INSTALLER +/usr/local/lib/python3.13/site-packages/pycairo-1.28.0.dist-info/METADATA +/usr/local/lib/python3.13/site-packages/pycairo-1.28.0.dist-info/RECORD +/usr/local/lib/python3.13/site-packages/pycairo-1.28.0.dist-info/REQUESTED +/usr/local/lib/python3.13/site-packages/pycairo-1.28.0.dist-info/WHEEL diff --git a/manifest/i686/j/jq.filelist b/manifest/i686/j/jq.filelist index ba6e83a4b..1eb3342b5 100644 --- a/manifest/i686/j/jq.filelist +++ b/manifest/i686/j/jq.filelist @@ -6,8 +6,14 @@ /usr/local/include/oniguruma.h /usr/local/lib/libjq.a /usr/local/lib/libjq.la +/usr/local/lib/libjq.so +/usr/local/lib/libjq.so.1 +/usr/local/lib/libjq.so.1.0.4 /usr/local/lib/libonig.a /usr/local/lib/libonig.la +/usr/local/lib/libonig.so +/usr/local/lib/libonig.so.5 +/usr/local/lib/libonig.so.5.3.0 /usr/local/lib/pkgconfig/libjq.pc /usr/local/lib/pkgconfig/oniguruma.pc /usr/local/share/doc/jq/AUTHORS diff --git a/manifest/i686/l/libarchive.filelist b/manifest/i686/l/libarchive.filelist index 3d2bbc4fd..bb1073e23 100644 --- a/manifest/i686/l/libarchive.filelist +++ b/manifest/i686/l/libarchive.filelist @@ -8,7 +8,7 @@ /usr/local/lib/libarchive.la /usr/local/lib/libarchive.so /usr/local/lib/libarchive.so.13 -/usr/local/lib/libarchive.so.13.7.4 +/usr/local/lib/libarchive.so.13.8.0 /usr/local/lib/pkgconfig/libarchive.pc /usr/local/share/man/man1/bsdcat.1.zst /usr/local/share/man/man1/bsdcpio.1.zst diff --git a/manifest/i686/l/libjpeg_turbo.filelist b/manifest/i686/l/libjpeg_turbo.filelist index 9299f28bf..49f44ccf5 100644 --- a/manifest/i686/l/libjpeg_turbo.filelist +++ b/manifest/i686/l/libjpeg_turbo.filelist @@ -19,7 +19,7 @@ /usr/local/lib/libjpeg.so.62.4.0 /usr/local/lib/libturbojpeg.so /usr/local/lib/libturbojpeg.so.0 -/usr/local/lib/libturbojpeg.so.0.3.0 +/usr/local/lib/libturbojpeg.so.0.4.0 /usr/local/lib/pkgconfig/libjpeg.pc /usr/local/lib/pkgconfig/libturbojpeg.pc /usr/local/share/doc/libjpeg-turbo/LICENSE.md @@ -28,7 +28,9 @@ /usr/local/share/doc/libjpeg-turbo/example.c /usr/local/share/doc/libjpeg-turbo/libjpeg.txt /usr/local/share/doc/libjpeg-turbo/structure.txt -/usr/local/share/doc/libjpeg-turbo/tjexample.c +/usr/local/share/doc/libjpeg-turbo/tjcomp.c +/usr/local/share/doc/libjpeg-turbo/tjdecomp.c +/usr/local/share/doc/libjpeg-turbo/tjtran.c /usr/local/share/doc/libjpeg-turbo/usage.txt /usr/local/share/doc/libjpeg-turbo/wizard.txt /usr/local/share/man/man1/cjpeg.1.zst diff --git a/manifest/i686/l/libxml2.filelist b/manifest/i686/l/libxml2.filelist index cd4dbabfd..a6866952e 100644 --- a/manifest/i686/l/libxml2.filelist +++ b/manifest/i686/l/libxml2.filelist @@ -47,13 +47,13 @@ /usr/local/include/libxml2/libxml/xpath.h /usr/local/include/libxml2/libxml/xpathInternals.h /usr/local/include/libxml2/libxml/xpointer.h -/usr/local/lib/cmake/libxml2-2.13.4/libxml2-config-version.cmake -/usr/local/lib/cmake/libxml2-2.13.4/libxml2-config.cmake -/usr/local/lib/cmake/libxml2-2.13.4/libxml2-export-release.cmake -/usr/local/lib/cmake/libxml2-2.13.4/libxml2-export.cmake +/usr/local/lib/cmake/libxml2-2.13.7/libxml2-config-version.cmake +/usr/local/lib/cmake/libxml2-2.13.7/libxml2-config.cmake +/usr/local/lib/cmake/libxml2-2.13.7/libxml2-export-release.cmake +/usr/local/lib/cmake/libxml2-2.13.7/libxml2-export.cmake /usr/local/lib/libxml2.so /usr/local/lib/libxml2.so.2 -/usr/local/lib/libxml2.so.2.13.4 +/usr/local/lib/libxml2.so.2.13.7 /usr/local/lib/pkgconfig/libxml-2.0.pc /usr/local/share/aclocal/libxml.m4 /usr/local/share/doc/libxml2/devhelp/general.html diff --git a/manifest/i686/l/libxml2_autotools.filelist b/manifest/i686/l/libxml2_autotools.filelist index 334e2b345..092ffac8b 100644 --- a/manifest/i686/l/libxml2_autotools.filelist +++ b/manifest/i686/l/libxml2_autotools.filelist @@ -51,7 +51,7 @@ /usr/local/lib/libxml2.la /usr/local/lib/libxml2.so /usr/local/lib/libxml2.so.2 -/usr/local/lib/libxml2.so.2.13.3 +/usr/local/lib/libxml2.so.2.13.7 /usr/local/lib/pkgconfig/libxml-2.0.pc /usr/local/share/aclocal/libxml.m4 /usr/local/share/doc/libxml2/xmlcatalog.html diff --git a/manifest/i686/p/py3_libxml2.filelist b/manifest/i686/p/py3_libxml2.filelist index b432967e0..6f4038ead 100644 --- a/manifest/i686/p/py3_libxml2.filelist +++ b/manifest/i686/p/py3_libxml2.filelist @@ -1,13 +1,12 @@ -/usr/local/.cache/pip/libxml2_python-2.13.4-cp313-cp313-linux_i686.whl /usr/local/lib/python3.13/site-packages/__pycache__/drv_libxml2.cpython-313.pyc /usr/local/lib/python3.13/site-packages/__pycache__/libxml2.cpython-313.pyc /usr/local/lib/python3.13/site-packages/drv_libxml2.py /usr/local/lib/python3.13/site-packages/libxml2.py -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/INSTALLER -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/METADATA -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/RECORD -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/REQUESTED -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/WHEEL -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/direct_url.json -/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.4.dist-info/top_level.txt +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/INSTALLER +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/METADATA +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/RECORD +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/REQUESTED +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/WHEEL +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/direct_url.json +/usr/local/lib/python3.13/site-packages/libxml2_python-2.13.7.dist-info/top_level.txt /usr/local/lib/python3.13/site-packages/libxml2mod.cpython-313-i386-linux-gnu.so diff --git a/manifest/x86_64/g/gnome_weather.filelist b/manifest/x86_64/g/gnome_weather.filelist index 30769c5c3..5fa6914ea 100644 --- a/manifest/x86_64/g/gnome_weather.filelist +++ b/manifest/x86_64/g/gnome_weather.filelist @@ -5,6 +5,7 @@ /usr/local/share/glib-2.0/schemas/org.gnome.Weather.gschema.xml /usr/local/share/gnome-shell/search-providers/org.gnome.Weather.search-provider.ini /usr/local/share/icons/hicolor/scalable/apps/org.gnome.Weather.svg +/usr/local/share/icons/hicolor/scalable/status/checkmark-symbolic.svg /usr/local/share/icons/hicolor/scalable/status/temperature-symbolic.svg /usr/local/share/icons/hicolor/scalable/status/weather-clear-large.svg /usr/local/share/icons/hicolor/scalable/status/weather-clear-night-large.svg @@ -40,7 +41,9 @@ /usr/local/share/locale/ar/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/as/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/be/LC_MESSAGES/org.gnome.Weather.mo +/usr/local/share/locale/be@latin/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/bg/LC_MESSAGES/org.gnome.Weather.mo +/usr/local/share/locale/bn/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/bn_IN/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/bs/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ca/LC_MESSAGES/org.gnome.Weather.mo @@ -57,6 +60,7 @@ /usr/local/share/locale/eu/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/fa/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/fi/LC_MESSAGES/org.gnome.Weather.mo +/usr/local/share/locale/fil/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/fr/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/fur/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/fy/LC_MESSAGES/org.gnome.Weather.mo @@ -72,6 +76,7 @@ /usr/local/share/locale/it/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ja/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ka/LC_MESSAGES/org.gnome.Weather.mo +/usr/local/share/locale/kab/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/kk/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/kn/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ko/LC_MESSAGES/org.gnome.Weather.mo @@ -90,6 +95,7 @@ /usr/local/share/locale/pt_BR/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ro/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/ru/LC_MESSAGES/org.gnome.Weather.mo +/usr/local/share/locale/rw/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/sk/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/sl/LC_MESSAGES/org.gnome.Weather.mo /usr/local/share/locale/sr/LC_MESSAGES/org.gnome.Weather.mo diff --git a/manifest/x86_64/l/libadwaita.filelist b/manifest/x86_64/l/libadwaita.filelist index db865c061..61e9a443c 100644 --- a/manifest/x86_64/l/libadwaita.filelist +++ b/manifest/x86_64/l/libadwaita.filelist @@ -32,6 +32,7 @@ /usr/local/include/libadwaita-1/adw-flap.h /usr/local/include/libadwaita-1/adw-fold-threshold-policy.h /usr/local/include/libadwaita-1/adw-header-bar.h +/usr/local/include/libadwaita-1/adw-inline-view-switcher.h /usr/local/include/libadwaita-1/adw-layout-slot.h /usr/local/include/libadwaita-1/adw-layout.h /usr/local/include/libadwaita-1/adw-leaflet.h @@ -68,6 +69,7 @@ /usr/local/include/libadwaita-1/adw-timed-animation.h /usr/local/include/libadwaita-1/adw-toast-overlay.h /usr/local/include/libadwaita-1/adw-toast.h +/usr/local/include/libadwaita-1/adw-toggle-group.h /usr/local/include/libadwaita-1/adw-toolbar-view.h /usr/local/include/libadwaita-1/adw-version.h /usr/local/include/libadwaita-1/adw-view-stack.h @@ -76,6 +78,8 @@ /usr/local/include/libadwaita-1/adw-view-switcher.h /usr/local/include/libadwaita-1/adw-window-title.h /usr/local/include/libadwaita-1/adw-window.h +/usr/local/include/libadwaita-1/adw-wrap-box.h +/usr/local/include/libadwaita-1/adw-wrap-layout.h /usr/local/include/libadwaita-1/adwaita.h /usr/local/lib64/girepository-1.0/Adw-1.typelib /usr/local/lib64/libadwaita-1.so @@ -96,6 +100,7 @@ /usr/local/share/locale/eu/LC_MESSAGES/libadwaita.mo /usr/local/share/locale/fa/LC_MESSAGES/libadwaita.mo /usr/local/share/locale/fi/LC_MESSAGES/libadwaita.mo +/usr/local/share/locale/fil/LC_MESSAGES/libadwaita.mo /usr/local/share/locale/fr/LC_MESSAGES/libadwaita.mo /usr/local/share/locale/fur/LC_MESSAGES/libadwaita.mo /usr/local/share/locale/gl/LC_MESSAGES/libadwaita.mo diff --git a/manifest/x86_64/l/libarchive.filelist b/manifest/x86_64/l/libarchive.filelist index bab037293..389703d46 100644 --- a/manifest/x86_64/l/libarchive.filelist +++ b/manifest/x86_64/l/libarchive.filelist @@ -8,7 +8,7 @@ /usr/local/lib64/libarchive.la /usr/local/lib64/libarchive.so /usr/local/lib64/libarchive.so.13 -/usr/local/lib64/libarchive.so.13.7.4 +/usr/local/lib64/libarchive.so.13.8.0 /usr/local/lib64/pkgconfig/libarchive.pc /usr/local/share/man/man1/bsdcat.1.zst /usr/local/share/man/man1/bsdcpio.1.zst diff --git a/manifest/x86_64/l/libavif.filelist b/manifest/x86_64/l/libavif.filelist index 4fc08efd0..45bfbcc6e 100644 --- a/manifest/x86_64/l/libavif.filelist +++ b/manifest/x86_64/l/libavif.filelist @@ -1,5 +1,6 @@ /usr/local/bin/avifdec /usr/local/bin/avifenc +/usr/local/bin/avifgainmaputil /usr/local/include/avif/avif.h /usr/local/include/avif/avif_cxx.h /usr/local/lib64/cmake/libavif/libavif-config-release.cmake @@ -8,8 +9,6 @@ /usr/local/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-avif.so /usr/local/lib64/libavif.so /usr/local/lib64/libavif.so.16 -/usr/local/lib64/libavif.so.16.1.0 +/usr/local/lib64/libavif.so.16.3.0 /usr/local/lib64/pkgconfig/libavif.pc -/usr/local/share/man/man1/avifdec.1.zst -/usr/local/share/man/man1/avifenc.1.zst /usr/local/share/thumbnailers/avif.thumbnailer diff --git a/manifest/x86_64/l/libjpeg_turbo.filelist b/manifest/x86_64/l/libjpeg_turbo.filelist index 432cbf3c7..4df6e7b4b 100644 --- a/manifest/x86_64/l/libjpeg_turbo.filelist +++ b/manifest/x86_64/l/libjpeg_turbo.filelist @@ -19,7 +19,7 @@ /usr/local/lib64/libjpeg.so.62.4.0 /usr/local/lib64/libturbojpeg.so /usr/local/lib64/libturbojpeg.so.0 -/usr/local/lib64/libturbojpeg.so.0.3.0 +/usr/local/lib64/libturbojpeg.so.0.4.0 /usr/local/lib64/pkgconfig/libjpeg.pc /usr/local/lib64/pkgconfig/libturbojpeg.pc /usr/local/share/doc/libjpeg-turbo/LICENSE.md @@ -28,7 +28,9 @@ /usr/local/share/doc/libjpeg-turbo/example.c /usr/local/share/doc/libjpeg-turbo/libjpeg.txt /usr/local/share/doc/libjpeg-turbo/structure.txt -/usr/local/share/doc/libjpeg-turbo/tjexample.c +/usr/local/share/doc/libjpeg-turbo/tjcomp.c +/usr/local/share/doc/libjpeg-turbo/tjdecomp.c +/usr/local/share/doc/libjpeg-turbo/tjtran.c /usr/local/share/doc/libjpeg-turbo/usage.txt /usr/local/share/doc/libjpeg-turbo/wizard.txt /usr/local/share/man/man1/cjpeg.1.zst diff --git a/manifest/x86_64/l/libshumate.filelist b/manifest/x86_64/l/libshumate.filelist index 453d17409..f63c73bc0 100644 --- a/manifest/x86_64/l/libshumate.filelist +++ b/manifest/x86_64/l/libshumate.filelist @@ -63,10 +63,12 @@ /usr/local/share/locale/is/LC_MESSAGES/shumate1.mo /usr/local/share/locale/it/LC_MESSAGES/shumate1.mo /usr/local/share/locale/ka/LC_MESSAGES/shumate1.mo +/usr/local/share/locale/kab/LC_MESSAGES/shumate1.mo /usr/local/share/locale/kk/LC_MESSAGES/shumate1.mo /usr/local/share/locale/ko/LC_MESSAGES/shumate1.mo /usr/local/share/locale/lt/LC_MESSAGES/shumate1.mo /usr/local/share/locale/lv/LC_MESSAGES/shumate1.mo +/usr/local/share/locale/ml/LC_MESSAGES/shumate1.mo /usr/local/share/locale/ne/LC_MESSAGES/shumate1.mo /usr/local/share/locale/nl/LC_MESSAGES/shumate1.mo /usr/local/share/locale/oc/LC_MESSAGES/shumate1.mo diff --git a/manifest/x86_64/l/libxml2.filelist b/manifest/x86_64/l/libxml2.filelist index 4020abcc6..0a222536b 100644 --- a/manifest/x86_64/l/libxml2.filelist +++ b/manifest/x86_64/l/libxml2.filelist @@ -47,13 +47,13 @@ /usr/local/include/libxml2/libxml/xpath.h /usr/local/include/libxml2/libxml/xpathInternals.h /usr/local/include/libxml2/libxml/xpointer.h -/usr/local/lib64/cmake/libxml2-2.13.4/libxml2-config-version.cmake -/usr/local/lib64/cmake/libxml2-2.13.4/libxml2-config.cmake -/usr/local/lib64/cmake/libxml2-2.13.4/libxml2-export-release.cmake -/usr/local/lib64/cmake/libxml2-2.13.4/libxml2-export.cmake +/usr/local/lib64/cmake/libxml2-2.13.7/libxml2-config-version.cmake +/usr/local/lib64/cmake/libxml2-2.13.7/libxml2-config.cmake +/usr/local/lib64/cmake/libxml2-2.13.7/libxml2-export-release.cmake +/usr/local/lib64/cmake/libxml2-2.13.7/libxml2-export.cmake /usr/local/lib64/libxml2.so /usr/local/lib64/libxml2.so.2 -/usr/local/lib64/libxml2.so.2.13.4 +/usr/local/lib64/libxml2.so.2.13.7 /usr/local/lib64/pkgconfig/libxml-2.0.pc /usr/local/share/aclocal/libxml.m4 /usr/local/share/doc/libxml2/devhelp/general.html diff --git a/manifest/x86_64/l/libxml2_autotools.filelist b/manifest/x86_64/l/libxml2_autotools.filelist index 4f6ad26d4..0e4eba98e 100644 --- a/manifest/x86_64/l/libxml2_autotools.filelist +++ b/manifest/x86_64/l/libxml2_autotools.filelist @@ -51,7 +51,7 @@ /usr/local/lib64/libxml2.la /usr/local/lib64/libxml2.so /usr/local/lib64/libxml2.so.2 -/usr/local/lib64/libxml2.so.2.13.3 +/usr/local/lib64/libxml2.so.2.13.7 /usr/local/lib64/pkgconfig/libxml-2.0.pc /usr/local/share/aclocal/libxml.m4 /usr/local/share/doc/libxml2/xmlcatalog.html diff --git a/manifest/x86_64/l/libyuv.filelist b/manifest/x86_64/l/libyuv.filelist index 7a7bf84af..36aaddabc 100644 --- a/manifest/x86_64/l/libyuv.filelist +++ b/manifest/x86_64/l/libyuv.filelist @@ -8,6 +8,7 @@ /usr/local/include/libyuv/convert_from.h /usr/local/include/libyuv/convert_from_argb.h /usr/local/include/libyuv/cpu_id.h +/usr/local/include/libyuv/cpu_support.h /usr/local/include/libyuv/loongson_intrinsics.h /usr/local/include/libyuv/macros_msa.h /usr/local/include/libyuv/mjpeg_decoder.h @@ -16,6 +17,7 @@ /usr/local/include/libyuv/rotate_argb.h /usr/local/include/libyuv/rotate_row.h /usr/local/include/libyuv/row.h +/usr/local/include/libyuv/row_sve.h /usr/local/include/libyuv/scale.h /usr/local/include/libyuv/scale_argb.h /usr/local/include/libyuv/scale_rgb.h diff --git a/manifest/x86_64/p/py3_libxml2.filelist b/manifest/x86_64/p/py3_libxml2.filelist index 0deb91f97..97c691052 100644 --- a/manifest/x86_64/p/py3_libxml2.filelist +++ b/manifest/x86_64/p/py3_libxml2.filelist @@ -1,13 +1,12 @@ -/usr/local/.cache/pip/libxml2_python-2.13.4-cp313-cp313-linux_x86_64.whl /usr/local/lib64/python3.13/site-packages/__pycache__/drv_libxml2.cpython-313.pyc /usr/local/lib64/python3.13/site-packages/__pycache__/libxml2.cpython-313.pyc /usr/local/lib64/python3.13/site-packages/drv_libxml2.py /usr/local/lib64/python3.13/site-packages/libxml2.py -/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.4.dist-info/INSTALLER -/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.4.dist-info/METADATA -/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.4.dist-info/RECORD -/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.4.dist-info/REQUESTED -/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.4.dist-info/WHEEL -/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.4.dist-info/direct_url.json -/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.4.dist-info/top_level.txt +/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.7.dist-info/INSTALLER +/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.7.dist-info/METADATA +/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.7.dist-info/RECORD +/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.7.dist-info/REQUESTED +/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.7.dist-info/WHEEL +/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.7.dist-info/direct_url.json +/usr/local/lib64/python3.13/site-packages/libxml2_python-2.13.7.dist-info/top_level.txt /usr/local/lib64/python3.13/site-packages/libxml2mod.cpython-313-x86_64-linux-gnu.so diff --git a/manifest/x86_64/p/py3_pycairo.filelist b/manifest/x86_64/p/py3_pycairo.filelist index 37057178c..88c6c56cc 100644 --- a/manifest/x86_64/p/py3_pycairo.filelist +++ b/manifest/x86_64/p/py3_pycairo.filelist @@ -4,8 +4,8 @@ /usr/local/lib64/python3.13/site-packages/cairo/_cairo.cpython-313-x86_64-linux-gnu.so /usr/local/lib64/python3.13/site-packages/cairo/include/py3cairo.h /usr/local/lib64/python3.13/site-packages/cairo/py.typed -/usr/local/lib64/python3.13/site-packages/pycairo-1.27.0.dist-info/INSTALLER -/usr/local/lib64/python3.13/site-packages/pycairo-1.27.0.dist-info/METADATA -/usr/local/lib64/python3.13/site-packages/pycairo-1.27.0.dist-info/RECORD -/usr/local/lib64/python3.13/site-packages/pycairo-1.27.0.dist-info/REQUESTED -/usr/local/lib64/python3.13/site-packages/pycairo-1.27.0.dist-info/WHEEL +/usr/local/lib64/python3.13/site-packages/pycairo-1.28.0.dist-info/INSTALLER +/usr/local/lib64/python3.13/site-packages/pycairo-1.28.0.dist-info/METADATA +/usr/local/lib64/python3.13/site-packages/pycairo-1.28.0.dist-info/RECORD +/usr/local/lib64/python3.13/site-packages/pycairo-1.28.0.dist-info/REQUESTED +/usr/local/lib64/python3.13/site-packages/pycairo-1.28.0.dist-info/WHEEL diff --git a/packages/a2png.rb b/packages/a2png.rb index 69408a20b..5021fd60b 100644 --- a/packages/a2png.rb +++ b/packages/a2png.rb @@ -48,7 +48,7 @@ class A2png < Autotools # Autotools: https://www.gnu.org/software/automake/manual/1.16.5/html_node/Standard-Directory-Variables.html # a2png expects cairo to be in $prefix/lib and $prefix/include/cairo, but we sometimes have it in $prefix/lib64. # As a result, we have to pass both directories rather than just --with-cairo-prefix=#{CREW_PREFIX}. - configure_options "--with-cairo-lib=#{CREW_LIB_PREFIX} --with-cairo-include=#{CREW_PREFIX}/include/cairo" + autotools_configure_options "--with-cairo-lib=#{CREW_LIB_PREFIX} --with-cairo-include=#{CREW_PREFIX}/include/cairo" run_tests end diff --git a/packages/aircrack_ng.rb b/packages/aircrack_ng.rb index cb5d5f6a5..9406fff44 100644 --- a/packages/aircrack_ng.rb +++ b/packages/aircrack_ng.rb @@ -31,6 +31,6 @@ class Aircrack_ng < Autotools end # https://github.com/aircrack-ng/aircrack-ng/issues/2623 - pre_configure_options 'CFLAGS=-Wno-error=implicit-function-declaration' + autotools_pre_configure_options 'CFLAGS=-Wno-error=implicit-function-declaration' run_tests end diff --git a/packages/apr.rb b/packages/apr.rb index 12f878dec..83cbd5e97 100644 --- a/packages/apr.rb +++ b/packages/apr.rb @@ -20,5 +20,5 @@ class Apr < Autotools depends_on 'util_linux' # R # https://bz.apache.org/bugzilla/show_bug.cgi?id=63439 - configure_options '--with-devrandom --without-sendfile --enable-layout=GNU' + autotools_configure_options '--with-devrandom --without-sendfile --enable-layout=GNU' end diff --git a/packages/apr_util.rb b/packages/apr_util.rb index beb1fe295..afee92ec6 100644 --- a/packages/apr_util.rb +++ b/packages/apr_util.rb @@ -20,5 +20,5 @@ class Apr_util < Autotools depends_on 'apr' depends_on 'expat' - configure_options "--with-apr=#{CREW_PREFIX}" + autotools_configure_options "--with-apr=#{CREW_PREFIX}" end diff --git a/packages/aria2.rb b/packages/aria2.rb index 2254db8d5..6afa7f089 100644 --- a/packages/aria2.rb +++ b/packages/aria2.rb @@ -38,7 +38,7 @@ class Aria2 < Autotools depends_on 'zlib' # R depends_on 'zstd' # R - configure_options "--with-libnettle --with-libgcrypt --with-libssh2 \ + autotools_configure_options "--with-libnettle --with-libgcrypt --with-libssh2 \ --with-ca-bundle=#{CREW_PREFIX}/etc/ssl/certs/ca-certificates.crt" # run_tests diff --git a/packages/avahi.rb b/packages/avahi.rb index 2f0fb3619..c5399e528 100644 --- a/packages/avahi.rb +++ b/packages/avahi.rb @@ -29,7 +29,7 @@ class Avahi < Autotools depends_on 'libssp' # R depends_on 'xmltoman' => :build - configure_options "--enable-compat-libdns_sd \ + autotools_configure_options "--enable-compat-libdns_sd \ --disable-gtk \ --disable-gtk3 \ --disable-libsystemd \ diff --git a/packages/bacon.rb b/packages/bacon.rb index 0b841474b..53ce30623 100644 --- a/packages/bacon.rb +++ b/packages/bacon.rb @@ -21,5 +21,5 @@ class Bacon < Autotools system 'sed -i "s,/usr/share,\$\(DATADIR\)," Makefile.in' end - configure_options '--disable-gui' + autotools_configure_options '--disable-gui' end diff --git a/packages/bacula.rb b/packages/bacula.rb index e61f9d4b3..19cb70080 100644 --- a/packages/bacula.rb +++ b/packages/bacula.rb @@ -24,7 +24,7 @@ class Bacula < Autotools depends_on 'zlib' # R depends_on 'zstd' # R - configure_options "--sbindir=#{CREW_PREFIX}/bin \ + autotools_configure_options "--sbindir=#{CREW_PREFIX}/bin \ --enable-smartalloc \ --with-mysql \ --with-tcp-wrappers \ diff --git a/packages/bash.rb b/packages/bash.rb index 3fbf6e84f..cad3503e3 100644 --- a/packages/bash.rb +++ b/packages/bash.rb @@ -23,13 +23,13 @@ class Bash < Autotools depends_on 'ncurses' # R depends_on 'readline' # R - configure_options '--with-curses \ + autotools_configure_options '--with-curses \ --enable-extended-glob-default \ --enable-readline \ --without-bash-malloc \ --with-installed-readline' - configure_install_extras do + autotools_install_extras do FileUtils.ln_s "#{CREW_PREFIX}/bin/bash", "#{CREW_DEST_PREFIX}/bin/sh" end end diff --git a/packages/bashdb.rb b/packages/bashdb.rb index 5fab7ae9b..f68ddf5a9 100644 --- a/packages/bashdb.rb +++ b/packages/bashdb.rb @@ -43,6 +43,6 @@ class Bashdb < Autotools # Setting --with-dbg-main works, but looking at configure.ac reveals that collaboration with upstream is probably required # i.e. why does setting a variable described as "location of dbg-main.sh" to the location of bashdb-main.inc fix things? # It seems like DBGR_MAIN is confused with BASHDB_MAIN, among other things. - configure_options "--with-dbg-main=#{CREW_PREFIX}/share/bashdb-main.inc --with-bash=#{CREW_PREFIX}/bin/bash" + autotools_configure_options "--with-dbg-main=#{CREW_PREFIX}/share/bashdb-main.inc --with-bash=#{CREW_PREFIX}/bin/bash" run_tests end diff --git a/packages/bc.rb b/packages/bc.rb index fdfc0a047..241387757 100644 --- a/packages/bc.rb +++ b/packages/bc.rb @@ -23,7 +23,7 @@ class Bc < Autotools depends_on 'texinfo' => :build depends_on 'ncurses' # R - configure_options '--with-readline' + autotools_configure_options '--with-readline' run_tests end diff --git a/packages/bind.rb b/packages/bind.rb index f0f35bc27..9f52fa80d 100644 --- a/packages/bind.rb +++ b/packages/bind.rb @@ -36,5 +36,5 @@ class Bind < Autotools depends_on 'sphinx' => :build depends_on 'zlib' # R - configure_options '--enable-fixed-rrset --enable-full-report --with-libidn2' + autotools_configure_options '--enable-fixed-rrset --enable-full-report --with-libidn2' end diff --git a/packages/bmon.rb b/packages/bmon.rb index fc5d949c1..efb018124 100644 --- a/packages/bmon.rb +++ b/packages/bmon.rb @@ -22,5 +22,5 @@ class Bmon < Autotools depends_on 'ncurses' depends_on 'glibc' # R - configure_options '--without-ncurses --with-ncursesw' + autotools_configure_options '--without-ncurses --with-ncursesw' end diff --git a/packages/btrfs_progs.rb b/packages/btrfs_progs.rb index e3822707d..f728e34e7 100644 --- a/packages/btrfs_progs.rb +++ b/packages/btrfs_progs.rb @@ -27,7 +27,7 @@ class Btrfs_progs < Autotools depends_on 'zlib' # R depends_on 'zstd' # R - configure_options '--disable-documentation \ + autotools_configure_options '--disable-documentation \ --disable-convert \ --with-crypto=libgcrypt \ --with-convert=ext2' diff --git a/packages/caja.rb b/packages/caja.rb index 3f1a22ca7..11f0d19e3 100644 --- a/packages/caja.rb +++ b/packages/caja.rb @@ -55,5 +55,5 @@ class Caja < Autotools gnome - configure_options '--enable-wayland' + autotools_configure_options '--enable-wayland' end diff --git a/packages/chafa.rb b/packages/chafa.rb index 826172f51..0c1601ca9 100644 --- a/packages/chafa.rb +++ b/packages/chafa.rb @@ -21,5 +21,5 @@ class Chafa < Autotools depends_on 'libxslt' # The tools depends on freetype, which drops i686 compatibility. - configure_options '--without-tools' + autotools_configure_options '--without-tools' end diff --git a/packages/cloog.rb b/packages/cloog.rb index dec759947..8d1f5ae60 100644 --- a/packages/cloog.rb +++ b/packages/cloog.rb @@ -22,6 +22,6 @@ class Cloog < Autotools depends_on 'isl' depends_on 'osl' - configure_options '--with-isl=system --with-osl=system' + autotools_configure_options '--with-isl=system --with-osl=system' run_tests end diff --git a/packages/clutter.rb b/packages/clutter.rb index 65b353467..d96e9268c 100644 --- a/packages/clutter.rb +++ b/packages/clutter.rb @@ -36,7 +36,7 @@ class Clutter < Autotools system 'patch -Np1 -i clutter-x11-startup-error.patch' end - configure_options '--enable-evdev \ + autotools_configure_options '--enable-evdev \ --enable-evdev-input \ --enable-wayland-backend \ --enable-egl-backend \ diff --git a/packages/codeblocks.rb b/packages/codeblocks.rb index 7ba85be46..87152b18a 100644 --- a/packages/codeblocks.rb +++ b/packages/codeblocks.rb @@ -34,7 +34,7 @@ class Codeblocks < Autotools depends_on 'wxwidgets' # R depends_on 'zlib' # R - configure_options '--with-contrib-plugins=all' + autotools_configure_options '--with-contrib-plugins=all' run_tests diff --git a/packages/cogl.rb b/packages/cogl.rb index a4e949204..90e929394 100644 --- a/packages/cogl.rb +++ b/packages/cogl.rb @@ -28,7 +28,7 @@ class Cogl < Autotools gnome - configure_options '--enable-cairo=yes \ + autotools_configure_options '--enable-cairo=yes \ --enable-cogl-pango=yes \ --enable-gdk-pixbuf=yes \ --enable-cogl-gst=yes \ diff --git a/packages/core.rb b/packages/core.rb index c1707df3f..26dda70c8 100644 --- a/packages/core.rb +++ b/packages/core.rb @@ -3,7 +3,7 @@ require 'package' class Core < Package description 'Core Chromebrew Packages.' homepage 'https://github.com/chromebrew/chromebrew' - version '3.10' + version '3.11' license 'GPL-3+' compatibility 'all' @@ -36,6 +36,7 @@ class Core < Package depends_on 'gnutls' depends_on 'groff' depends_on 'icu4c' + depends_on 'jq' if ARCH == 'armv7l' depends_on 'krb5' depends_on 'less' depends_on 'libarchive' diff --git a/packages/coreutils.rb b/packages/coreutils.rb index f9a2ef390..344f9d169 100644 --- a/packages/coreutils.rb +++ b/packages/coreutils.rb @@ -41,9 +41,9 @@ class Coreutils < Autotools EOF end - configure_options '--disable-year2038' unless ARCH.include?('x86_64') + autotools_configure_options '--disable-year2038' unless ARCH.include?('x86_64') - configure_install_extras do + autotools_install_extras do FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/bin" FileUtils.install 'arch', "#{CREW_DEST_PREFIX}/bin/arch", mode: 0o755 # Remove conflicts with psmisc package. diff --git a/packages/cpio.rb b/packages/cpio.rb index 79454c764..12eaf3fd0 100644 --- a/packages/cpio.rb +++ b/packages/cpio.rb @@ -19,5 +19,5 @@ class Cpio < Autotools depends_on 'glibc' # R - configure_options '--enable-mt' # magnetic tape, not manifest tool + autotools_configure_options '--enable-mt' # magnetic tape, not manifest tool end diff --git a/packages/cryptsetup.rb b/packages/cryptsetup.rb index 28e8b1c1f..15ab17047 100644 --- a/packages/cryptsetup.rb +++ b/packages/cryptsetup.rb @@ -22,5 +22,5 @@ class Cryptsetup < Autotools depends_on 'libgcrypt' depends_on 'popt' - configure_options '--disable-asciidoc' + autotools_configure_options '--disable-asciidoc' end diff --git a/packages/curl.rb b/packages/curl.rb index 228f8e4bb..ff704d6aa 100644 --- a/packages/curl.rb +++ b/packages/curl.rb @@ -34,7 +34,7 @@ class Curl < Autotools depends_on 'zlib' # R depends_on 'zstd' # R - configure_options "--disable-maintainer-mode \ + autotools_configure_options "--disable-maintainer-mode \ --enable-ares \ --enable-ipv6 \ --enable-ldap \ diff --git a/packages/dejagnu.rb b/packages/dejagnu.rb index f4b6b9ec2..44d817f8d 100644 --- a/packages/dejagnu.rb +++ b/packages/dejagnu.rb @@ -21,12 +21,12 @@ class Dejagnu < Autotools depends_on 'texinfo' run_tests - configure_build_extras do + autotools_build_extras do system 'makeinfo --html --no-split -o doc/dejagnu.html doc/dejagnu.texi' system 'makeinfo --plaintext -o doc/dejagnu.txt doc/dejagnu.texi' end - configure_install_extras do + autotools_install_extras do system "install -v -dm755 #{CREW_DEST_PREFIX}/share/doc/dejagnu-1.6.1" system "install -v -m644 doc/dejagnu.html #{CREW_DEST_PREFIX}/share/doc/dejagnu-1.6.1" system "install -v -m644 doc/dejagnu.txt #{CREW_DEST_PREFIX}/share/doc/dejagnu-1.6.1" diff --git a/packages/diffutils.rb b/packages/diffutils.rb index 73f57b1b0..871edfc01 100644 --- a/packages/diffutils.rb +++ b/packages/diffutils.rb @@ -20,5 +20,5 @@ class Diffutils < Autotools depends_on 'glibc' # R depends_on 'libsigsegv' # R - configure_options '--disable-year2038' unless ARCH == 'x86_64' + autotools_configure_options '--disable-year2038' unless ARCH == 'x86_64' end diff --git a/packages/distcc.rb b/packages/distcc.rb index 1fe746a13..bf7c77fd7 100644 --- a/packages/distcc.rb +++ b/packages/distcc.rb @@ -34,8 +34,8 @@ class Distcc < Autotools system "sed -i 's/ install-gnome-data//g' Makefile.in" end - pre_configure_options "CFLAGS+=' -DPY_SSIZE_T_CLEAN -fcommon' NATIVE_COMPILER_TRIPLE='#{CREW_TARGET}' INCLUDESERVER_PYTHON='#{CREW_PREFIX}/bin/python3'" - configure_options '--enable-rfc2553 --disable-Werror --with-python-sys-prefix' + autotools_pre_configure_options "CFLAGS+=' -DPY_SSIZE_T_CLEAN -fcommon' NATIVE_COMPILER_TRIPLE='#{CREW_TARGET}' INCLUDESERVER_PYTHON='#{CREW_PREFIX}/bin/python3'" + autotools_configure_options '--enable-rfc2553 --disable-Werror --with-python-sys-prefix' def self.install system "make DESTDIR=#{CREW_DEST_DIR} INCLUDESERVER_PYTHON=#{CREW_PREFIX}/bin/python3 install" diff --git a/packages/ecasound.rb b/packages/ecasound.rb index a7d9708bd..26b299123 100644 --- a/packages/ecasound.rb +++ b/packages/ecasound.rb @@ -37,6 +37,6 @@ class Ecasound < Autotools depends_on 'readline' depends_on 'ruby' - configure_options '--disable-pyecasound' + autotools_configure_options '--disable-pyecasound' run_tests end diff --git a/packages/elfutils.rb b/packages/elfutils.rb index 2b81deb48..c94185e7c 100644 --- a/packages/elfutils.rb +++ b/packages/elfutils.rb @@ -29,8 +29,8 @@ class Elfutils < Autotools depends_on 'zstd' # R # -D_FORTIFY_SOURCE=0 needed due to -O3 optimization. - pre_configure_options "CFLAGS+=' -Wno-error -D_FORTIFY_SOURCE=0' CXXFLAGS+=' -Wno-error -D_FORTIFY_SOURCE=0'" - configure_options "#{ARCH == 'i686' ? '--disable-libdebuginfod --disable-debuginfod' : ''} --enable-maintainer-mode --program-prefix='eu-'" + autotools_pre_configure_options "CFLAGS+=' -Wno-error -D_FORTIFY_SOURCE=0' CXXFLAGS+=' -Wno-error -D_FORTIFY_SOURCE=0'" + autotools_configure_options "#{ARCH == 'i686' ? '--disable-libdebuginfod --disable-debuginfod' : ''} --enable-maintainer-mode --program-prefix='eu-'" def self.patch downloader 'https://raw.githubusercontent.com/openwrt/openwrt/refs/heads/main/package/libs/elfutils/patches/009-fix-null-dereference-with-lto.patch', 'bd81d483ed5474fd7e87a27e4c961bf8670f76c45f5fe9a273cb2f11d8f44ffc' diff --git a/packages/erlang.rb b/packages/erlang.rb index 3720dcbd2..7cc2443d6 100644 --- a/packages/erlang.rb +++ b/packages/erlang.rb @@ -28,5 +28,5 @@ class Erlang < Autotools depends_on 'wxwidgets' # R depends_on 'zlib' # R - configure_options "ERL_OTP=#{Dir.pwd} #{'--disable-year2038' unless ARCH.eql?('x86_64')}" + autotools_configure_options "ERL_OTP=#{Dir.pwd} #{'--disable-year2038' unless ARCH.eql?('x86_64')}" end diff --git a/packages/ethtool.rb b/packages/ethtool.rb index db56cd2c6..1a36389e5 100644 --- a/packages/ethtool.rb +++ b/packages/ethtool.rb @@ -25,5 +25,5 @@ class Ethtool < Autotools run_tests - configure_options "--sbindir=#{CREW_PREFIX}/bin" + autotools_configure_options "--sbindir=#{CREW_PREFIX}/bin" end diff --git a/packages/eudev.rb b/packages/eudev.rb index b821899eb..4bd1bce3c 100644 --- a/packages/eudev.rb +++ b/packages/eudev.rb @@ -28,6 +28,6 @@ class Eudev < Autotools system 'sed -i s,/usr/bin/xsltproc,xsltproc,g man/make.sh' end - configure_options '--enable-hwdb \ + autotools_configure_options '--enable-hwdb \ --enable-rule-generator' end diff --git a/packages/f2fs_tools.rb b/packages/f2fs_tools.rb index 8469cdb86..715b6697b 100644 --- a/packages/f2fs_tools.rb +++ b/packages/f2fs_tools.rb @@ -21,5 +21,5 @@ class F2fs_tools < Autotools depends_on 'lzo' depends_on 'util_linux' - configure_options '--without-selinux' + autotools_configure_options '--without-selinux' end diff --git a/packages/fakeroot.rb b/packages/fakeroot.rb index 3647caf80..38abf8040 100644 --- a/packages/fakeroot.rb +++ b/packages/fakeroot.rb @@ -13,12 +13,12 @@ class Fakeroot < Autotools binary_sha256({ aarch64: '64542b42054b52f1ca987a1c2974da60d6080d03a762d4e6527f0921c18031f8', armv7l: '64542b42054b52f1ca987a1c2974da60d6080d03a762d4e6527f0921c18031f8', - i686: 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii', - x86_64: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' + i686: '7d9ae9d6d05fe9fcccbaa6c95ed9f1c9c7fd24bc900789964e6adb65d8cd499b', + x86_64: '0eb4fef1f84924b98381bf118d586d7d3fc9dbdde46ed994d778ab6e6f791ccf' }) depends_on 'libcap' # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074945 - pre_configure_options 'CFLAGS=-Wno-incompatible-pointer-types' + autotools_pre_configure_options 'CFLAGS=-Wno-incompatible-pointer-types' end diff --git a/packages/fceux.rb b/packages/fceux.rb index e4aaeeeb8..21e76e566 100644 --- a/packages/fceux.rb +++ b/packages/fceux.rb @@ -7,22 +7,22 @@ class Fceux < Package compatibility 'x86_64' license 'GPLv2' source_url "https://github.com/FinnBaltazar1111/fceux/releases/download/v#{version}/fceux-#{version}-amd64.deb" - source_sha256 "7a740608aad4157aec6010cea29aecc30f5e7341667375b49bc38df770c5ca49" - + source_sha256 '7a740608aad4157aec6010cea29aecc30f5e7341667375b49bc38df770c5ca49' + depends_on 'ffmpeg' depends_on 'libarchive' depends_on 'libsdl2' depends_on 'mesa_utils' depends_on 'minizip' depends_on 'numactl' - depends_on 'qt5_base' + depends_on 'qt5_base' depends_on 'zlib' no_compile_needed def self.install FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/" - FileUtils.cp_r ".", "#{CREW_DEST_PREFIX}" + FileUtils.cp_r '.', CREW_DEST_PREFIX.to_s end def self.postinstall diff --git a/packages/fftw.rb b/packages/fftw.rb index 8f09014f1..676933449 100644 --- a/packages/fftw.rb +++ b/packages/fftw.rb @@ -20,6 +20,6 @@ class Fftw < Autotools # We'd need to build fftw three times with each precision option in order to support things properly. # https://www.linuxfromscratch.org/blfs/view/cvs/general/fftw.html # https://github.com/FFTW/fftw3/pull/276 - configure_options '--enable-shared' + autotools_configure_options '--enable-shared' run_tests end diff --git a/packages/fig2dev.rb b/packages/fig2dev.rb index 6a9a4e216..9cf521b53 100644 --- a/packages/fig2dev.rb +++ b/packages/fig2dev.rb @@ -25,7 +25,7 @@ class Fig2dev < Autotools depends_on 'netpbm' => :build depends_on 'ghostscript' => :build - configure_options '--enable-transfig' - pre_configure_options "FIG2DEV_LIBDIR=#{CREW_PREFIX}/share/fig2dev \ + autotools_configure_options '--enable-transfig' + autotools_pre_configure_options "FIG2DEV_LIBDIR=#{CREW_PREFIX}/share/fig2dev \ XFIGLIBDIR=#{CREW_PREFIX}/share/xfig" end diff --git a/packages/filezilla.rb b/packages/filezilla.rb index 9fe659ce0..0177dfbf3 100644 --- a/packages/filezilla.rb +++ b/packages/filezilla.rb @@ -45,15 +45,15 @@ class Filezilla < Autotools print_source_bashrc - configure_options '--disable-maintainer-mode --with-pugixml=builtin' + autotools_configure_options '--disable-maintainer-mode --with-pugixml=builtin' - configure_build_extras do + autotools_build_extras do File.write '10-filezilla', <<~FILEZILLA_EOF alias filezilla="WAYLAND_DISPLAY=wayland-0 DISPLAY='' GDK_BACKEND=wayland filezilla" FILEZILLA_EOF end - configure_install_extras do + autotools_install_extras do FileUtils.install '10-filezilla', "#{CREW_DEST_PREFIX}/etc/env.d/10-filezilla", mode: 0o644 end end diff --git a/packages/finch.rb b/packages/finch.rb index 55ad5b414..d76e71b73 100644 --- a/packages/finch.rb +++ b/packages/finch.rb @@ -29,7 +29,7 @@ class Finch < Autotools depends_on 'perl' depends_on 'tcl' - configure_options "--disable-avahi \ + autotools_configure_options "--disable-avahi \ --disable-dbus \ --disable-gstreamer \ --disable-gtkui \ diff --git a/packages/findutils.rb b/packages/findutils.rb index bd039f3d5..54c9aa4d5 100644 --- a/packages/findutils.rb +++ b/packages/findutils.rb @@ -20,6 +20,6 @@ class Findutils < Autotools depends_on 'glibc' # R depends_on 'python3' => :build - configure_options "--without-selinux #{'--disable-year2038' unless ARCH.eql?('x86_64')}" + autotools_configure_options "--without-selinux #{'--disable-year2038' unless ARCH.eql?('x86_64')}" run_tests end diff --git a/packages/flex.rb b/packages/flex.rb index 57b6ed8a4..6e84a1012 100644 --- a/packages/flex.rb +++ b/packages/flex.rb @@ -21,7 +21,7 @@ class Flex < Autotools depends_on 'glibc' # R depends_on 'm4' => :build - configure_options '--with-pic --disable-static --enable-shared' + autotools_configure_options '--with-pic --disable-static --enable-shared' def self.patch downloader 'https://gitlab.archlinux.org/archlinux/packaging/packages/flex/-/raw/main/flex-pie.patch?ref_type=heads&inline=false', diff --git a/packages/font_util.rb b/packages/font_util.rb index 1606dd025..6168585e1 100644 --- a/packages/font_util.rb +++ b/packages/font_util.rb @@ -19,5 +19,5 @@ class Font_util < Autotools depends_on 'xorg_macros' => :build - configure_options "--with-fontrootdir=#{CREW_PREFIX}/share/fonts" + autotools_configure_options "--with-fontrootdir=#{CREW_PREFIX}/share/fonts" end diff --git a/packages/fossil.rb b/packages/fossil.rb index f5b5bc52b..ab233f3d4 100644 --- a/packages/fossil.rb +++ b/packages/fossil.rb @@ -29,7 +29,7 @@ class Fossil < Autotools system "./configure --prefix=#{CREW_PREFIX}" end - configure_install_extras do + autotools_install_extras do FileUtils.install 'fossil.1', "#{CREW_DEST_MAN_PREFIX}/man1/fossil.1", mode: 0o644 end end diff --git a/packages/gawk.rb b/packages/gawk.rb index c4c6e72e6..96fce6110 100644 --- a/packages/gawk.rb +++ b/packages/gawk.rb @@ -48,9 +48,9 @@ class Gawk < Autotools # Tests appear to have container issues... run_tests if ARCH == 'i686' - configure_options '--without-libsigsegv-prefix' + autotools_configure_options '--without-libsigsegv-prefix' - configure_install_extras do + autotools_install_extras do # Remove conflict with #{CREW_PREFIX}/bin/awk from mawk package FileUtils.rm "#{CREW_DEST_PREFIX}/bin/awk" end diff --git a/packages/gdb.rb b/packages/gdb.rb index 316882bd6..807a92e86 100644 --- a/packages/gdb.rb +++ b/packages/gdb.rb @@ -40,7 +40,7 @@ class Gdb < Autotools conflicts_ok # binutils conflicts - configure_options "--disable-binutils \ + autotools_configure_options "--disable-binutils \ --disable-ld \ --disable-nls \ --enable-64-bit-bfd \ diff --git a/packages/geany_plugins.rb b/packages/geany_plugins.rb index d19cdd745..c020f60ed 100644 --- a/packages/geany_plugins.rb +++ b/packages/geany_plugins.rb @@ -39,5 +39,5 @@ class Geany_plugins < Autotools depends_on 'zlib' # R # try to avoid gcc14 issues. - configure_options '--disable-projectorganizer' + autotools_configure_options '--disable-projectorganizer' end diff --git a/packages/gettext.rb b/packages/gettext.rb index 8f92311f8..f5a61b6ea 100644 --- a/packages/gettext.rb +++ b/packages/gettext.rb @@ -3,7 +3,7 @@ require 'buildsystems/autotools' class Gettext < Autotools description 'GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages.' homepage 'https://www.gnu.org/software/gettext/' - version "0.25-#{CREW_ICU_VER}" + version "0.25-#{CREW_ICU_VER}-1" license 'GPL-3+ and LGPL-2.1+' compatibility 'all' source_url "https://ftp.gnu.org/pub/gnu/gettext/gettext-#{version.split('-')[0]}.tar.lz" @@ -11,10 +11,10 @@ class Gettext < Autotools binary_compression 'tar.zst' binary_sha256({ - aarch64: 'b5b8c0210160ad6b777abcf1266dfe7a593eee77f94b1df5169d3d51757f42ca', - armv7l: 'b5b8c0210160ad6b777abcf1266dfe7a593eee77f94b1df5169d3d51757f42ca', - i686: '10c940604c08829ce57ccb559e0dfb38137c244e9e0a01037c64ce145bb19ea2', - x86_64: 'c9bab6466cd7393a2601fb03369fb808397fe7749b3a43a63afdf4eb2d3f8896' + aarch64: '76e4ea0e82bc7465e1d822e76ca46844b1d43d867b4803b7113d38b1a6d8de18', + armv7l: '76e4ea0e82bc7465e1d822e76ca46844b1d43d867b4803b7113d38b1a6d8de18', + i686: 'c1d0965ea6c5e78f0a314a44def43351e5c94279d25cfd46733617185bb79aa2', + x86_64: 'c016e20248d296f40fa6a6eee0986e760be047bd71fa89f80167ace2b13f4aff' }) depends_on 'acl' # R @@ -28,7 +28,7 @@ class Gettext < Autotools depends_on 'openjdk8' => :build depends_on 'zlib' # R - configure_options '--disable-static \ + autotools_configure_options '--disable-static \ --enable-shared \ --with-pic \ --without-included-gettext' diff --git a/packages/gfbgraph.rb b/packages/gfbgraph.rb deleted file mode 100644 index 0157befa9..000000000 --- a/packages/gfbgraph.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'buildsystems/autotools' - -class Gfbgraph < Autotools - description 'GLib/GObject wrapper for the Facebook Graph API' - homepage 'https://wiki.gnome.org/Projects/GFBGraph' - version '0.2.5' - license 'LGPL-2.1+' - compatibility 'aarch64 armv7l x86_64' - source_url 'https://gitlab.gnome.org/GNOME/libgfbgraph.git' - git_hashtag "v_#{version.gsub('.', '_')}" - binary_compression 'tar.zst' - - binary_sha256({ - aarch64: '883a3eb50bf0fd391333759913e20c4211f5f31a1a3002b7b900019b234b211d', - armv7l: '883a3eb50bf0fd391333759913e20c4211f5f31a1a3002b7b900019b234b211d', - x86_64: '560bd5f25612d861a0daea31a7547a0d8d18e42a9d21bcd7960dceef1b3ca7b5' - }) - - depends_on 'gnome_online_accounts' => :build - depends_on 'rest' => :build - depends_on 'json_glib' => :build - depends_on 'gobject_introspection' => :build - depends_on 'gtk_doc' => :build - - gnome - - configure_options '--enable-gtk-doc \ - --enable-introspection' - - def self.install - system "make DESTDIR=#{CREW_DEST_DIR} install \ - libgfbgraphdocdir=#{CREW_PREFIX}/share/doc/gfbgraph" - end -end diff --git a/packages/gifsicle.rb b/packages/gifsicle.rb index b3ae6eeb0..956b8ddfb 100644 --- a/packages/gifsicle.rb +++ b/packages/gifsicle.rb @@ -17,7 +17,7 @@ class Gifsicle < Autotools x86_64: '6fc9976eb9f4680a3a3b57adefc027f0b53b27e5186aea1d3e824509e4244c92' }) - configure_options '--without-x --disable-gifview' + autotools_configure_options '--without-x --disable-gifview' def self.patch system "sed -i 's,/usr/bin/perl,#{CREW_PREFIX}/bin/perl,' test/testie" diff --git a/packages/gmp.rb b/packages/gmp.rb index 74f6f7bc2..9f01d6321 100644 --- a/packages/gmp.rb +++ b/packages/gmp.rb @@ -20,6 +20,6 @@ class Gmp < Autotools depends_on 'gcc_lib' # R depends_on 'glibc' # R - configure_options '--disable-maintainer-mode \ + autotools_configure_options '--disable-maintainer-mode \ --enable-cxx' end diff --git a/packages/gnome_docking_library.rb b/packages/gnome_docking_library.rb index 7a714f4b7..cf2395298 100644 --- a/packages/gnome_docking_library.rb +++ b/packages/gnome_docking_library.rb @@ -39,5 +39,5 @@ class Gnome_docking_library < Autotools system 'patch -Np1 -i 4.patch' end - configure_options '--disable-gtk-doc' + autotools_configure_options '--disable-gtk-doc' end diff --git a/packages/gnome_icon_theme.rb b/packages/gnome_icon_theme.rb index eed477038..4ca716e7c 100644 --- a/packages/gnome_icon_theme.rb +++ b/packages/gnome_icon_theme.rb @@ -22,5 +22,5 @@ class Gnome_icon_theme < Autotools gnome - configure_options '--enable-icon-mapping' + autotools_configure_options '--enable-icon-mapping' end diff --git a/packages/gnome_keyring.rb b/packages/gnome_keyring.rb index 3f484e1c9..ab4949f75 100644 --- a/packages/gnome_keyring.rb +++ b/packages/gnome_keyring.rb @@ -40,7 +40,7 @@ class Gnome_keyring < Autotools gnome - configure_options "--with-pam-dir=#{CREW_PREFIX}/lib/security \ + autotools_configure_options "--with-pam-dir=#{CREW_PREFIX}/lib/security \ --disable-selinux \ --disable-schemas-compile \ --disable-doc" # Docs cannot be used due to #4275 diff --git a/packages/gnome_maps.rb b/packages/gnome_maps.rb index 7b5435121..08ffb1299 100644 --- a/packages/gnome_maps.rb +++ b/packages/gnome_maps.rb @@ -3,11 +3,11 @@ require 'buildsystems/meson' class Gnome_maps < Meson description 'A simple GNOME maps application' homepage 'https://wiki.gnome.org/Apps/Maps' - version '46.rc' + version '48.2' license 'GPL-2+, LGPL-2+, MIT, CC-BY-3.0 and CC-BY-SA-3.0' compatibility 'aarch64 armv7l x86_64' source_url 'https://gitlab.gnome.org/GNOME/gnome-maps.git' - git_hashtag "v#{version}" + git_hashtag version binary_compression 'tar.zst' binary_sha256({ @@ -21,10 +21,10 @@ class Gnome_maps < Meson depends_on 'geoclue' => :build depends_on 'geocode_glib2' => :build depends_on 'geocode_glib' => :build - depends_on 'gfbgraph' => :build depends_on 'gjs' => :build depends_on 'glibc' # R depends_on 'glib' # R + depends_on 'gnome_weather' => :build depends_on 'gobject_introspection' => :build depends_on 'gtk4' # R depends_on 'harfbuzz' # R @@ -32,6 +32,7 @@ class Gnome_maps < Meson depends_on 'libchamplain' => :build depends_on 'libgee' => :build depends_on 'libhandy' => :build + depends_on 'libportal' => :build depends_on 'librsvg' # R depends_on 'libshumate' # R depends_on 'libxml2' # R @@ -42,8 +43,4 @@ class Gnome_maps < Meson depends_on 'yelp_tools' => :build gnome - - def self.patch - system "sed -i 's/geocode-glib-2.0/geocode-glib-1.0/g' meson.build" - end end diff --git a/packages/gnome_weather.rb b/packages/gnome_weather.rb index 916e7e221..4aab8b7b8 100644 --- a/packages/gnome_weather.rb +++ b/packages/gnome_weather.rb @@ -3,7 +3,7 @@ require 'buildsystems/meson' class Gnome_weather < Meson description 'Access current weather conditions and forecasts' homepage 'https://wiki.gnome.org/Apps/Weather' - version '45.0' + version '48.0' license 'GPL-2+, LGPL-2+, MIT, CC-BY-3.0 and CC-BY-SA-3.0' compatibility 'aarch64 armv7l x86_64' source_url 'https://gitlab.gnome.org/GNOME/gnome-weather.git' @@ -11,11 +11,12 @@ class Gnome_weather < Meson binary_compression 'tar.zst' binary_sha256({ - aarch64: '666624e236a5bdeb5cf5babd00e521a8e647158bf97d3d83e5ccae37e40bf23c', - armv7l: '666624e236a5bdeb5cf5babd00e521a8e647158bf97d3d83e5ccae37e40bf23c', - x86_64: '5a4811dfc9fcdfc77908302ddab627d153873780296f3d51e534f739198c74c0' + aarch64: '77e7e9f7ec1d0d065f84b1376dcd722d7e7913c3be8feff4da1dc90d41652182', + armv7l: '77e7e9f7ec1d0d065f84b1376dcd722d7e7913c3be8feff4da1dc90d41652182', + x86_64: 'e89af9c9a5522b3515cc9c06d41d90b010dc7629e416bb07b8823b44a97a05a7' }) + depends_on 'desktop_file_utilities' => :build depends_on 'gtk3' => :build depends_on 'gjs' => :build depends_on 'libgweather' => :build diff --git a/packages/gnupg.rb b/packages/gnupg.rb index d316e0830..019955a70 100644 --- a/packages/gnupg.rb +++ b/packages/gnupg.rb @@ -34,7 +34,7 @@ class Gnupg < Autotools depends_on 'sqlite' # R depends_on 'zlib' # R - configure_options '--with-zlib \ + autotools_configure_options '--with-zlib \ --with-bzip2 \ --with-readline' diff --git a/packages/gnuplot.rb b/packages/gnuplot.rb index 65542055b..7505d38ad 100644 --- a/packages/gnuplot.rb +++ b/packages/gnuplot.rb @@ -29,5 +29,5 @@ class Gnuplot < Autotools depends_on 'qt5_tools' depends_on 'wxwidgets' - configure_options "CFLAGS='-I#{CREW_PREFIX}/share/Qt-5/include/QtCore'" + autotools_configure_options "CFLAGS='-I#{CREW_PREFIX}/share/Qt-5/include/QtCore'" end diff --git a/packages/gnutls.rb b/packages/gnutls.rb index fc1d12b65..6762b497d 100644 --- a/packages/gnutls.rb +++ b/packages/gnutls.rb @@ -43,7 +43,7 @@ class Gnutls < Autotools system "#{CREW_PREFIX}/bin/update-ca-certificates --fresh --certsconf #{CREW_PREFIX}/etc/ca-certificates.conf" end - configure_options "--enable-shared \ + autotools_configure_options "--enable-shared \ --with-pic \ --with-system-priority-file=#{CREW_PREFIX}/etc/gnutls/default-priorities \ --with-trousers-lib=#{CREW_LIB_PREFIX}/libtspi.so.1 \ diff --git a/packages/grep.rb b/packages/grep.rb index 6260a6091..f8c8dc25e 100644 --- a/packages/grep.rb +++ b/packages/grep.rb @@ -26,7 +26,7 @@ class Grep < Autotools # NOTE: built on i686 by removing the c11threads derived threads.h # installed by the chromebrew glibc package on this architecture. - configure_options 'CPPFLAGS=-DHAVE_DYNAMIC_LIBPCRE --without-included-regex' + autotools_configure_options 'CPPFLAGS=-DHAVE_DYNAMIC_LIBPCRE --without-included-regex' # Section XFAIL test with grep: regexec.c:1344: pop_fail_stack: Assertion `num >= 0' failed. # run_tests diff --git a/packages/groff.rb b/packages/groff.rb index f7c5a836b..155b26433 100644 --- a/packages/groff.rb +++ b/packages/groff.rb @@ -22,5 +22,5 @@ class Groff < Autotools depends_on 'netpbm' => :build depends_on 'uchardet' # R - configure_options '--without-x' + autotools_configure_options '--without-x' end diff --git a/packages/gtksourceview_3.rb b/packages/gtksourceview_3.rb index 3c4c06376..6c6871757 100644 --- a/packages/gtksourceview_3.rb +++ b/packages/gtksourceview_3.rb @@ -41,5 +41,5 @@ class Gtksourceview_3 < Autotools gnome no_upstream_update - configure_options '--enable-glade-catalog --enable-gtk-doc --disable-gtk-doc-html' + autotools_configure_options '--enable-glade-catalog --enable-gtk-doc --disable-gtk-doc-html' end diff --git a/packages/gvim.rb b/packages/gvim.rb index e5e5a3a9c..e8794e181 100644 --- a/packages/gvim.rb +++ b/packages/gvim.rb @@ -49,7 +49,7 @@ class Gvim < Autotools end end - configure_options "--localstatedir=#{CREW_PREFIX}/var/lib/vim \ + autotools_configure_options "--localstatedir=#{CREW_PREFIX}/var/lib/vim \ --disable-canberra \ --disable-nls \ --disable-selinux \ diff --git a/packages/httpd.rb b/packages/httpd.rb index 1d61d4be8..8c5fb3c64 100644 --- a/packages/httpd.rb +++ b/packages/httpd.rb @@ -37,20 +37,20 @@ class Httpd < Autotools ConvenienceFunctions.libtoolize('expat') end - configure_build_extras do + autotools_build_extras do File.write '10-httpd', <<~EOF #!/bin/bash [ -f #{CREW_PREFIX}/bin/apachectl ] && sudo #{CREW_PREFIX}/bin/apachectl start EOF end - configure_options "--prefix=#{CREW_PREFIX}/share/httpd \ + autotools_configure_options "--prefix=#{CREW_PREFIX}/share/httpd \ --bindir=#{CREW_PREFIX}/bin \ --sbindir=#{CREW_PREFIX}/bin \ --disable-maintainer-mode \ --disable-debugger-mode" - configure_install_extras do + autotools_install_extras do FileUtils.install '10-httpd', "#{CREW_PREFIX}/etc/bash.d/10-httpd", mode: 0o755 end diff --git a/packages/hwloc.rb b/packages/hwloc.rb index 28f6a62d0..a3141d353 100644 --- a/packages/hwloc.rb +++ b/packages/hwloc.rb @@ -32,6 +32,6 @@ class Hwloc < Autotools depends_on 'libxml2' # R depends_on 'pciutils' => :build - configure_options "--enable-plugins \ + autotools_configure_options "--enable-plugins \ --sysconfdir=#{CREW_PREFIX}/etc" end diff --git a/packages/ibus.rb b/packages/ibus.rb index 16e94ec28..bd4c22b5d 100644 --- a/packages/ibus.rb +++ b/packages/ibus.rb @@ -69,7 +69,7 @@ class Ibus < Autotools end end - configure_options "--libexecdir=#{CREW_LIB_PREFIX}/ibus \ + autotools_configure_options "--libexecdir=#{CREW_LIB_PREFIX}/ibus \ --sysconfdir=#{CREW_PREFIX}/etc \ --disable-gtk2 \ --disable-memconf \ diff --git a/packages/imagemagick7.rb b/packages/imagemagick7.rb index 21ad7e45a..26de4f042 100644 --- a/packages/imagemagick7.rb +++ b/packages/imagemagick7.rb @@ -72,7 +72,7 @@ class Imagemagick7 < Autotools abort "ImageMagick version #{imver} already installed.".lightgreen unless imver.to_s == '' end - configure_options "--mandir=#{CREW_MAN_PREFIX} \ + autotools_configure_options "--mandir=#{CREW_MAN_PREFIX} \ --program-prefix='' \ --with-windows-font-dir=#{CREW_PREFIX}/share/fonts/truetype/msttcorefonts \ --enable-hugepages \ diff --git a/packages/imake.rb b/packages/imake.rb index 8bb508759..64ac8d39c 100644 --- a/packages/imake.rb +++ b/packages/imake.rb @@ -20,5 +20,5 @@ class Imake < Autotools depends_on 'xorg_cf_files' depends_on 'xorg_proto' - configure_options "--sysconfdir=#{CREW_PREFIX}/etc" + autotools_configure_options "--sysconfdir=#{CREW_PREFIX}/etc" end diff --git a/packages/imlib2.rb b/packages/imlib2.rb index e2e0552de..eaec055c5 100644 --- a/packages/imlib2.rb +++ b/packages/imlib2.rb @@ -53,6 +53,6 @@ class Imlib2 < Autotools depends_on 'zlib' # R depends_on 'zstd' # R - configure_options "--sysconfdir=#{CREW_PREFIX}/etc/imlib2 \ + autotools_configure_options "--sysconfdir=#{CREW_PREFIX}/etc/imlib2 \ --x-libraries=#{CREW_LIB_PREFIX}" end diff --git a/packages/inetutils.rb b/packages/inetutils.rb index bee9a2abe..aabc7e92c 100644 --- a/packages/inetutils.rb +++ b/packages/inetutils.rb @@ -25,8 +25,8 @@ class Inetutils < Autotools depends_on 'ncurses' # R depends_on 'readline' # R - pre_configure_options "CC='gcc -lncursesw -lpthread -ltinfow' CXX='g++ -lncursesw -lpthread -ltinfow'" - configure_options "--with-ncurses-include-dir=#{CREW_PREFIX}/include/ncursesw \ + autotools_pre_configure_options "CC='gcc -lncursesw -lpthread -ltinfow' CXX='g++ -lncursesw -lpthread -ltinfow'" + autotools_configure_options "--with-ncurses-include-dir=#{CREW_PREFIX}/include/ncursesw \ --with-krb5=#{CREW_PREFIX} \ --disable-rpath \ --with-wrap \ diff --git a/packages/iptables.rb b/packages/iptables.rb index 78d31cb69..8edcb1d0f 100644 --- a/packages/iptables.rb +++ b/packages/iptables.rb @@ -18,5 +18,5 @@ class Iptables < Autotools depends_on 'glibc' # R - configure_options '--enable-static --disable-nftables' + autotools_configure_options '--enable-static --disable-nftables' end diff --git a/packages/jp2a.rb b/packages/jp2a.rb index b567fd75f..fca1f77bd 100644 --- a/packages/jp2a.rb +++ b/packages/jp2a.rb @@ -24,8 +24,8 @@ class Jp2a < Autotools depends_on 'ncurses' # R depends_on 'termcap' # R - pre_configure_options "CFLAGS='-lncurses -ltinfo -I#{CREW_PREFIX}/include/ncurses #{CREW_ENV_OPTIONS_HASH['CFLAGS']}' LDFLAGS='-L#{CREW_LIB_PREFIX} -lncurses -ltinfo #{CREW_ENV_OPTIONS_HASH['LDFLAGS']}'" - configure_options '--enable-curl' + autotools_pre_configure_options "CFLAGS='-lncurses -ltinfo -I#{CREW_PREFIX}/include/ncurses #{CREW_ENV_OPTIONS_HASH['CFLAGS']}' LDFLAGS='-L#{CREW_LIB_PREFIX} -lncurses -ltinfo #{CREW_ENV_OPTIONS_HASH['LDFLAGS']}'" + autotools_configure_options '--enable-curl' def self.check system 'make check || true' diff --git a/packages/jq.rb b/packages/jq.rb index 6bf663ffa..e105662c9 100644 --- a/packages/jq.rb +++ b/packages/jq.rb @@ -3,23 +3,22 @@ require 'buildsystems/autotools' class Jq < Autotools description 'jq is a lightweight and flexible command-line JSON processor.' homepage 'https://stedolan.github.io/jq/' - @_ver = '1.7' - version @_ver + version '1.7.1' license 'MIT and CC-BY-3.0' compatibility 'all' source_url 'https://github.com/stedolan/jq.git' - git_hashtag "jq-#{@_ver}" + git_hashtag "jq-#{version}" binary_compression 'tar.zst' binary_sha256({ - aarch64: '15ef868608c85cbac630d00281ffa6b50d3513cb2fa268f19aab9fefdc145c83', - armv7l: '15ef868608c85cbac630d00281ffa6b50d3513cb2fa268f19aab9fefdc145c83', - i686: '2fe7d41c40699c57822393b5b3606f43641750e743751db729c153357924ea8e', - x86_64: '5391d895d83e5c79eca278380ea062dc28478eeaa7afe2d900adcd64bcf7e12d' + aarch64: '19a92ca161e622c94355fe96936d3f9987a6487c06969fb94ef72085ec87e744', + armv7l: '19a92ca161e622c94355fe96936d3f9987a6487c06969fb94ef72085ec87e744', + i686: 'e2b7fe0a8c1c75f6fdf08ea2175109dbdb050226f37cf69001ad85c7b9dbaddf', + x86_64: 'd4642b7ef212ab8cb60ada93de8eb290c673dc2a6ed636753bd1a1cd6124afbc' }) depends_on 'glibc' - configure_options '--disable-maintainer-mode \ + autotools_configure_options '--disable-maintainer-mode \ --disable-docs' end diff --git a/packages/less.rb b/packages/less.rb index e4f493ffd..df56b8dcb 100644 --- a/packages/less.rb +++ b/packages/less.rb @@ -22,7 +22,7 @@ class Less < Autotools depends_on 'gcc_lib' # R depends_on 'patch' => :build - configure_options '--with-regex=posix' + autotools_configure_options '--with-regex=posix' def self.patch downloader 'https://patch-diff.githubusercontent.com/raw/gwsw/less/pull/412.diff', diff --git a/packages/libabigail.rb b/packages/libabigail.rb index e64a1e869..f691ead61 100644 --- a/packages/libabigail.rb +++ b/packages/libabigail.rb @@ -31,7 +31,7 @@ class Libabigail < Autotools depends_on 'zstd' # R depends_on 'gdb' # R - configure_options '--enable-bash-completion \ + autotools_configure_options '--enable-bash-completion \ --disable-manual \ --disable-apidoc \ --disable-static' diff --git a/packages/libadwaita.rb b/packages/libadwaita.rb index 6b6e96ae6..aeb0b276d 100644 --- a/packages/libadwaita.rb +++ b/packages/libadwaita.rb @@ -3,7 +3,7 @@ require 'buildsystems/meson' class Libadwaita < Meson description 'Library of GNOME-specific UI patterns, replacing libhandy for GTK4' homepage 'https://gitlab.gnome.org/GNOME/libadwaita/' - version '1.6.1' + version '1.7.2' license 'LGPL-2.1+' compatibility 'aarch64 armv7l x86_64' source_url 'https://gitlab.gnome.org/GNOME/libadwaita.git' @@ -11,9 +11,9 @@ class Libadwaita < Meson binary_compression 'tar.zst' binary_sha256({ - aarch64: 'e878a076bd1b32ffac81c0c1a4a1507528933d805ec28ebccba93298bd6905c7', - armv7l: 'e878a076bd1b32ffac81c0c1a4a1507528933d805ec28ebccba93298bd6905c7', - x86_64: '5aa963f1ccdcaf5b515add4c4f4c0e0cecc409d119d5d0c823f4e498608d86e5' + aarch64: 'ec3ccbc0da68a25293f9df687cfb20964409f2438ea8f8ae17544dd145ccfab3', + armv7l: 'ec3ccbc0da68a25293f9df687cfb20964409f2438ea8f8ae17544dd145ccfab3', + x86_64: '5da3bd5e81264b886cd5086ef5345aed9201e0344a3058216c6e228002e29dba' }) depends_on 'appstream' # R @@ -47,6 +47,6 @@ class Libadwaita < Meson meson_options '-Dintrospection=enabled \ -Dexamples=false \ - -Dgtk_doc=false \ + -Ddocumentation=false \ -Dtests=false' end diff --git a/packages/libarchive.rb b/packages/libarchive.rb index af1daf3c4..93ca57160 100644 --- a/packages/libarchive.rb +++ b/packages/libarchive.rb @@ -1,20 +1,21 @@ +# CMake builds do not currently generate pkgconfig files. require 'buildsystems/autotools' class Libarchive < Autotools description 'Multi-format archive and compression library.' homepage 'https://www.libarchive.org/' - version "3.7.4-#{CREW_ICU_VER}" + version "3.8.0-#{CREW_ICU_VER}" license 'BSD, BSD-2, BSD-4 and public-domain' compatibility 'all' source_url "https://www.libarchive.org/downloads/libarchive-#{version.split('-').first}.tar.xz" - source_sha256 'f887755c434a736a609cbd28d87ddbfbe9d6a3bb5b703c22c02f6af80a802735' + source_sha256 '67bfac3798a778143f4b1cadcdb3792b4269486f8e1b70ca5c0ee5841398bfdf' binary_compression 'tar.zst' binary_sha256({ - aarch64: '86a2891e468a8b0aba9f017ddb9986193dc1416c9971edd00a62e84c1132ccfe', - armv7l: '86a2891e468a8b0aba9f017ddb9986193dc1416c9971edd00a62e84c1132ccfe', - i686: '2aef89c9ed12b699ebb226a73acb7d6849825af6b0e9ef4604e685f85f15e594', - x86_64: 'a055feffdd4c67283a1584b198073f48633d64f7f58297b1411bdfd011053fa8' + aarch64: 'c7207f0c8d0bb8f1a2fa547a80cb6f9a4979850926dfb668b70015f423b913a0', + armv7l: 'c7207f0c8d0bb8f1a2fa547a80cb6f9a4979850926dfb668b70015f423b913a0', + i686: '67f2fc8f8d75b5182f7bc11c7ffc1d77103963e97aecdf96e94e4f98773ede2d', + x86_64: '355b85ca8f374aa670ed824c1e7bd196afceac5766ff3eb7b3cdd1d9fdb7f06f' }) depends_on 'acl' # R @@ -31,8 +32,68 @@ class Libarchive < Autotools depends_on 'zlib' # R depends_on 'zstd' # R - def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + def self.patch + # Fix complaints about aclocal being too new. + system 'autoreconf -fiv' + # Fix LIBDIR being set improperly for cmake. + # See https://github.com/libarchive/libarchive/pull/2509 + File.write 'libdir.patch', <<~LIBDIR_PATCH_EOF + diff --git a/build/cmake/CreatePkgConfigFile.cmake b/build/cmake/CreatePkgConfigFile.cmake + index bc5a43f72a..50caa5e850 100644 + --- a/build/cmake/CreatePkgConfigFile.cmake + +++ b/build/cmake/CreatePkgConfigFile.cmake + @@ -29,5 +29,5 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/pkgconfig/libarchive.pc.in + # And install it, of course ;). + IF(ENABLE_INSTALL) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/pkgconfig/libarchive.pc + - DESTINATION "lib/pkgconfig") + + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + ENDIF() + diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt + index dd0b2808d9..86997a12ad 100644 + --- a/libarchive/CMakeLists.txt + +++ b/libarchive/CMakeLists.txt + @@ -247,7 +247,7 @@ IF(BUILD_SHARED_LIBS) + ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS}) + TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .) + TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS}) + - SET_TARGET_PROPERTIES(archive PROPERTIES#{' '} + + SET_TARGET_PROPERTIES(archive PROPERTIES + VERSION ${SOVERSION_FULL} + SOVERSION ${SOVERSION} + MACHO_COMPATIBILITY_VERSION ${MACHO_COMPATIBILITY_VERSION} + @@ -265,18 +265,22 @@ IF(NOT WIN32 OR CYGWIN OR NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive) + ENDIF(NOT WIN32 OR CYGWIN OR NOT BUILD_SHARED_LIBS) + + +if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + + set(CMAKE_INSTALL_LIBDIR "#{ARCH_LIB}") + +endif() + + + IF(ENABLE_INSTALL) + # How to install the libraries + IF(BUILD_SHARED_LIBS) + INSTALL(TARGETS archive + RUNTIME DESTINATION bin + - LIBRARY DESTINATION lib + - ARCHIVE DESTINATION lib) + + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ENDIF(BUILD_SHARED_LIBS) + INSTALL(TARGETS archive_static + RUNTIME DESTINATION bin + - LIBRARY DESTINATION lib + - ARCHIVE DESTINATION lib) + + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + INSTALL_MAN(${libarchive_MANS}) + INSTALL(FILES ${include_HEADERS} DESTINATION include) + ENDIF() + LIBDIR_PATCH_EOF + system 'patch -Np1 -i libdir.patch' + end + + autotools_install_extras do # As per Arch pkgbuild. This fixes epiphany builds. system "sed -i 's/iconv//g' #{CREW_DEST_LIB_PREFIX}/pkgconfig/libarchive.pc" end diff --git a/packages/libavif.rb b/packages/libavif.rb index 67cd8dc6a..f9046f4ab 100644 --- a/packages/libavif.rb +++ b/packages/libavif.rb @@ -3,7 +3,7 @@ require 'buildsystems/cmake' class Libavif < CMake description 'Library for encoding and decoding .avif files' homepage 'https://github.com/AOMediaCodec/libavif' - version '1.1.0' + version '1.3.0' license 'BSD-2' compatibility 'aarch64 armv7l x86_64' source_url 'https://github.com/AOMediaCodec/libavif.git' @@ -11,27 +11,28 @@ class Libavif < CMake binary_compression 'tar.zst' binary_sha256({ - aarch64: 'a6632560338310f3909f141763e886af378a1671329d10f9bfd22310c596d50c', - armv7l: 'a6632560338310f3909f141763e886af378a1671329d10f9bfd22310c596d50c', - x86_64: '2f81bae4159dae77502f9c0c573e5b9a16156640a8c0eb23f93b5769c1c3b969' + aarch64: '91029d3d2d8a826af8fa188f06217710a2ed4ab49eb7880a356b0454d5ca2e7d', + armv7l: '91029d3d2d8a826af8fa188f06217710a2ed4ab49eb7880a356b0454d5ca2e7d', + x86_64: '78252aa3decc765b1488c92d447c2cc43ac629d396ec4cc83ccdeadf142d3278' }) - depends_on 'dav1d' # R + depends_on 'dav1d' => :build depends_on 'gcc_lib' # R depends_on 'gdk_pixbuf' # R depends_on 'glibc' # R depends_on 'glib' # R - depends_on 'libaom' # R + depends_on 'libaom' => :build depends_on 'libjpeg_turbo' # R depends_on 'libpng' # R depends_on 'libtiff' # L - depends_on 'libwebp' # R + depends_on 'libwebp' => :build + depends_on 'libxml2' # R depends_on 'libyuv' # R depends_on 'nasm' => :build depends_on 'pandoc' => :build depends_on 'pkgconf' => :build - depends_on 'rav1e' # R - depends_on 'svt_av1' # R + depends_on 'rav1e' => :build + depends_on 'svt_av1' => :build depends_on 'zlib' # R gnome @@ -42,5 +43,6 @@ class Libavif < CMake -DAVIF_CODEC_RAV1E=ON \ -DAVIF_CODEC_SVT=ON \ -DAVIF_BUILD_GDK_PIXBUF=ON \ - -DAVIF_BUILD_MAN_PAGES=ON' + -DAVIF_BUILD_MAN_PAGES=OFF \ + -DAVIF_LIBXML2=SYSTEM' end diff --git a/packages/libbacktrace.rb b/packages/libbacktrace.rb index e76b21b7a..01550c3a0 100644 --- a/packages/libbacktrace.rb +++ b/packages/libbacktrace.rb @@ -24,5 +24,5 @@ class Libbacktrace < Autotools depends_on 'gcc_lib' # R depends_on 'glibc' # R - configure_options '--enable-shared' + autotools_configure_options '--enable-shared' end diff --git a/packages/libcaca.rb b/packages/libcaca.rb index 002d29ad1..3c9c4f710 100644 --- a/packages/libcaca.rb +++ b/packages/libcaca.rb @@ -54,7 +54,7 @@ class Libcaca < Autotools ConvenienceFunctions.libtoolize('freetype') end - configure_options '--disable-ruby \ + autotools_configure_options '--disable-ruby \ --enable-gl \ --enable-ncurses \ --enable-network \ diff --git a/packages/libcap_ng.rb b/packages/libcap_ng.rb index 1a7e9f910..41261edbf 100644 --- a/packages/libcap_ng.rb +++ b/packages/libcap_ng.rb @@ -25,5 +25,5 @@ class Libcap_ng < Autotools system "sed -i 's,/usr/bin,#{CREW_PREFIX}/bin,g' utils/captest.c" end - configure_options "--with-capability_header=#{CREW_PREFIX}/include/linux/capability.h" + autotools_configure_options "--with-capability_header=#{CREW_PREFIX}/include/linux/capability.h" end diff --git a/packages/libcyrussasl.rb b/packages/libcyrussasl.rb index 585ec803d..daad1cf6f 100644 --- a/packages/libcyrussasl.rb +++ b/packages/libcyrussasl.rb @@ -25,7 +25,7 @@ class Libcyrussasl < Autotools depends_on 'linux_pam' # R depends_on 'openssl' # R - configure_options "--enable-shared \ + autotools_configure_options "--enable-shared \ --with-configdir=#{CREW_PREFIX}/etc/sasl2 \ --with-cxx-shared \ --with-dbpath=#{CREW_PREFIX}/etc/sasldb2" diff --git a/packages/libdbusmenu_gtk3.rb b/packages/libdbusmenu_gtk3.rb index 52502ec93..673f5c08b 100644 --- a/packages/libdbusmenu_gtk3.rb +++ b/packages/libdbusmenu_gtk3.rb @@ -35,7 +35,7 @@ class Libdbusmenu_gtk3 < Autotools depends_on 'vala' => :build depends_on 'zlib' # R - configure_options '--disable-dumper --disable-scrollkeeper --disable-gtk-doc --enable-introspection --with-gtk=3' + autotools_configure_options '--disable-dumper --disable-scrollkeeper --disable-gtk-doc --enable-introspection --with-gtk=3' def self.patch downloader "http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu/libdbusmenu_#{@ubuntu_version}.debian.tar.xz", '2d00f79281340516f326468efee0e75651f0926834ce2671195f7a6b5945b314' diff --git a/packages/libffi.rb b/packages/libffi.rb index 255b9a22d..89fc8b17d 100644 --- a/packages/libffi.rb +++ b/packages/libffi.rb @@ -23,7 +23,7 @@ class Libffi < Autotools # run_tests # DejaGNU required # See https://git.launchpad.net/ubuntu/+source/libffi/tree/debian/rules?h=applied/ubuntu/plucky-devel - configure_options "--build=#{CREW_TARGET}\ + autotools_configure_options "--build=#{CREW_TARGET}\ --disable-builddir \ --disable-docs \ --disable-exec-static-tramp \ @@ -37,7 +37,7 @@ class Libffi < Autotools system 'patch -Np1 -i no-toolexeclibdir.diff' end - configure_install_extras do + autotools_install_extras do FileUtils.install '.libs/libffi_convenience.a', "#{CREW_DEST_LIB_PREFIX}/libffi_pic.a", mode: 0o644 end end diff --git a/packages/libgconf.rb b/packages/libgconf.rb index 5bdcecb96..f4868bb51 100644 --- a/packages/libgconf.rb +++ b/packages/libgconf.rb @@ -24,5 +24,5 @@ class Libgconf < Autotools gnome - configure_options '--disable-orbit' + autotools_configure_options '--disable-orbit' end diff --git a/packages/libgcrypt.rb b/packages/libgcrypt.rb index 69bb45113..059670375 100644 --- a/packages/libgcrypt.rb +++ b/packages/libgcrypt.rb @@ -21,7 +21,7 @@ class Libgcrypt < Autotools depends_on 'glibc' # R depends_on 'libgpg_error' # R - configure_options '--enable-static \ + autotools_configure_options '--enable-static \ --enable-shared' def self.patch diff --git a/packages/libgnome_keyring.rb b/packages/libgnome_keyring.rb index c61b3d9ff..dec8ffd60 100644 --- a/packages/libgnome_keyring.rb +++ b/packages/libgnome_keyring.rb @@ -22,5 +22,5 @@ class Libgnome_keyring < Autotools gnome - configure_options '--enable-introspection=no --enable-vala=no' + autotools_configure_options '--enable-introspection=no --enable-vala=no' end diff --git a/packages/libgnomecanvas.rb b/packages/libgnomecanvas.rb index b0149a427..b5e2921c0 100644 --- a/packages/libgnomecanvas.rb +++ b/packages/libgnomecanvas.rb @@ -21,5 +21,5 @@ class Libgnomecanvas < Autotools gnome - configure_options '--enable-glade' + autotools_configure_options '--enable-glade' end diff --git a/packages/libgpg_error.rb b/packages/libgpg_error.rb index 451b1101d..f2d9e345b 100644 --- a/packages/libgpg_error.rb +++ b/packages/libgpg_error.rb @@ -23,5 +23,5 @@ class Libgpg_error < Autotools depends_on 'glibc' # R # Docs fail to build otherwise. - configure_options '--enable-maintainer-mode' + autotools_configure_options '--enable-maintainer-mode' end diff --git a/packages/libgsf.rb b/packages/libgsf.rb index c775e8703..a1e6cf2d7 100644 --- a/packages/libgsf.rb +++ b/packages/libgsf.rb @@ -29,7 +29,7 @@ class Libgsf < Autotools gnome - configure_options '--enable-shared=yes \ + autotools_configure_options '--enable-shared=yes \ --disable-maintainer-mode \ --enable-introspection' end diff --git a/packages/libjpeg_turbo.rb b/packages/libjpeg_turbo.rb index 6d2b24710..bec11561c 100644 --- a/packages/libjpeg_turbo.rb +++ b/packages/libjpeg_turbo.rb @@ -1,9 +1,9 @@ -require 'package' +require 'buildsystems/cmake' -class Libjpeg_turbo < Package +class Libjpeg_turbo < CMake description 'Libjpeg-turbo implements both the traditional libjpeg API as well as the less powerful but more straightforward TurboJPEG API.' homepage 'https://libjpeg-turbo.org' - version '3.0.3' + version '3.1.0' license 'IJG License' compatibility 'all' source_url 'https://github.com/libjpeg-turbo/libjpeg-turbo.git' @@ -11,30 +11,19 @@ class Libjpeg_turbo < Package binary_compression 'tar.zst' binary_sha256({ - aarch64: 'a310b3d08d0ab8c669a4131c2a0d585c3c72bf4a483d198b78f77e7690320a34', - armv7l: 'a310b3d08d0ab8c669a4131c2a0d585c3c72bf4a483d198b78f77e7690320a34', - i686: 'c950ec0f49c9963ee2f3fb360ca114eac28a0cc2b08de015091ef06f7156502d', - x86_64: '0bf918eaaf48bf316ab223740bb7e036552b422872e907d40c48b3ef44ed9963' + aarch64: 'a320f17f92713f21b365b2a7199deeec3988ed2f6b8860edc43d96b9fb4dc2d5', + armv7l: 'a320f17f92713f21b365b2a7199deeec3988ed2f6b8860edc43d96b9fb4dc2d5', + i686: '8b68797f4ac975b6db273659b1e62587a5ce3496b2f60914fb061239b279c39a', + x86_64: '97b8d4494be87df3e17ce291425d4c49cbda0f95a3b9051ac8cce6383a9db6b6' }) - depends_on 'yasm' => :build + depends_on 'nasm' => :build depends_on 'glibc' # R - no_env_options + cmake_options '-DENABLE_STATIC=OFF \ + -DWITH_JAVA=OFF' - def self.build - system "cmake \ - -B builddir -G Ninja \ - #{CREW_CMAKE_OPTIONS.gsub('-mfpu=vfpv3-d16', '-mfpu=neon-fp16')} \ - -DENABLE_STATIC=OFF \ - -DWITH_12BIT=OFF \ - -DWITH_JAVA=OFF \ - -W no-dev" - system "#{CREW_NINJA} -C builddir" - end - - def self.install - system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" - FileUtils.install 'jpegint.h', "#{CREW_DEST_PREFIX}/include/", mode: 0o644 + cmake_install_extras do + FileUtils.install 'src/jpegint.h', "#{CREW_DEST_PREFIX}/include/", mode: 0o644 end end diff --git a/packages/libmetalink.rb b/packages/libmetalink.rb index 6345815b5..45ef829f4 100644 --- a/packages/libmetalink.rb +++ b/packages/libmetalink.rb @@ -28,6 +28,6 @@ class Libmetalink < Autotools system 'patch -Np1 -i 0001-fix-covscan-issues.patch' end - configure_options '--with-libxml2 \ + autotools_configure_options '--with-libxml2 \ --without-libexpat' end diff --git a/packages/libnl3.rb b/packages/libnl3.rb index 526d7219d..a0c74a23d 100644 --- a/packages/libnl3.rb +++ b/packages/libnl3.rb @@ -20,7 +20,7 @@ class Libnl3 < Autotools # depends_on 'check' => :build depends_on 'glibc' # R - configure_options '--disable-debug' + autotools_configure_options '--disable-debug' # https://github.com/thom311/libnl/issues/393 # run_tests end diff --git a/packages/libnsl.rb b/packages/libnsl.rb index c82cbb0fb..8cf000a77 100644 --- a/packages/libnsl.rb +++ b/packages/libnsl.rb @@ -25,5 +25,5 @@ class Libnsl < Autotools depends_on 'krb5' # R depends_on 'libtirpc' # R - configure_options '--disable-static' + autotools_configure_options '--disable-static' end diff --git a/packages/libostree.rb b/packages/libostree.rb index 16dc0161b..315704ee6 100644 --- a/packages/libostree.rb +++ b/packages/libostree.rb @@ -51,7 +51,7 @@ class Libostree < Autotools depends_on 'zlib' # R depends_on 'zstd' # R - configure_options '--disable-rofiles-fuse \ + autotools_configure_options '--disable-rofiles-fuse \ --with-curl \ --without-libsystemd \ --with-avahi \ diff --git a/packages/libpaper.rb b/packages/libpaper.rb index a9fce8c1d..c0fab2935 100644 --- a/packages/libpaper.rb +++ b/packages/libpaper.rb @@ -20,7 +20,7 @@ class Libpaper < Autotools depends_on 'gnupg' => :build depends_on 'help2man' => :build - configure_options '--enable-relocatable' + autotools_configure_options '--enable-relocatable' run_tests end diff --git a/packages/libshumate.rb b/packages/libshumate.rb index 626932597..7f3edf0ce 100644 --- a/packages/libshumate.rb +++ b/packages/libshumate.rb @@ -6,7 +6,7 @@ require 'buildsystems/meson' class Libshumate < Meson description 'GTK toolkit providing widgets for embedded maps' homepage 'https://wiki.gnome.org/Projects/libshumate' - version '1.2.rc2' + version '1.4.0' license 'LGPL' compatibility 'aarch64 armv7l x86_64' source_url 'https://gitlab.gnome.org/GNOME/libshumate.git' @@ -14,9 +14,9 @@ class Libshumate < Meson binary_compression 'tar.zst' binary_sha256({ - aarch64: '370044f75080c1149725e608c1a455f6918f76a26e2402008f68bd8f65c140e2', - armv7l: '370044f75080c1149725e608c1a455f6918f76a26e2402008f68bd8f65c140e2', - x86_64: '8f79c0bc9c97cf72c48cc64b88064b74ee95196f4be9be664002670be8c29175' + aarch64: '4a4577c39d8caa021ffadef5f3f0dee74e526e2405cada79350874b7fbc4f864', + armv7l: '4a4577c39d8caa021ffadef5f3f0dee74e526e2405cada79350874b7fbc4f864', + x86_64: '5de54c106089ab7dbf632167bc8a98cb1d421d9d27bb715f883780c78faca834' }) depends_on 'cairo' # R diff --git a/packages/libsigsegv.rb b/packages/libsigsegv.rb index 9212b6bf5..7c7a11139 100644 --- a/packages/libsigsegv.rb +++ b/packages/libsigsegv.rb @@ -19,7 +19,7 @@ class Libsigsegv < Autotools depends_on 'glibc' # R - configure_options '--enable-shared \ + autotools_configure_options '--enable-shared \ --enable-static \ --enable-relocatable' diff --git a/packages/libssh2.rb b/packages/libssh2.rb index a272bc717..0a0219ac1 100644 --- a/packages/libssh2.rb +++ b/packages/libssh2.rb @@ -21,5 +21,5 @@ class Libssh2 < Autotools depends_on 'openssl' # R depends_on 'zlib' # R - configure_options '--with-libz' + autotools_configure_options '--with-libz' end diff --git a/packages/libtasn1.rb b/packages/libtasn1.rb index 6c1ac9e62..72de590d9 100644 --- a/packages/libtasn1.rb +++ b/packages/libtasn1.rb @@ -22,7 +22,7 @@ class Libtasn1 < Autotools depends_on 'diffutils' => :build depends_on 'glibc' # R - configure_options '--enable-shared \ + autotools_configure_options '--enable-shared \ --enable-static \ --with-pic' end diff --git a/packages/libunbound.rb b/packages/libunbound.rb index d8bfc9297..0c69e4974 100644 --- a/packages/libunbound.rb +++ b/packages/libunbound.rb @@ -22,7 +22,7 @@ class Libunbound < Autotools depends_on 'glibc' # R depends_on 'openssl' # R On i686 openssl needs to be installed before libunbound. - configure_options '--enable-shared \ + autotools_configure_options '--enable-shared \ --enable-static \ --with-pic' diff --git a/packages/libunistring.rb b/packages/libunistring.rb index 7e0333452..5763b93a2 100644 --- a/packages/libunistring.rb +++ b/packages/libunistring.rb @@ -19,6 +19,6 @@ class Libunistring < Autotools depends_on 'glibc' - configure_options '--enable-static \ + autotools_configure_options '--enable-static \ --enable-shared' end diff --git a/packages/libunwind.rb b/packages/libunwind.rb index 7d034add4..8db4dd897 100644 --- a/packages/libunwind.rb +++ b/packages/libunwind.rb @@ -23,5 +23,5 @@ class Libunwind < Autotools depends_on 'xzutils' # R depends_on 'zlib' # R - configure_options '--enable-ptrace' + autotools_configure_options '--enable-ptrace' end diff --git a/packages/liburcu.rb b/packages/liburcu.rb index b80034812..3bd3499e7 100644 --- a/packages/liburcu.rb +++ b/packages/liburcu.rb @@ -19,7 +19,7 @@ class Liburcu < Autotools depends_on 'glibc' # R - configure_options '--disable-static' + autotools_configure_options '--disable-static' run_tests end diff --git a/packages/libwmf.rb b/packages/libwmf.rb index bb4ea4b15..b23d93350 100644 --- a/packages/libwmf.rb +++ b/packages/libwmf.rb @@ -35,6 +35,6 @@ class Libwmf < Autotools gnome - pre_configure_options "CFLAGS=-I#{CREW_PREFIX}/include/freetype2/" - configure_options "--with-x --with-freetype=#{CREW_PREFIX}/include/freetype2" + autotools_pre_configure_options "CFLAGS=-I#{CREW_PREFIX}/include/freetype2/" + autotools_configure_options "--with-x --with-freetype=#{CREW_PREFIX}/include/freetype2" end diff --git a/packages/libxml2.rb b/packages/libxml2.rb index 364c7d138..ffb47987c 100644 --- a/packages/libxml2.rb +++ b/packages/libxml2.rb @@ -1,9 +1,12 @@ +# Meson builds of 2.13.x need a patch. +# See https://gitlab.gnome.org/GNOME/libxml2/-/issues/923 require 'buildsystems/cmake' class Libxml2 < CMake description 'Libxml2 is the XML C parser and toolkit developed for the Gnome project.' homepage 'http://xmlsoft.org/' - version "2.13.4-#{CREW_ICU_VER}" + # Versions newer than 2.13.x require everything to be recompiled. + version "2.13.7-#{CREW_ICU_VER}" license 'MIT' compatibility 'all' source_url 'https://gitlab.gnome.org/GNOME/libxml2.git' @@ -11,28 +14,26 @@ class Libxml2 < CMake binary_compression 'tar.zst' binary_sha256({ - aarch64: 'ce90c88af66d260d38454a520b61ab9453cbeb83c2ca6076cdb2cda508268bd7', - armv7l: 'ce90c88af66d260d38454a520b61ab9453cbeb83c2ca6076cdb2cda508268bd7', - i686: 'f724e242213075de12302b21e6c405d35dbbbe702799a6a71abb9cbedf987d63', - x86_64: '7dc5d2ea9a9c658e6ba439978e5b5049fbe2348801c68f19f67a9cb1cb047eba' + aarch64: '1ef7210db33741e6fbd387794968bff197af8bd66c16933cecd05c5605b8d4c0', + armv7l: '1ef7210db33741e6fbd387794968bff197af8bd66c16933cecd05c5605b8d4c0', + i686: '306413b748948807f4ac79cc3869faef99f8236d8b8ade48b32ecaa3fdf979f1', + x86_64: '1c9a1de8bfd0fff674257736ed362c7382321c5e5c4c4e5cf37abd37762bb87b' }) depends_on 'gcc_lib' # R depends_on 'glibc' # R depends_on 'icu4c' # R - depends_on 'ncurses' # R depends_on 'readline' # R - depends_on 'zlib' # R conflicts_ok gnome def self.patch # Fix encoding.c:1961:31: error: ‘TRUE’ undeclared (first use in this function) - system "for f in $(grep -rl 'TRUE)'); do sed -i 's,TRUE),true),g' $f; done" + # system "for f in $(grep -rl 'TRUE)'); do sed -i 's,TRUE),true),g' $f; done" # Remove EBCDIC test since it fails. # Check https://mail.gnome.org/archives/xml/2010-April/msg00010.html for details. - FileUtils.rm 'test/ebcdic_566012.xml' + # FileUtils.rm 'test/ebcdic_566012.xml' end cmake_options '-DLIBXML2_WITH_PYTHON=OFF \ diff --git a/packages/libxml2_autotools.rb b/packages/libxml2_autotools.rb index aa91b1a6e..837788423 100644 --- a/packages/libxml2_autotools.rb +++ b/packages/libxml2_autotools.rb @@ -14,10 +14,10 @@ class Libxml2_autotools < Autotools binary_compression 'tar.zst' binary_sha256({ - aarch64: '4c09610ce86270d217ba4eefebee41b10fcce17c68a2e594e008ab4964c1a591', - armv7l: '4c09610ce86270d217ba4eefebee41b10fcce17c68a2e594e008ab4964c1a591', - i686: '3f680048525a86d159de286f9b8509295df5316c22a37cb95abc86c050cc22df', - x86_64: 'a96b4e07d84494e485dac0751af571e6cf37258514956195b9ad4e6095df01b0' + aarch64: '7c4a657d5664cdd2ddc64ad7bab7b1e9c386e9cd2ff017e565c0477aecb6864d', + armv7l: '7c4a657d5664cdd2ddc64ad7bab7b1e9c386e9cd2ff017e565c0477aecb6864d', + i686: '141c1adb6bcffa3ae4c5900c0b764647bce4e11b76c1cc8d527eabb1b2ad4071', + x86_64: '5cdd131dfaba8ad01089fad708b8a4cf036dad67864966c2ea604c58822a2a3e' }) depends_on 'gcc_lib' # R @@ -39,7 +39,7 @@ class Libxml2_autotools < Autotools FileUtils.rm 'test/ebcdic_566012.xml' end - configure_options '--disable-static \ + autotools_configure_options '--disable-static \ --with-icu \ --without-python \ --without-lzma' diff --git a/packages/libyuv.rb b/packages/libyuv.rb index f40c3f7e6..7c3a4b3da 100644 --- a/packages/libyuv.rb +++ b/packages/libyuv.rb @@ -3,17 +3,17 @@ require 'buildsystems/cmake' class Libyuv < CMake description 'Library for YUV scaling' homepage 'https://chromium.googlesource.com/libyuv/libyuv/' - version '188e4e3' + version '949cb62' license 'BSD-Google' compatibility 'aarch64 armv7l x86_64' source_url 'https://chromium.googlesource.com/libyuv/libyuv.git' - git_hashtag '188e4e3afbfe90f6f13f59db6c929762de07921b' + git_hashtag '949cb623bf904c5e7a7c060ab0ae609574870fb3' binary_compression 'tar.zst' binary_sha256({ - aarch64: 'fb76ee82bfc4a5b4a20c471da425443e92f93b1e74c826b4f698409e70df5550', - armv7l: 'fb76ee82bfc4a5b4a20c471da425443e92f93b1e74c826b4f698409e70df5550', - x86_64: '079922fb87321c186cbbc468bfa310841d2acc1c75a7abe717898a7aa65a3943' + aarch64: '063f2d6a7e4ea54093e1a36c79793ca065b2502ba60a79ac25303f7c0e651dff', + armv7l: '063f2d6a7e4ea54093e1a36c79793ca065b2502ba60a79ac25303f7c0e651dff', + x86_64: '990789ffbb29fb2b6c52f1ce79df9825af690d6309046fdfd077af91eb7c020b' }) depends_on 'gcc_lib' # R diff --git a/packages/llvm20_build.rb b/packages/llvm20_build.rb index c112c3f34..026a1bcf2 100644 --- a/packages/llvm20_build.rb +++ b/packages/llvm20_build.rb @@ -125,12 +125,11 @@ class Llvm20_build < Package -DCMAKE_C_COMPILER_TARGET=#{CREW_TARGET} \ -DCMAKE_C_FLAGS='#{@ARCH_C_LTO_FLAGS}' \ -DCMAKE_CXX_COMPILER=$(which clang++) \ - -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \ -DCMAKE_CXX_FLAGS='#{@ARCH_CXX_LTO_FLAGS}' \ -DCMAKE_EXE_LINKER_FLAGS='#{@ARCH_LTO_LDFLAGS}' \ -DCMAKE_INSTALL_LIBDIR=#{ARCH_LIB} \ -DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX} \ - -DCLANG_DEFAULT_LINKER=#{CREW_LINKER} \ + -DCLANG_DEFAULT_LINKER=mold \ -D_CMAKE_TOOLCHAIN_PREFIX=llvm- \ -DCOMPILER_RT_BUILD_BUILTINS=ON \ -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ diff --git a/packages/lrzip_next.rb b/packages/lrzip_next.rb index cef20749e..6c1f118b3 100644 --- a/packages/lrzip_next.rb +++ b/packages/lrzip_next.rb @@ -30,5 +30,5 @@ class Lrzip_next < Autotools git_fetchtags - configure_options '--enable-asm' + autotools_configure_options '--enable-asm' end diff --git a/packages/lvm2.rb b/packages/lvm2.rb index 9496a5011..523154051 100644 --- a/packages/lvm2.rb +++ b/packages/lvm2.rb @@ -22,7 +22,7 @@ class Lvm2 < Autotools depends_on 'readline' # R depends_on 'util_linux' # R - configure_options "--localstatedir=#{CREW_PREFIX}/var \ + autotools_configure_options "--localstatedir=#{CREW_PREFIX}/var \ --disable-selinux \ --enable-cmdlib \ --enable-dmeventd \ diff --git a/packages/magic.rb b/packages/magic.rb index 9634ff439..12e5e5075 100644 --- a/packages/magic.rb +++ b/packages/magic.rb @@ -26,5 +26,5 @@ class Magic < Autotools depends_on 'tk' # R depends_on 'zlib' # R - configure_options "--with-tcl=#{CREW_LIB_PREFIX} --with-tk=#{CREW_LIB_PREFIX}" + autotools_configure_options "--with-tcl=#{CREW_LIB_PREFIX} --with-tk=#{CREW_LIB_PREFIX}" end diff --git a/packages/mpc.rb b/packages/mpc.rb index f60d16947..c4af09dd0 100644 --- a/packages/mpc.rb +++ b/packages/mpc.rb @@ -21,6 +21,6 @@ class Mpc < Autotools depends_on 'gmp' # R depends_on 'mpfr' # R - configure_options '--disable-maintainer-mode \ + autotools_configure_options '--disable-maintainer-mode \ --enable-shared' end diff --git a/packages/mpfr.rb b/packages/mpfr.rb index 4b9b190ae..8cd45244d 100644 --- a/packages/mpfr.rb +++ b/packages/mpfr.rb @@ -21,7 +21,7 @@ class Mpfr < Autotools depends_on 'glibc' # R depends_on 'gmp' # R - configure_options '--enable-shared' + autotools_configure_options '--enable-shared' def self.check system "LD_LIBRARY_PATH=\$(pwd)/src/.libs:\$LD_LIBRARY_PATH make check" diff --git a/packages/mpg123.rb b/packages/mpg123.rb index fad2147a4..1900556f6 100644 --- a/packages/mpg123.rb +++ b/packages/mpg123.rb @@ -23,8 +23,8 @@ class Mpg123 < Autotools case ARCH when 'i686' - configure_options '--with-audio=alsa --with-cpu=i386' + autotools_configure_options '--with-audio=alsa --with-cpu=i386' else - configure_options '--with-audio=alsa' + autotools_configure_options '--with-audio=alsa' end end diff --git a/packages/mtools.rb b/packages/mtools.rb index 899537d81..08f6f405a 100644 --- a/packages/mtools.rb +++ b/packages/mtools.rb @@ -18,5 +18,5 @@ class Mtools < Autotools depends_on 'glibc' # R - configure_options '--without-x' + autotools_configure_options '--without-x' end diff --git a/packages/mutt.rb b/packages/mutt.rb index a020cb90d..b0670c74e 100644 --- a/packages/mutt.rb +++ b/packages/mutt.rb @@ -25,14 +25,14 @@ class Mutt < Autotools depends_on 'openssl' # R depends_on 'zlib' # R - configure_options "--with-mailpath=#{CREW_PREFIX}/etc/mail \ + autotools_configure_options "--with-mailpath=#{CREW_PREFIX}/etc/mail \ --with-sasl=#{CREW_LIB_PREFIX}/sasl2 \ --with-ssl \ --enable-imap \ --enable-smtp \ --enable-hcache" - configure_install_extras do + autotools_install_extras do FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/mail" FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/env.d/" File.write "#{CREW_DEST_PREFIX}/etc/env.d/mutt", <<~MUTTEOF diff --git a/packages/nano.rb b/packages/nano.rb index 1809cb417..0afdd85b3 100644 --- a/packages/nano.rb +++ b/packages/nano.rb @@ -22,7 +22,7 @@ class Nano < Autotools depends_on 'ncurses' # R depends_on 'zlib' # R - configure_options '--enable-browser \ + autotools_configure_options '--enable-browser \ --enable-color \ --enable-comment \ --enable-extra \ @@ -45,7 +45,7 @@ class Nano < Autotools --enable-wrapping \ --enable-year2038' - configure_build_extras do + autotools_build_extras do open('nanorc', 'w') do |f| f << "set constantshow\n" f << "set fill 72\n" @@ -60,7 +60,7 @@ class Nano < Autotools end end - configure_install_extras do + autotools_install_extras do FileUtils.install 'nanorc', "#{CREW_DEST_HOME}/.nanorc", mode: 0o644 end diff --git a/packages/nasm.rb b/packages/nasm.rb index 9122b8efa..3c975562d 100644 --- a/packages/nasm.rb +++ b/packages/nasm.rb @@ -20,7 +20,7 @@ class Nasm < Autotools depends_on 'py3_asciidoc' => :build depends_on 'xmlto' => :build - configure_build_extras do + autotools_build_extras do system 'make manpages' end end diff --git a/packages/ncurses.rb b/packages/ncurses.rb index 064cc1f79..d584beee3 100644 --- a/packages/ncurses.rb +++ b/packages/ncurses.rb @@ -23,7 +23,7 @@ class Ncurses < Autotools depends_on 'gcc_lib' # R depends_on 'glibc' # R - configure_options "--program-prefix='' \ + autotools_configure_options "--program-prefix='' \ --program-suffix='' \ --disable-root-access \ --disable-root-environ \ diff --git a/packages/nftables.rb b/packages/nftables.rb index 33e2c9bf0..e6b4eaeb7 100644 --- a/packages/nftables.rb +++ b/packages/nftables.rb @@ -26,7 +26,7 @@ class Nftables < Autotools depends_on 'libnftnl' # R depends_on 'readline' # R - configure_options "--sysconfdir=#{CREW_PREFIX}/etc \ + autotools_configure_options "--sysconfdir=#{CREW_PREFIX}/etc \ --with-json \ --with-cli=readline \ --with-mini-gmp \ diff --git a/packages/ntfs_3g.rb b/packages/ntfs_3g.rb index 61d14e79b..6c95b26a7 100644 --- a/packages/ntfs_3g.rb +++ b/packages/ntfs_3g.rb @@ -20,5 +20,5 @@ class Ntfs_3g < Autotools depends_on 'glibc' # R depends_on 'util_linux' # R - configure_options "--exec-prefix=#{CREW_PREFIX} --disable-ntfs-3g" + autotools_configure_options "--exec-prefix=#{CREW_PREFIX} --disable-ntfs-3g" end diff --git a/packages/openjade.rb b/packages/openjade.rb index 0370bbbd8..c377459b0 100644 --- a/packages/openjade.rb +++ b/packages/openjade.rb @@ -32,7 +32,7 @@ class Openjade < Autotools end end - configure_install_extras do + autotools_install_extras do FileUtils.ln_s "#{CREW_PREFIX}/bin/openjade", "#{CREW_DEST_PREFIX}/bin/jade" end end diff --git a/packages/openldap.rb b/packages/openldap.rb index d56b976bf..3a9f4fb82 100644 --- a/packages/openldap.rb +++ b/packages/openldap.rb @@ -25,5 +25,5 @@ class Openldap < Autotools depends_on 'openssl' # R depends_on 'util_linux' # R - configure_options '--disable-slapd' + autotools_configure_options '--disable-slapd' end diff --git a/packages/openssh.rb b/packages/openssh.rb index 93ee56edd..d04bf971f 100644 --- a/packages/openssh.rb +++ b/packages/openssh.rb @@ -23,5 +23,5 @@ class Openssh < Autotools depends_on 'openssl' # R depends_on 'zlib' # R - configure_options '--enable-year2038 --without-hardening --without-retpoline' + autotools_configure_options '--enable-year2038 --without-hardening --without-retpoline' end diff --git a/packages/patch.rb b/packages/patch.rb index 5a9b87c4a..85b7d2f26 100644 --- a/packages/patch.rb +++ b/packages/patch.rb @@ -20,7 +20,7 @@ class Patch < Autotools depends_on 'attr' # R depends_on 'glibc' # R - configure_options '--disable-year2038' unless ARCH.include?('x86_64') + autotools_configure_options '--disable-year2038' unless ARCH.include?('x86_64') run_tests end diff --git a/packages/patchelf.rb b/packages/patchelf.rb index 3f9e5bdfb..57b118ca1 100644 --- a/packages/patchelf.rb +++ b/packages/patchelf.rb @@ -19,7 +19,7 @@ class Patchelf < Autotools no_env_options - pre_configure_options "LDFLAGS='#{CREW_LINKER_FLAGS} -static'" + autotools_pre_configure_options "LDFLAGS='#{CREW_LINKER_FLAGS} -static'" def self.check system "#{CREW_DEST_PREFIX}/bin/patchelf --version" diff --git a/packages/pidgin.rb b/packages/pidgin.rb index 96acf2379..5a624615a 100644 --- a/packages/pidgin.rb +++ b/packages/pidgin.rb @@ -30,7 +30,7 @@ class Pidgin < Autotools system "sed -i 's,/usr/include,#{CREW_PREFIX}/include,g' configure" end - configure_options "--disable-avahi \ + autotools_configure_options "--disable-avahi \ --disable-dbus \ --disable-gtkspell \ --disable-idn \ diff --git a/packages/py3_libxml2.rb b/packages/py3_libxml2.rb index cf1d55bb3..d80ed2c87 100644 --- a/packages/py3_libxml2.rb +++ b/packages/py3_libxml2.rb @@ -12,10 +12,10 @@ class Py3_libxml2 < Package binary_compression 'tar.zst' binary_sha256({ - aarch64: '6104bab109fab73576daa07ae3bc5c2c174615b17f85b65d52696bfcb84f33b8', - armv7l: '6104bab109fab73576daa07ae3bc5c2c174615b17f85b65d52696bfcb84f33b8', - i686: '7ff32e8616aba0682996bb630d35bd551a2a10f302c5b0cb659a1f901cb1c65e', - x86_64: '8d6a0a678776b2988cb6826f0f778f204cf552e0d40909436f804a6ebf90ce52' + aarch64: 'f3046388baf9c1da94e3a45f2c694565a41c36412f9584973ede487e602d588d', + armv7l: 'f3046388baf9c1da94e3a45f2c694565a41c36412f9584973ede487e602d588d', + i686: 'b87930108ddacfd4cc595d596f1e440c26d7b6c953e6efc32b9c0d552e6e436d', + x86_64: 'fe402dd0247a9236ca54c6cc0fa27708bbfda9b8ac18ace47a16d123a203fcc1' }) depends_on 'glibc' # R @@ -30,7 +30,8 @@ class Py3_libxml2 < Package system 'autoreconf -fiv' system "./configure #{CREW_CONFIGURE_OPTIONS}" Dir.chdir('python') do - @pip_wheel = `python setup.py bdist_wheel`[/(?<=filename=)(.*)*?(\S+)/, 0] + system 'python setup.py bdist_wheel' + @pip_wheel = `cd dist && ls *.whl`.chomp end end diff --git a/packages/r.rb b/packages/r.rb index e0216582f..eb33e7c73 100644 --- a/packages/r.rb +++ b/packages/r.rb @@ -42,7 +42,7 @@ class R < Autotools depends_on 'xzutils' # R depends_on 'zlib' # R - configure_options '--enable-R-shlib \ + autotools_configure_options '--enable-R-shlib \ --with-x' run_tests diff --git a/packages/sassc.rb b/packages/sassc.rb index 1fc97c351..de25e076a 100644 --- a/packages/sassc.rb +++ b/packages/sassc.rb @@ -1,33 +1,23 @@ -require 'package' +require 'buildsystems/autotools' -class Sassc < Package +class Sassc < Autotools description 'C implementation of Sass CSS preprocessor.' homepage 'https://github.com/sass/sassc' - version '3.6.2' + version '3.6.2-1' license 'MIT' compatibility 'all' source_url 'https://github.com/sass/sassc.git' - git_hashtag version + git_hashtag version.split('-').first binary_compression 'tar.zst' binary_sha256({ - aarch64: 'b34876c122bce81fb000e249e3c240781e0815c5139255a5d92e45184959b80d', - armv7l: 'b34876c122bce81fb000e249e3c240781e0815c5139255a5d92e45184959b80d', - i686: '17acfe27361d4e8e2258fd5be8960ee24b7fcf2ae9e854ff4ab4d7ceb1373bed', - x86_64: '1d2cc3adbb8fdab70a69cc32975f10ca8c382fe04402d9717889787bcc580ffb' + aarch64: 'f651a9de4a61d1cf70395b20cc3ebe791bf2c22a6926334b614fb2ee9073e619', + armv7l: 'f651a9de4a61d1cf70395b20cc3ebe791bf2c22a6926334b614fb2ee9073e619', + i686: '538857ea1f1e5821b808f201e5d2fef2b58408b34557f9571fd84ae5800fb30a', + x86_64: '269d6fd0a548986c1ced744ddfb9b94caf51c430697ddbaf32fa8bb844c19c1e' }) depends_on 'gcc_lib' # R depends_on 'glibc' # R depends_on 'libsass' # R - - def self.build - system 'autoreconf -i' - system "./configure #{CREW_CONFIGURE_OPTIONS}" - system 'make' - end - - def self.install - system "make DESTDIR=#{CREW_DEST_DIR} install" - end end diff --git a/packages/sbc.rb b/packages/sbc.rb index fec8d8879..d64bb90b5 100644 --- a/packages/sbc.rb +++ b/packages/sbc.rb @@ -20,7 +20,7 @@ class Sbc < Autotools depends_on 'glibc' # R depends_on 'libsndfile' => :build - configure_options '--enable-high-precision \ + autotools_configure_options '--enable-high-precision \ --disable-static \ --enable-pie' end diff --git a/packages/screen.rb b/packages/screen.rb index 3cbb3d182..318473bd1 100644 --- a/packages/screen.rb +++ b/packages/screen.rb @@ -22,7 +22,7 @@ class Screen < Autotools depends_on 'linux_pam' # R depends_on 'ncurses' # R - configure_options "--enable-colors256 CFLAGS='-I#{CREW_PREFIX}/include/ncursesw'" + autotools_configure_options "--enable-colors256 CFLAGS='-I#{CREW_PREFIX}/include/ncursesw'" def self.prebuild system "sed -i 's,/usr/bin/perl,#{CREW_PREFIX}/bin/perl,g' mktar.pl" diff --git a/packages/sed.rb b/packages/sed.rb index 2a9db3f9b..ebe7f0f7f 100644 --- a/packages/sed.rb +++ b/packages/sed.rb @@ -20,5 +20,5 @@ class Sed < Autotools depends_on 'acl' # R depends_on 'glibc' # R - configure_options '--without-selinux' + autotools_configure_options '--without-selinux' end diff --git a/packages/shared_mime_info.rb b/packages/shared_mime_info.rb index 99a5ad50f..046691110 100644 --- a/packages/shared_mime_info.rb +++ b/packages/shared_mime_info.rb @@ -3,7 +3,7 @@ require 'buildsystems/meson' class Shared_mime_info < Meson description 'The shared-mime-info package contains the core database of common types and the update-mime-database command used to extend it.' homepage 'https://freedesktop.org/wiki/Software/shared-mime-info/' - version "2.4-#{CREW_ICU_VER}" + version "2.4-#{CREW_ICU_VER}-1" license 'GPL-2' compatibility 'all' source_url 'https://gitlab.freedesktop.org/xdg/shared-mime-info.git' @@ -11,10 +11,10 @@ class Shared_mime_info < Meson binary_compression 'tar.zst' binary_sha256({ - aarch64: 'bfe13f241a7ed68d6dc8121d92c8d639dd7257cc4bc5880d63fc81ab380c4241', - armv7l: 'bfe13f241a7ed68d6dc8121d92c8d639dd7257cc4bc5880d63fc81ab380c4241', - i686: '37ab32faf04eb17cdb9c1e2c1bdfa38017eaaa5a620331c7487db72f3683bec6', - x86_64: '670616572e7fb982ba18cbdab595638c359f978a03aaa560ae9b4118b818e9d3' + aarch64: '00fbf9862398df0cceb4eff10c2e0400d6ccdf454577c469032e11eabbe7a27c', + armv7l: '00fbf9862398df0cceb4eff10c2e0400d6ccdf454577c469032e11eabbe7a27c', + i686: '0ded55d937e53446cd6bd850d2b489f4580bae92434deb73fc01675a61293a17', + x86_64: 'd88e9a4ea801e210ff75bf2f64de5a50138ce770c8faff979be2495d43e561f4' }) depends_on 'gcc_lib' # R @@ -25,6 +25,8 @@ class Shared_mime_info < Meson depends_on 'libxml2' # R depends_on 'xmlto' => :build + meson_options '-Dbuild-tests=false' + def self.postinstall puts puts 'To update the database, execute the following:'.lightblue diff --git a/packages/snd.rb b/packages/snd.rb index 3314bf186..5a569bbb1 100644 --- a/packages/snd.rb +++ b/packages/snd.rb @@ -32,7 +32,7 @@ class Snd < Autotools depends_on 'speexdsp' depends_on 'pulseaudio' - configure_options '--with-s7 \ + autotools_configure_options '--with-s7 \ --with-ruby \ --with-motif \ --with-gui \ diff --git a/packages/source_highlight.rb b/packages/source_highlight.rb index 89527f0d5..a79151f47 100644 --- a/packages/source_highlight.rb +++ b/packages/source_highlight.rb @@ -26,7 +26,7 @@ class Source_highlight < Autotools depends_on 'glibc' # R depends_on 'texinfo' => :build - configure_options "--sysconfdir=#{CREW_PREFIX}/etc \ + autotools_configure_options "--sysconfdir=#{CREW_PREFIX}/etc \ --with-bash-completion=#{CREW_PREFIX}/share/bash-completion/completions" def self.install diff --git a/packages/speex.rb b/packages/speex.rb index 28d12f1c3..317324d2d 100644 --- a/packages/speex.rb +++ b/packages/speex.rb @@ -19,5 +19,5 @@ class Speex < Autotools depends_on 'glibc' # R - configure_options '--disable-maintainer-mode' + autotools_configure_options '--disable-maintainer-mode' end diff --git a/packages/speexdsp.rb b/packages/speexdsp.rb index c704ef2f8..b071970a8 100644 --- a/packages/speexdsp.rb +++ b/packages/speexdsp.rb @@ -20,6 +20,6 @@ class Speexdsp < Autotools depends_on 'glibc' # R depends_on 'speex' # R - configure_options '--disable-maintainer-mode \ + autotools_configure_options '--disable-maintainer-mode \ --disable-examples' end diff --git a/packages/sqlite.rb b/packages/sqlite.rb index 88a4adaa5..cd124b73f 100644 --- a/packages/sqlite.rb +++ b/packages/sqlite.rb @@ -23,7 +23,7 @@ class Sqlite < Autotools depends_on 'zlib' # R depends_on 'ncurses' # R - configure_options '--enable-shared \ + autotools_configure_options '--enable-shared \ --enable-editline \ --enable-readline \ --enable-fts3 \ diff --git a/packages/squid.rb b/packages/squid.rb index 9c36019e1..892f00d1e 100644 --- a/packages/squid.rb +++ b/packages/squid.rb @@ -33,6 +33,6 @@ class Squid < Autotools depends_on 'glibc' # R # https://github.com/squid-cache/squid/pull/1118 - pre_configure_options "CXXFLAGS='-Wno-alloc-size-larger-than'" - configure_options '--disable-arch-native --without-systemd' + autotools_pre_configure_options "CXXFLAGS='-Wno-alloc-size-larger-than'" + autotools_configure_options '--disable-arch-native --without-systemd' end diff --git a/packages/strace.rb b/packages/strace.rb index 7662f3840..ee88c72b0 100644 --- a/packages/strace.rb +++ b/packages/strace.rb @@ -23,5 +23,5 @@ class Strace < Autotools # This needs to be built with linux headers 5.15 on x86_64 via # CREW_KERNEL_VERSION=5.15 crew upgrade linuxheaders ; CREW_KERNEL_VERSION=5.15 crew build strace - configure_options '--disable-mpers --with-libdw --disable-gcc-Werror' + autotools_configure_options '--disable-mpers --with-libdw --disable-gcc-Werror' end diff --git a/packages/subversion.rb b/packages/subversion.rb index 28abb9f0c..465e88c69 100644 --- a/packages/subversion.rb +++ b/packages/subversion.rb @@ -33,7 +33,7 @@ class Subversion < Autotools depends_on 'zlib' # R depends_on 'zstd' # R - configure_options '--disable-static --with-utf8proc=internal' + autotools_configure_options '--disable-static --with-utf8proc=internal' def self.prebuild ConvenienceFunctions.libtoolize('expat') diff --git a/packages/tar.rb b/packages/tar.rb index ac4e8de5e..bca9f0fe8 100644 --- a/packages/tar.rb +++ b/packages/tar.rb @@ -20,5 +20,5 @@ class Tar < Autotools depends_on 'acl' # R depends_on 'glibc' # R - configure_options '--disable-year2038' unless ARCH == 'x86_64' + autotools_configure_options '--disable-year2038' unless ARCH == 'x86_64' end diff --git a/packages/tcpdump.rb b/packages/tcpdump.rb index 536aa7beb..7fd07c8b6 100644 --- a/packages/tcpdump.rb +++ b/packages/tcpdump.rb @@ -23,5 +23,5 @@ class Tcpdump < Autotools depends_on 'openssl' depends_on 'glibc' # R - configure_options "--with-user=#{USER}" + autotools_configure_options "--with-user=#{USER}" end diff --git a/packages/texinfo.rb b/packages/texinfo.rb index 594d2b7ca..9fc5c6168 100644 --- a/packages/texinfo.rb +++ b/packages/texinfo.rb @@ -25,7 +25,7 @@ class Texinfo < Autotools depends_on 'perl_text_unidecode' # L depends_on 'perl_unicode_eastasianwidth' # L - configure_options '--with-external-Text-Unidecode \ + autotools_configure_options '--with-external-Text-Unidecode \ --with-external-Unicode-EastAsianWidth' run_tests diff --git a/packages/thunar.rb b/packages/thunar.rb index 4ff2b1b5b..45c404a79 100644 --- a/packages/thunar.rb +++ b/packages/thunar.rb @@ -47,7 +47,7 @@ class Thunar < Autotools ConvenienceFunctions.libtoolize('harfbuzz') end - configure_options '--enable-gio-unix \ + autotools_configure_options '--enable-gio-unix \ --enable-gudev \ --enable-exif \ --enable-pcre \ diff --git a/packages/tmate.rb b/packages/tmate.rb index 55a5ac0f7..2052872fd 100644 --- a/packages/tmate.rb +++ b/packages/tmate.rb @@ -33,5 +33,5 @@ class Tmate < Autotools system 'patch -p1 -i 281.patch' end - pre_configure_options "CFLAGS='-I#{CREW_PREFIX}/include/ncurses' CPPFLAGS='-I#{CREW_PREFIX}/include/ncurses'" + autotools_pre_configure_options "CFLAGS='-I#{CREW_PREFIX}/include/ncurses' CPPFLAGS='-I#{CREW_PREFIX}/include/ncurses'" end diff --git a/packages/valgrind.rb b/packages/valgrind.rb index 3606b18dc..f94e53f1e 100644 --- a/packages/valgrind.rb +++ b/packages/valgrind.rb @@ -23,5 +23,5 @@ class Valgrind < Autotools when 'aarch64', 'armv7l' arch_flags_override end - configure_options (ARCH == 'x86_64' ? '--enable-only64bit' : '--enable-only32bit').to_s + autotools_configure_options (ARCH == 'x86_64' ? '--enable-only64bit' : '--enable-only32bit').to_s end diff --git a/packages/vapoursynth.rb b/packages/vapoursynth.rb index 4c015d13f..d822671b9 100644 --- a/packages/vapoursynth.rb +++ b/packages/vapoursynth.rb @@ -29,5 +29,5 @@ class Vapoursynth < Autotools depends_on 'tesseract' => :build depends_on 'zimg' # R - configure_options '--disable-static' + autotools_configure_options '--disable-static' end diff --git a/packages/vice.rb b/packages/vice.rb index 1dafedcfc..29a8855c6 100644 --- a/packages/vice.rb +++ b/packages/vice.rb @@ -31,7 +31,7 @@ class Vice < Autotools depends_on 'xdg_utils' # R depends_on 'zlib' # R - configure_options '--enable-gtk3ui \ + autotools_configure_options '--enable-gtk3ui \ --enable-desktop-files \ --with-flac \ --with-mpg123' diff --git a/packages/vim.rb b/packages/vim.rb index 652c61528..56c4b08db 100644 --- a/packages/vim.rb +++ b/packages/vim.rb @@ -39,7 +39,7 @@ class Vim < Autotools end end - configure_options "--localstatedir=#{CREW_PREFIX}/var/lib/vim \ + autotools_configure_options "--localstatedir=#{CREW_PREFIX}/var/lib/vim \ --with-features=huge \ --with-compiledby='Chromebrew' \ --enable-gpm \ diff --git a/packages/vim_runtime.rb b/packages/vim_runtime.rb index 2c2c69eb8..b0f8932e6 100644 --- a/packages/vim_runtime.rb +++ b/packages/vim_runtime.rb @@ -31,7 +31,7 @@ class Vim_runtime < Autotools end end - configure_options "--localstatedir=#{CREW_PREFIX}/var/lib/vim \ + autotools_configure_options "--localstatedir=#{CREW_PREFIX}/var/lib/vim \ --with-features=huge \ --with-compiledby='Chromebrew' \ --enable-gpm \ diff --git a/packages/vkd3d.rb b/packages/vkd3d.rb index a1aa62959..2ed0310ec 100644 --- a/packages/vkd3d.rb +++ b/packages/vkd3d.rb @@ -24,6 +24,6 @@ class Vkd3d < Autotools depends_on 'wine' => :build no_lto - configure_options '--with-xcb \ + autotools_configure_options '--with-xcb \ --with-spirv-tools' end diff --git a/packages/wcslib.rb b/packages/wcslib.rb index b3488068f..c9a341049 100644 --- a/packages/wcslib.rb +++ b/packages/wcslib.rb @@ -19,5 +19,5 @@ class Wcslib < Autotools depends_on 'gcc_lib' # R depends_on 'glibc' # R - pre_configure_options "LDFLAGS='-L#{CREW_LIB_PREFIX} #{CREW_ENV_OPTIONS_HASH['LDFLAGS']}'" + autotools_pre_configure_options "LDFLAGS='-L#{CREW_LIB_PREFIX} #{CREW_ENV_OPTIONS_HASH['LDFLAGS']}'" end diff --git a/packages/wget2.rb b/packages/wget2.rb index ddb05164d..503ac785a 100644 --- a/packages/wget2.rb +++ b/packages/wget2.rb @@ -34,7 +34,7 @@ class Wget2 < Autotools depends_on 'zlib' # R depends_on 'zstd' # R - configure_options '--enable-year2038 \ + autotools_configure_options '--enable-year2038 \ --with-openssl=no \ --with-ssl=gnutls \ --without-libidn \ diff --git a/packages/wxwidgets.rb b/packages/wxwidgets.rb index 74a73d23a..771d8de5a 100644 --- a/packages/wxwidgets.rb +++ b/packages/wxwidgets.rb @@ -67,7 +67,7 @@ class Wxwidgets < Autotools end end - configure_options '--with-gtk=3 \ + autotools_configure_options '--with-gtk=3 \ --with-opengl \ --enable-unicode \ --enable-graphics_ctx \ @@ -80,7 +80,7 @@ class Wxwidgets < Autotools --without-gnomevfs \ --disable-precomp-headers' - configure_install_extras do + autotools_install_extras do Dir.chdir "#{CREW_DEST_PREFIX}/bin" do FileUtils.ln_sf "#{CREW_LIB_PREFIX}/wx/config/gtk3-unicode-3.2", 'wx-config' end diff --git a/packages/wxwidgets30.rb b/packages/wxwidgets30.rb index 125e106b5..b556a6d9b 100644 --- a/packages/wxwidgets30.rb +++ b/packages/wxwidgets30.rb @@ -52,7 +52,7 @@ class Wxwidgets30 < Autotools end end - configure_options '--with-gtk=3 \ + autotools_configure_options '--with-gtk=3 \ --with-opengl \ --enable-unicode \ --enable-graphics_ctx \ @@ -66,7 +66,7 @@ class Wxwidgets30 < Autotools --disable-universal \ --disable-precomp-headers' - configure_install_extras do + autotools_install_extras do Dir.chdir "#{CREW_DEST_PREFIX}/bin" do FileUtils.ln_sf "#{CREW_LIB_PREFIX}/wx/config/gtk3-unicode-3.0", 'wx-config' end diff --git a/packages/wxwidgets31.rb b/packages/wxwidgets31.rb index f36595b1a..129fbcb57 100644 --- a/packages/wxwidgets31.rb +++ b/packages/wxwidgets31.rb @@ -66,7 +66,7 @@ class Wxwidgets31 < Autotools end end - configure_options '--with-gtk=3 \ + autotools_configure_options '--with-gtk=3 \ --with-opengl \ --enable-unicode \ --enable-graphics_ctx \ @@ -79,7 +79,7 @@ class Wxwidgets31 < Autotools --without-gnomevfs \ --disable-precomp-headers' - configure_install_extras do + autotools_install_extras do Dir.chdir "#{CREW_DEST_PREFIX}/bin" do FileUtils.ln_sf "#{CREW_LIB_PREFIX}/wx/config/gtk3-unicode-3.1", 'wx-config' end diff --git a/packages/xercesc.rb b/packages/xercesc.rb index 22b29e411..0c56ffbb1 100644 --- a/packages/xercesc.rb +++ b/packages/xercesc.rb @@ -37,5 +37,5 @@ class Xercesc < Autotools depends_on 'zlib' # R depends_on 'zstd' # R - configure_options '--disable-static' + autotools_configure_options '--disable-static' end diff --git a/packages/yelp.rb b/packages/yelp.rb index a510490c3..0c58758e8 100644 --- a/packages/yelp.rb +++ b/packages/yelp.rb @@ -44,6 +44,6 @@ class Yelp < Autotools gnome - configure_options '--enable-compile-warnings=minimum \ + autotools_configure_options '--enable-compile-warnings=minimum \ --enable-debug=no' end diff --git a/packages/zeromq.rb b/packages/zeromq.rb index ccbe3f9e0..bd7fa0b37 100644 --- a/packages/zeromq.rb +++ b/packages/zeromq.rb @@ -23,6 +23,6 @@ class Zeromq < Autotools # warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" # compilation error: file /tmp/xmlto-xsl.bNfymk line 4 element import - configure_options '--without-docs' + autotools_configure_options '--without-docs' run_tests end