Skip to content

Commit 6b2f4e7

Browse files
Andy-Python-ProgrammerAndy-Python-Programmer
committed
update
Signed-off-by: Anhad Singh <[email protected]>
1 parent deb049b commit 6b2f4e7

File tree

21 files changed

+783
-626
lines changed

21 files changed

+783
-626
lines changed

‎bootstrap.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ sources:
125125
- name: rust-nix
126126
subdir: 'bundled'
127127
git: 'https://github.com/nix-rust/nix.git'
128-
tag: 'v0.24.3'
129-
version: '0.24.3'
128+
tag: 'v0.22.3'
129+
version: '0.22.3'
130130

131131
- name: rust-mio-0.6
132132
subdir: 'bundled'
@@ -150,8 +150,8 @@ sources:
150150
- name: rust-libloading
151151
subdir: 'bundled'
152152
git: 'https://github.com/nagisa/rust_libloading.git'
153-
tag: '0.8.1'
154-
version: '0.8.1'
153+
tag: '0.7.3'
154+
version: '0.7.3'
155155

156156
- name: rust-getrandom
157157
subdir: 'bundled'
@@ -966,7 +966,7 @@ packages:
966966
- '--libdir=lib'
967967
- '-Dmlibc_no_headers=true'
968968
- '-Ddisable_iconv_option=true'
969-
- '--buildtype=release'
969+
- '--buildtype=debug'
970970
- '-Dlinux_kernel_headers=@BUILD_ROOT@/packages/linux-headers/usr/include'
971971
- '@THIS_SOURCE_DIR@'
972972
build:
@@ -2202,6 +2202,10 @@ packages:
22022202
- '-Dxattr=false'
22032203
- '@THIS_SOURCE_DIR@'
22042204
environ:
2205+
# The warning is false positive and the more recent versions of GCC. Workaround and disable the warning.
2206+
#
2207+
# Bug 1744: https://gitlab.gnome.org/GNOME/glib/-/issues/1744
2208+
CFLAGS: '-Wno-error=format-nonliteral'
22052209
PKG_CONFIG_SYSROOT_DIR: '@BUILD_ROOT@/system-root'
22062210
PKG_CONFIG_LIBDIR: '@BUILD_ROOT@/system-root/usr/lib/pkgconfig:@BUILD_ROOT@/system-root/usr/share/pkgconfig'
22072211
build:

