Skip to content

Commit

Permalink
Merge pull request #421 from Dennisbonke/updates2
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennisbonke authored Dec 20, 2024
2 parents 147d817 + 994b719 commit 6c54592
Show file tree
Hide file tree
Showing 20 changed files with 499 additions and 785 deletions.
9 changes: 5 additions & 4 deletions bootstrap.d/app-text.y4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ packages:
categories: ['app-text']
source:
subdir: ports
url: 'https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.16.0/iso-codes-v4.16.0.tar.gz'
url: 'https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.17.0/iso-codes-v4.17.0.tar.gz'
format: 'tar.gz'
extract_path: 'iso-codes-v4.16.0'
checksum: blake2b:8fcdb3c12c502c1e14169765db9c9dd7778fc5d4bb0da37aa6b27efeebd5ce9f3e825e5b1a7ae8d659babf2d6b9124af08b40ed8a2a1235e88df50be9c204ca5
version: '4.16.0'
extract_path: 'iso-codes-v4.17.0'
checksum: blake2b:b788e7b9f48e76667e2a7e97367faf7f5229ce66ba1b2d4e458620af4cc189f026b76c580607f7d95b2adda319137964d6e95e683f9363f3825a71c8c6792db9
version: '4.17.0'
tools_required:
- system-gcc
pkgs_required:
- mlibc
revision: 1
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand Down
71 changes: 55 additions & 16 deletions bootstrap.d/dev-libs.y4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import:
- !managarm
---
sources:
- name: appstream
subdir: 'ports'
git: 'https://github.com/ximion/appstream.git'
tag: 'v1.0.4'
version: '1.0.4'

- name: glib
subdir: ports
git: 'https://gitlab.gnome.org/GNOME/glib.git'
Expand All @@ -18,8 +24,8 @@ sources:
- name: icu
subdir: 'ports'
git: 'https://github.com/unicode-org/icu.git'
tag: 'release-73-2'
version: '73.2'
tag: 'release-76-1'
version: '76.1'
tools_required:
- host-autoconf-v2.69
- host-automake-v1.15
Expand Down Expand Up @@ -82,6 +88,43 @@ sources:


tools:
- name: host-appstream
architecture: noarch
from_source: appstream
exports_aclocal: true
exports_shared_libs: true
tools_required:
- host-pkg-config
- virtual: pkgconfig-for-host
program_name: host-pkg-config
revision: 1
configure:
- args:
- 'meson'
- 'setup'
- '--native-file'
- '@SOURCE_ROOT@/scripts/meson.native-file'
- '--prefix=@PREFIX@'
- '-Dapidocs=false'
- '-Ddocs=false'
- '-Dcompose=false'
- '-Dmaintainer=false'
- '-Dstatic-analysis=false'
- '-Dstemming=false'
- '-Dvapi=false'
- '-Dapt-support=false'
- '-Dinstall-docs=false'
- '-Dgir=false'
- '-Dqt=false'
- '-Dsystemd=false'
- '-Ddocs=false'
- '@THIS_SOURCE_DIR@'
isolate_network: false
compile:
- args: ['ninja']
install:
- args: ['ninja', 'install']

