From b095892204068957dc2850bbaba12e2c689189ca Mon Sep 17 00:00:00 2001 From: Zeckmathederg Date: Sat, 19 Oct 2024 15:42:14 -0600 Subject: [PATCH] I hate GI... Added, begrudgingly. --- introduction/welcome/changelog.xml | 3 + kernel-config/kernel.version | 2 +- .../basicx/other => security}/elogind.toml | 0 .../basicx/other => security}/linux-pam.toml | 0 packages.ent | 1 + shareddeps/audio/pulseaudio.xml | 7 +- shareddeps/checkpoint/whatnow.xml | 20 +++- shareddeps/dps/basicx/other/harfbuzz.xml | 61 +--------- shareddeps/sdintro.xml | 23 ++-- .../other => security}/desktop-file-utils.xml | 6 +- .../basicx/other => security}/duktape.xml | 2 +- shareddeps/security/elogind-kernel.xml | 10 ++ .../basicx/other => security}/elogind.xml | 2 +- .../{dps/basicx/other => security}/glib2.xml | 104 ++++++++++++++---- .../{dps/basicx/other => security}/icu.xml | 2 +- .../basicx/other => security}/libxml2.xml | 8 +- .../other => security}/linux-pam-kernel.xml | 0 .../basicx/other => security}/linux-pam.xml | 2 +- .../{dps/basicx/other => security}/polkit.xml | 7 +- shareddeps/security/secdummy.xml | 11 ++ .../{dps/basicx/other => security}/shadow.xml | 2 +- .../other => security}/shared-mime-info.xml | 6 +- 22 files changed, 163 insertions(+), 116 deletions(-) rename kernel-config/shareddeps/{dps/basicx/other => security}/elogind.toml (100%) rename kernel-config/shareddeps/{dps/basicx/other => security}/linux-pam.toml (100%) rename shareddeps/{dps/basicx/other => security}/desktop-file-utils.xml (98%) rename shareddeps/{dps/basicx/other => security}/duktape.xml (97%) create mode 100644 shareddeps/security/elogind-kernel.xml rename shareddeps/{dps/basicx/other => security}/elogind.xml (99%) rename shareddeps/{dps/basicx/other => security}/glib2.xml (89%) rename shareddeps/{dps/basicx/other => security}/icu.xml (99%) rename shareddeps/{dps/basicx/other => security}/libxml2.xml (98%) rename shareddeps/{dps/basicx/other => security}/linux-pam-kernel.xml (100%) rename shareddeps/{dps/basicx/other => security}/linux-pam.xml (99%) rename shareddeps/{dps/basicx/other => security}/polkit.xml (97%) create mode 100644 shareddeps/security/secdummy.xml rename shareddeps/{dps/basicx/other => security}/shadow.xml (99%) rename shareddeps/{dps/basicx/other => security}/shared-mime-info.xml (97%) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index a2029e3d89..a30f056cf9 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,9 @@ October 19th, 2024 + + [Zeckmathederg] - I hate GI... Added, begrudgingly. + [Zeckmathederg] - Mesa: Fixed a command typo. diff --git a/kernel-config/kernel.version b/kernel-config/kernel.version index fac714a322..7fcfe2dcd6 100644 --- a/kernel-config/kernel.version +++ b/kernel-config/kernel.version @@ -1 +1 @@ -6.11.1 +6.11.3 diff --git a/kernel-config/shareddeps/dps/basicx/other/elogind.toml b/kernel-config/shareddeps/security/elogind.toml similarity index 100% rename from kernel-config/shareddeps/dps/basicx/other/elogind.toml rename to kernel-config/shareddeps/security/elogind.toml diff --git a/kernel-config/shareddeps/dps/basicx/other/linux-pam.toml b/kernel-config/shareddeps/security/linux-pam.toml similarity index 100% rename from kernel-config/shareddeps/dps/basicx/other/linux-pam.toml rename to kernel-config/shareddeps/security/linux-pam.toml diff --git a/packages.ent b/packages.ent index 48d588a343..12b302c59c 100644 --- a/packages.ent +++ b/packages.ent @@ -109,6 +109,7 @@ + diff --git a/shareddeps/audio/pulseaudio.xml b/shareddeps/audio/pulseaudio.xml index 646121077b..e3b84bfdb5 100644 --- a/shareddeps/audio/pulseaudio.xml +++ b/shareddeps/audio/pulseaudio.xml @@ -50,7 +50,7 @@ Required - + and (for lib32) Recommended @@ -180,9 +180,8 @@ ldconfig commands: -CC="gcc -m32" CXX="g++ -m32" \ -PKG_CONFIG_PATH=/usr/lib32/pkgconfig \ -meson setup --prefix=/usr \ +meson setup --cross-file lib32 \ + --prefix=/usr \ --libdir=/usr/lib32 \ --buildtype=release \ -D database=gdbm \ diff --git a/shareddeps/checkpoint/whatnow.xml b/shareddeps/checkpoint/whatnow.xml index c87d065447..71cd8acff0 100644 --- a/shareddeps/checkpoint/whatnow.xml +++ b/shareddeps/checkpoint/whatnow.xml @@ -60,7 +60,7 @@ command as the root user: - nvidia-xconfig + nvidia-xconfig @@ -85,9 +85,21 @@ If you have an integrated graphics card (being either AMD or Intel) and - a discrete graphics card (being NVIDIA), check the Arch Wiki page on - NVIDIA - OPTIMUS. Please install the drivers for both cards. + a discrete graphics card (being NVIDIA), run the following as the + &root; user: + + + nvidia-xconfig --prime + + + It will then say you will have to run a few commands. While in a TTY, + put those commands into your ~/.xinitrc file, or + else when you start Xorg you will be greeted + with a black screen. You can also put the commands in a different + script, use the keybind to open a terminal, execute the script while + blind, and the graphics should appear like normal. Running the commands + in a TTY will complain that it is unable to find any screens. Make sure + sure you have installed drivers for both your iGPU and dGPU. diff --git a/shareddeps/dps/basicx/other/harfbuzz.xml b/shareddeps/dps/basicx/other/harfbuzz.xml index 3d889ab756..b33f7163a5 100644 --- a/shareddeps/dps/basicx/other/harfbuzz.xml +++ b/shareddeps/dps/basicx/other/harfbuzz.xml @@ -27,8 +27,6 @@ shaping engine. - - @@ -41,69 +39,23 @@ - - Installation of HarfBuzz - - - While Glib support - can be compiled for this package, GLFS does not have instructions for - it. If you have already installed Glib and did not install the 32-bit - version, then you will need to move the pkgconfig file out of the way. - This is because pkgconf will report that glib-2.0 - is installed despite the fact that the 32-bit version is not installed, - leading to a linker error as a 64-bit library cannot be linked against - a 32-bit application. If this applies to you, - as the root user: - -mv /usr/lib/pkgconfig/glib-2.0.pc \ - /usr/lib/pkgconfig/NOUSE.glib-2.0.pc - - After you are done installing this package, you may move it back. - Doing all of this is not recommended. Please read up on - for more information. - - - - - - If you want to build Pango, HarfBuzz must be built with Glib support. - Instructions for doing so may be found on - BLFS's HarfBuzz page. - - - Install HarfBuzz by running the following commands: @@ -145,13 +97,12 @@ ninja commands: -CC="gcc -m32" CXX="g++ -m32" \ -PKG_CONFIG_PATH=/usr/lib32/pkgconfig \ -meson setup .. \ +meson setup .. \ + --cross-file lib32 \ --prefix=/usr \ --libdir=/usr/lib32 \ --buildtype=release \ - -D graphite2=disabled + -D graphite2=disabled && ninja diff --git a/shareddeps/sdintro.xml b/shareddeps/sdintro.xml index da8a460453..1d1f871063 100644 --- a/shareddeps/sdintro.xml +++ b/shareddeps/sdintro.xml @@ -14,6 +14,19 @@ This chapter covers dependencies that both Steam and Wine depend on. + + + + + + + + + + + + + @@ -68,16 +81,6 @@ - - - - - - - - - - diff --git a/shareddeps/dps/basicx/other/desktop-file-utils.xml b/shareddeps/security/desktop-file-utils.xml similarity index 98% rename from shareddeps/dps/basicx/other/desktop-file-utils.xml rename to shareddeps/security/desktop-file-utils.xml index ab3e72a0cf..560e26f285 100644 --- a/shareddeps/dps/basicx/other/desktop-file-utils.xml +++ b/shareddeps/security/desktop-file-utils.xml @@ -1,7 +1,7 @@ + %general-entities; - - Package Information @@ -98,7 +96,7 @@ ninja Command Explanations + href="../../xincludes/meson-buildtype-release.xml"/> diff --git a/shareddeps/dps/basicx/other/duktape.xml b/shareddeps/security/duktape.xml similarity index 97% rename from shareddeps/dps/basicx/other/duktape.xml rename to shareddeps/security/duktape.xml index 7fc473e665..c99057d686 100644 --- a/shareddeps/dps/basicx/other/duktape.xml +++ b/shareddeps/security/duktape.xml @@ -1,7 +1,7 @@ + %general-entities; diff --git a/shareddeps/security/elogind-kernel.xml b/shareddeps/security/elogind-kernel.xml new file mode 100644 index 0000000000..7b259e491d --- /dev/null +++ b/shareddeps/security/elogind-kernel.xml @@ -0,0 +1,10 @@ + + + +File systems ---> + [*] Inotify support for userspace [INOTIFY_USER] + Pseudo filesystems ---> + [*] Tmpfs virtual memory file system support (former shm fs) [TMPFS] + [*] Tmpfs POSIX Access Control Lists [TMPFS_POSIX_ACL] diff --git a/shareddeps/dps/basicx/other/elogind.xml b/shareddeps/security/elogind.xml similarity index 99% rename from shareddeps/dps/basicx/other/elogind.xml rename to shareddeps/security/elogind.xml index bd6e03da51..25c924f5cc 100644 --- a/shareddeps/dps/basicx/other/elogind.xml +++ b/shareddeps/security/elogind.xml @@ -1,7 +1,7 @@ + %general-entities; diff --git a/shareddeps/dps/basicx/other/glib2.xml b/shareddeps/security/glib2.xml similarity index 89% rename from shareddeps/dps/basicx/other/glib2.xml rename to shareddeps/security/glib2.xml index b2f5785a7d..3239108b6d 100644 --- a/shareddeps/dps/basicx/other/glib2.xml +++ b/shareddeps/security/glib2.xml @@ -1,7 +1,7 @@ + %general-entities; @@ -28,8 +28,6 @@ event loop, threads, dynamic loading and an object system. - - Package Information @@ -44,6 +42,18 @@ + + GObject Introspection (Recommended) + + + + + Download: + + + + + Patch for Log Level Selection (Optional) @@ -57,12 +67,11 @@ GLib Dependencies - Additional Runtime Dependencies @@ -75,16 +84,6 @@ Installation of GLib - - - This installation disables building GObject Introspection support. - After you are done with GLFS, follow the installation instructions of - GLib and - Polkit in the - development version of BLFS to enable that support. - - - If desired, apply the optional patch. In many cases, applications that use this library, either directly or indirectly via other libraries. @@ -138,27 +137,92 @@ meson setup .. \ -D glib_debug=disabled \ -D man-pages=disabled \ -D sysprof=disabled && + ninja As the root user, - install this package: + install this package for the first time to allow building GObject + Introspection: ninja install - You should now install and - . + Build GObject Introspection: +tar xf ../../gobject-introspection-1.82.0.tar.xz && + +meson setup gobject-introspection-1.82.0 gi-build \ + --prefix=/usr --buildtype=release && +ninja -C gi-build + + + As the &root; user, install GObject Introspection for generating the + introspection data of GLib libraries (required by various packages using + Glib, especially some GNOME packages): + + +ninja -C gi-build install + + + Now generate the introspection data: + + +meson configure -D introspection=enabled && +ninja + + + As the &root; user, install this package again for the introspection + data: + + +ninja install + + + + + 32-bit Installation of GLib + + + First clean the build directory: + + + rm -rf * + + + Now install GLib by running the following commands: + + +meson setup .. \ + --cross-file lib32 \ + --prefix=/usr \ + --libdir=/usr/lib32 \ + --buildtype=release \ + -D introspection=disabled \ + -D glib_debug=disabled \ + -D man-pages=disabled \ + -D sysprof=disabled && + +ninja + + + Now, as the &root; user: + + +DESTDIR=$PWD/DESTDIR ninja install && +cp -vR DESTDIR/usr/lib32/* /usr/lib32 && +rm -rf DESTDIR && +ldconfig + Command Explanations + href="../../xincludes/meson-buildtype-release.xml"/> -D man-pages=disabled: This switch causes the diff --git a/shareddeps/dps/basicx/other/icu.xml b/shareddeps/security/icu.xml similarity index 99% rename from shareddeps/dps/basicx/other/icu.xml rename to shareddeps/security/icu.xml index 3f9e5f0543..f06002532e 100644 --- a/shareddeps/dps/basicx/other/icu.xml +++ b/shareddeps/security/icu.xml @@ -1,7 +1,7 @@ + %general-entities; + %general-entities; @@ -26,9 +26,7 @@ The libxml2 package contains libraries and utilities used for parsing XML files. - - - + @@ -128,7 +126,7 @@ ldconfig Command Explanations + href="../../xincludes/static-libraries.xml"/> --with-history: This switch enables diff --git a/shareddeps/dps/basicx/other/linux-pam-kernel.xml b/shareddeps/security/linux-pam-kernel.xml similarity index 100% rename from shareddeps/dps/basicx/other/linux-pam-kernel.xml rename to shareddeps/security/linux-pam-kernel.xml diff --git a/shareddeps/dps/basicx/other/linux-pam.xml b/shareddeps/security/linux-pam.xml similarity index 99% rename from shareddeps/dps/basicx/other/linux-pam.xml rename to shareddeps/security/linux-pam.xml index e3d838edcf..51c63a42ca 100644 --- a/shareddeps/dps/basicx/other/linux-pam.xml +++ b/shareddeps/security/linux-pam.xml @@ -1,7 +1,7 @@ + %general-entities; diff --git a/shareddeps/dps/basicx/other/polkit.xml b/shareddeps/security/polkit.xml similarity index 97% rename from shareddeps/dps/basicx/other/polkit.xml rename to shareddeps/security/polkit.xml index f87e789e01..748658e238 100644 --- a/shareddeps/dps/basicx/other/polkit.xml +++ b/shareddeps/security/polkit.xml @@ -1,7 +1,7 @@ + %general-entities; @@ -127,7 +127,6 @@ meson setup .. \ --buildtype=release \ -D man=false \ -D session_tracking=elogind \ - -D introspection=false \ -D tests=false @@ -148,7 +147,7 @@ meson setup .. \ Command Explanations + href="../../xincludes/meson-buildtype-release.xml"/> : Use this switch if you did not create @@ -166,7 +165,7 @@ meson setup .. \ : This option disables GObject - Introspection support as it was not enabled in . + Introspection support if you are sure you don't need it. diff --git a/shareddeps/security/secdummy.xml b/shareddeps/security/secdummy.xml new file mode 100644 index 0000000000..abadb15213 --- /dev/null +++ b/shareddeps/security/secdummy.xml @@ -0,0 +1,11 @@ + + + + + + + Security + + + diff --git a/shareddeps/dps/basicx/other/shadow.xml b/shareddeps/security/shadow.xml similarity index 99% rename from shareddeps/dps/basicx/other/shadow.xml rename to shareddeps/security/shadow.xml index e2c54cf35a..16d1a69070 100644 --- a/shareddeps/dps/basicx/other/shadow.xml +++ b/shareddeps/security/shadow.xml @@ -1,7 +1,7 @@ + %general-entities; diff --git a/shareddeps/dps/basicx/other/shared-mime-info.xml b/shareddeps/security/shared-mime-info.xml similarity index 97% rename from shareddeps/dps/basicx/other/shared-mime-info.xml rename to shareddeps/security/shared-mime-info.xml index c582095978..054b57e488 100644 --- a/shareddeps/dps/basicx/other/shared-mime-info.xml +++ b/shareddeps/security/shared-mime-info.xml @@ -1,7 +1,7 @@ + %general-entities; supporting applications. - - Package Information @@ -111,7 +109,7 @@ ninja Command Explanations + href="../../xincludes/meson-buildtype-release.xml"/> -D update-mimedb=true: This parameter tells