‎bootstrap/vcs.yml

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,49 @@ packages:
33
#
44
# Git is one of the most used version control systems designed to
55
# handle large projects efficiently.
6-
- name: git
7-
source:
8-
subdir: 'bundled'
9-
git: 'https://github.com/git/git.git'
10-
tag: 'v2.32.0'
11-
version: '2.32.0'
12-
tools_required:
13-
- host-autoconf-v2.69
14-
- host-automake-v1.16
15-
- host-libtool
16-
regenerate:
17-
- args: ['autoreconf']
18-
tools_required:
19-
- host-pkg-config
20-
- host-gcc
21-
- virtual: pkgconfig-for-target
22-
triple: "x86_64-aero"
23-
pkgs_required:
24-
- mlibc
25-
- python
26-
- libexpat
27-
- zlib
28-
- openssl
29-
- curl
30-
- libiconv
31-
- pcre
32-
configure:
33-
- args: ['cp', '-r', '@THIS_SOURCE_DIR@/.', '@THIS_BUILD_DIR@']
34-
- args:
35-
- './configure'
36-
- '--host=x86_64-aero'
37-
- '--prefix=/usr'
38-
- '--with-python=python3'
39-
- '--with-gitconfig=/etc/gitconfig'
40-
- '--with-curl=@SYSROOT_DIR@/usr'
41-
- '--without-iconv'
42-
- '--with-libpcre'
43-
- 'ac_cv_fread_reads_directories=1'
44-
- 'ac_cv_snprintf_returns_bogus=1'
45-
environ:
46-
CURL_CONFIG: '@SYSROOT_DIR@/usr/bin/curl-config'
47-
build:
48-
- args: ['make', 'NO_GETTEXT=YesPlease', '-j@PARALLELISM@']
49-
- args: ['make', 'NO_GETTEXT=YesPlease', 'install']
50-
environ:
51-
DESTDIR: '@THIS_COLLECT_DIR@'
6+
# - name: git
7+
# source:
8+
# subdir: 'bundled'
9+
# git: 'https://github.com/git/git.git'
10+
# tag: 'v2.32.0'
11+
# version: '2.32.0'
12+
# tools_required:
13+
# - host-autoconf-v2.69
14+
# - host-automake-v1.16
15+
# - host-libtool
16+
# regenerate:
17+
# - args: ['autoreconf']
18+
# tools_required:
19+
# - host-pkg-config
20+
# - host-gcc
21+
# - virtual: pkgconfig-for-target
22+
# triple: "x86_64-aero"
23+
# pkgs_required:
24+
# - mlibc
25+
# - python
26+
# - libexpat
27+
# - zlib
28+
# - openssl
29+
# - curl
30+
# - libiconv
31+
# - pcre
32+
# configure:
33+
# - args: ['cp', '-r', '@THIS_SOURCE_DIR@/.', '@THIS_BUILD_DIR@']
34+
# - args:
35+
# - './configure'
36+
# - '--host=x86_64-aero'
37+
# - '--prefix=/usr'
38+
# - '--with-python=python3'
39+
# - '--with-gitconfig=/etc/gitconfig'
40+
# - '--with-curl=@SYSROOT_DIR@/usr'
41+
# - '--without-iconv'
42+
# - '--with-libpcre'
43+
# - 'ac_cv_fread_reads_directories=1'
44+
# - 'ac_cv_snprintf_returns_bogus=1'
45+
# environ:
46+
# CURL_CONFIG: '@SYSROOT_DIR@/usr/bin/curl-config'
47+
# build:
48+
# - args: ['make', 'NO_GETTEXT=YesPlease', '-j@PARALLELISM@']
49+
# - args: ['make', 'NO_GETTEXT=YesPlease', 'install']
50+
# environ:
51+
# DESTDIR: '@THIS_COLLECT_DIR@'

‎bootstrap/xorg.yml

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ packages:
237237
- mlibc
238238
- xorg-util-macros
239239
- xorg-proto
240+
- libxcb-util
240241
configure:
241242
- args:
242243
- '@THIS_SOURCE_DIR@/configure'
@@ -564,44 +565,44 @@ packages:
564565
environ:
565566
DESTDIR: '@THIS_COLLECT_DIR@'
566567

567-
- name: mesa-demos
568-
source:
569-
subdir: 'bundled'
570-
git: 'https://gitlab.freedesktop.org/mesa/demos.git/'
571-
branch: 'master'
572-
tools_required:
573-
- host-autoconf-v2.69
574-
- host-automake-v1.16
575-
- host-libtool
576-
- host-pkg-config
577-
- host-xorg-macros
578-
regenerate:
579-
- args: ['./autogen.sh']
580-
environ:
581-
'NOCONFIGURE': 'yes'
582-
tools_required:
583-
- host-gcc
584-
pkgs_required:
585-
- mlibc
586-
- mesa
587-
configure:
588-
- args:
589-
- '@THIS_SOURCE_DIR@/configure'
590-
- '--host=x86_64-aero'
591-
- '--prefix=/usr'
592-
- '--sysconfdir=/etc'
593-
- '--localstatedir=/var'
594-
- '--disable-static'
595-
- '--disable-gles1' # Requires some linux header that we don't have
596-
- '--disable-vg'
597-
- '--disable-osmesa'
598-
- '--disable-rbug'
599-
- '--with-system-data-files'
600-
build:
601-
- args: ['make', '-j@PARALLELISM@']
602-
- args: ['make', 'install']
603-
environ:
604-
DESTDIR: '@THIS_COLLECT_DIR@'
568+
# - name: mesa-demos
569+
# source:
570+
# subdir: 'bundled'
571+
# git: 'https://gitlab.freedesktop.org/mesa/demos.git/'
572+
# branch: 'master'
573+
# tools_required:
574+
# - host-autoconf-v2.69
575+
# - host-automake-v1.16
576+
# - host-libtool
577+
# - host-pkg-config
578+
# - host-xorg-macros
579+
# regenerate:
580+
# - args: ['./autogen.sh']
581+
# environ:
582+
# 'NOCONFIGURE': 'yes'
583+
# tools_required:
584+
# - host-gcc
585+
# pkgs_required:
586+
# - mlibc
587+
# - mesa
588+
# configure:
589+
# - args:
590+
# - '@THIS_SOURCE_DIR@/configure'
591+
# - '--host=x86_64-aero'
592+
# - '--prefix=/usr'
593+
# - '--sysconfdir=/etc'
594+
# - '--localstatedir=/var'
595+
# - '--disable-static'
596+
# - '--disable-gles1' # Requires some linux header that we don't have
597+
# - '--disable-vg'
598+
# - '--disable-osmesa'
599+
# - '--disable-rbug'
600+
# - '--with-system-data-files'
601+
# build:
602+
# - args: ['make', '-j@PARALLELISM@']
603+
# - args: ['make', 'install']
604+
# environ:
605+
# DESTDIR: '@THIS_COLLECT_DIR@'
605606