- name: host-glib
labels: [aarch64, riscv64]
architecture: noarch
Expand Down Expand Up @@ -167,21 +210,17 @@ tools:
packages:
- name: appstream
architecture: '@OPTION:arch@'
stability_level: 'broken' # networking issues
metadata:
summary: Cross-distro effort for providing metadata for software in the Linux ecosystem
description: This package provides a library and tool that is useful for retrieving software metadata and making it easily accessible to programs which need it.
spdx: 'LGPL-2.1-or-later GPL-2.0-or-later'
website: 'https://www.freedesktop.org/wiki/Distributions/AppStream/'
maintainer: "Dennis Bonke <[email protected]>"
categories: ['dev-libs']
source:
subdir: 'ports'
git: 'https://github.com/ximion/appstream.git'
tag: 'v0.16.4'
version: '0.16.4'
from_source: 'appstream'
tools_required:
- system-gcc
- host-appstream
- virtual: pkgconfig-for-target
triple: "@OPTION:arch-triple@"
pkgs_required:
Expand Down Expand Up @@ -596,7 +635,7 @@ packages:
- host-icu
pkgs_required:
- mlibc
revision: 6
revision: 1
configure:
- args: ['cp',
'@THIS_SOURCE_DIR@/icu4c/source/config/mh-linux',
Expand Down Expand Up @@ -1174,8 +1213,8 @@ packages:
source:
subdir: 'ports'
git: 'https://github.com/thom311/libnl.git'
tag: 'libnl3_9_0'
version: '3.9.0'
tag: 'libnl3_11_0'
version: '3.11.0'
tools_required:
- host-autoconf-v2.69
- host-automake-v1.15
Expand Down Expand Up @@ -1968,7 +2007,7 @@ packages:
pkgs_required:
- mlibc
- zlib
revision: 7
revision: 8
configure:
- args:
- '@THIS_SOURCE_DIR@/Configure'
Expand Down Expand Up @@ -2051,8 +2090,8 @@ packages:
source:
subdir: ports
git: 'https://github.com/PhilipHazel/pcre2.git'
tag: 'pcre2-10.42'
version: '10.42'
tag: 'pcre2-10.44'
version: '10.44'
tools_required:
- host-autoconf-v2.69
- host-automake-v1.15
Expand All @@ -2068,14 +2107,14 @@ packages:
- ncurses
- readline
- zlib
revision: 5
revision: 1
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
- '--host=@OPTION:arch-triple@'
- '--prefix=/usr'
- '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
- '--docdir=/usr/share/doc/pcre2-10.42'
- '--docdir=/usr/share/doc/pcre2-10.44'
- '--enable-unicode'
- '--enable-jit'
- '--enable-pcre2-16'
Expand Down
65 changes: 33 additions & 32 deletions bootstrap.d/dev-qt.y4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@ sources:
subdir: 'ports'
# This may seem strange, but is actually correct
git: 'https://code.qt.io/qt/qt5.git'
tag: 'v6.6.2'
version: '6.6.2'
tag: 'v6.8.1'
version: '6.8.1'
regenerate:
# Get the submodules that we'll need as a host tool
- args: ['git', 'remote', 'set-url', 'origin', 'https://code.qt.io/qt/qt5.git']
- args: ['./init-repository', '-f', '--module-subset', 'qtbase,qtsvg,qtimageformats,qtshadertools,qtlanguageserver,qtdeclarative,qtwayland,qtmultimedia,qttools,qt5compat,qtsensors,qtcharts,qtpositioning,qtspeech']
isolate_network: false
- args: |
cd @THIS_SOURCE_DIR@/qtbase
git pull origin 6.6.2
git pull origin 6.8.1
isolate_network: false
tools:
# We do a limited superbuild with only the needed modules of Qt6 to satisfy host tooling.
- name: host-qt6
architecture: noarch
from_source: qt6
revision: 2
revision: 1
tools_required:
- host-cmake
- wayland-scanner
Expand Down Expand Up @@ -55,8 +56,8 @@ packages:
source:
subdir: 'ports'
git: 'http://code.qt.io/qt/qt5compat.git'
tag: 'v6.6.2'
version: '6.6.2'
tag: 'v6.8.1'
version: '6.8.1'
tools_required:
- system-gcc
- host-cmake
Expand All @@ -67,7 +68,7 @@ packages:
- qtdeclarative6
- qtshadertools6
- icu
revision: 2
revision: 1
configure:
- args:
- 'cmake'
Expand Down Expand Up @@ -95,8 +96,8 @@ packages:
source:
subdir: 'ports'
git: 'https://code.qt.io/qt/qtbase.git'
tag: 'v6.6.2'
version: '6.6.2'
tag: 'v6.8.1'
version: '6.8.1'
tools_required:
- system-gcc
- host-cmake
Expand Down Expand Up @@ -144,7 +145,7 @@ packages:
- brotli
- dbus
- at-spi2-core
revision: 3
revision: 1
configure:
- args:
- 'cmake'
Expand Down Expand Up @@ -226,8 +227,8 @@ packages:
source:
subdir: 'ports'
git: 'https://code.qt.io/qt/qtdeclarative.git'
tag: 'v6.6.2'
version: '6.6.2'
tag: 'v6.8.1'
version: '6.8.1'
tools_required:
- system-gcc
- host-cmake
Expand All @@ -241,7 +242,7 @@ packages:
- qtsvg6
- libxkbcommon
- mesa
revision: 2
revision: 1
configure:
- args:
- 'cmake'
Expand Down Expand Up @@ -269,8 +270,8 @@ packages:
source:
subdir: 'ports'
git: 'https://code.qt.io/qt/qtimageformats.git'
tag: 'v6.6.2'
version: '6.6.2'
tag: 'v6.8.1'
version: '6.8.1'
tools_required:
- system-gcc
- host-cmake
Expand All @@ -283,7 +284,7 @@ packages:
- libwebp
- libtiff
- zlib
revision: 2
revision: 1
configure:
- args:
- 'cmake'
Expand Down Expand Up @@ -313,16 +314,16 @@ packages:
source:
subdir: 'ports'
git: 'https://code.qt.io/qt/qtlanguageserver.git'
tag: 'v6.6.2'
version: '6.6.2'
tag: 'v6.8.1'
version: '6.8.1'
tools_required:
- system-gcc
- host-cmake
- host-qt6
pkgs_required:
- mlibc
- qtbase6
revision: 2
revision: 1
configure:
- args:
- 'cmake'
Expand Down Expand Up @@ -350,8 +351,8 @@ packages:
source:
subdir: 'ports'
git: 'https://code.qt.io/qt/qtmultimedia.git'
tag: 'v6.6.2'
version: '6.6.2'
tag: 'v6.8.1'
version: '6.8.1'
tools_required:
- system-gcc
- host-cmake
Expand All @@ -363,8 +364,8 @@ packages:
- qtshadertools6
- libglvnd
- gstreamer
- gst-plugins-base
revision: 2
- gst-plugins-bad
revision: 1
configure:
- args:
- 'cmake'
Expand Down Expand Up @@ -433,8 +434,8 @@ packages:
source:
subdir: 'ports'
git: 'https://code.qt.io/qt/qtshadertools.git'
tag: 'v6.6.2'
version: '6.6.2'
tag: 'v6.8.1'
version: '6.8.1'
tools_required:
- system-gcc
- host-cmake
Expand All @@ -444,7 +445,7 @@ packages:
- qtbase6
- mesa
- libxkbcommon
revision: 2
revision: 1
configure:
- args:
- 'cmake'
Expand Down Expand Up @@ -512,8 +513,8 @@ packages:
source:
subdir: 'ports'
git: 'https://code.qt.io/qt/qtsvg.git'
tag: 'v6.6.2'
version: '6.6.2'
tag: 'v6.8.1'
version: '6.8.1'
tools_required:
- system-gcc
- host-cmake
Expand All @@ -522,7 +523,7 @@ packages:
- mlibc
- qtbase6
- zlib
revision: 2
revision: 1
configure:
- args:
- 'cmake'
Expand All @@ -548,8 +549,8 @@ packages:
source:
subdir: 'ports'
git: 'http://code.qt.io/qt/qtwayland.git'
tag: 'v6.6.2'
version: '6.6.2'
tag: 'v6.8.1'
version: '6.8.1'
tools_required:
- system-gcc
- host-cmake
Expand All @@ -561,7 +562,7 @@ packages:
- mesa
- wayland
- libxkbcommon
revision: 2
revision: 1
configure:
- args:
- 'cmake'
Expand Down
Loading

0 comments on commit 6c54592

Please sign in to comment.