606607
- name: mesa
607608
source:
@@ -868,8 +869,8 @@ packages:
868869
source:
869870
subdir: 'bundled'
870871
git: 'https://gitlab.freedesktop.org/pixman/pixman.git'
871-
tag: 'pixman-0.40.0'
872-
version: '0.40.0'
872+
tag: 'pixman-0.42.2'
873+
version: '0.42.2'
873874
tools_required:
874875
- host-autoconf-v2.69
875876
- host-automake-v1.16
@@ -2202,8 +2203,8 @@ packages:
22022203
source:
22032204
subdir: 'bundled'
22042205
git: 'https://gitlab.gnome.org/GNOME/pango.git'
2205-
tag: '1.50.11'
2206-
version: '1.50.11'
2206+
tag: '1.50.14'
2207+
version: '1.50.14'
22072208
tools_required:
22082209
- host-pkg-config
22092210
- host-gcc
@@ -2223,8 +2224,12 @@ packages:
22232224
- libxext
22242225
- harfbuzz
22252226
- libxft
2226-
revision: 2
2227+
revision: 3
22272228
configure:
2229+
# False positive with GCC 13 and -O3, see bug #903259
2230+
#
2231+
# https://gitlab.gnome.org/GNOME/pango/-/issues/740
2232+
- args: ['sed', '-i', '-e', '/\-Werror=array-bounds/d', '@THIS_SOURCE_DIR@/meson.build']
22282233
- args:
22292234
- 'meson'
22302235
- '--cross-file'

‎patched.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
bootstrap-host-gcc
2+
llvm
3+
rust-libc
4+
webkitgtk
5+
pixman

‎patches/glib/glib.patch renamed to ‎patches/glib/0001-glib.patch

File renamed without changes.

‎patches/glib/0002-Patch-out-assert-in-g_io_unix_get_flags.patch

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From fe2c4357d753d3a5baed7e2354f3542a1e87b46d Mon Sep 17 00:00:00 2001
2+
From: Dennis Bonke <[email protected]>
3+
Date: Wed, 12 Oct 2022 02:54:15 +0200
4+
Subject: [PATCH 2/2] Patch out assert in g_io_unix_get_flags
5+
6+
We don't implement the neccesary bits to fully support this, so in case of doubt, return readable and writeable.
7+
8+
Signed-off-by: Dennis Bonke <[email protected]>
9+
---
10+
glib/giounix.c | 5 ++++-
11+
1 file changed, 4 insertions(+), 1 deletion(-)
12+
13+
diff --git a/glib/giounix.c b/glib/giounix.c
14+
index ad3aba2..e0237fc 100644
15+
--- a/glib/giounix.c
16+
+++ b/glib/giounix.c
17+
@@ -436,7 +436,10 @@ g_io_unix_get_flags (GIOChannel *channel)
18+
channel->is_writeable = TRUE;
19+
break;
20+
default:
21+
- g_assert_not_reached ();
22+
+ channel->is_readable = TRUE;
23+
+ channel->is_writeable = TRUE;
24+
+ break;
25+
+ //g_assert_not_reached ();
26+
}
27+
28+
return flags;
29+
--
30+
2.37.2

0 commit comments

Comments
 (0)