Skip to content
This repository has been archived by the owner on Jan 1, 2023. It is now read-only.

Commit

Permalink
Package updates, fix icon issue
Browse files Browse the repository at this point in the history
Rolled back adwaita-icon-theme to version 41.0 for now, because on 
version 42.0, some category icons in the apps list do not display 
correctly (see screenshot at 
https://cdn.discordapp.com/attachments/845964267520917545/958747504709603408/unknown.png). 
It's not a massive problem since most icons in MassOS are provided by 
Arc; adwaita-icon-theme only has two purposes in MassOS: a dependency of 
GTK3, and fallback icons for ones which Arc doesn't provide.

Also added libsoup3, since GVFS 1.50.0 depends on it. It's not ideal to 
have two different ABI versions of the same program installed, but it 
will do for now, since some software has been ported to libsoup3, and 
other software has not (yet). libsoup (2) will most likely be removed if 
everything becomes ported to libsoup3 in the future.

The patch for Ghostscript 9.56.0 is different to normal patches - this 
is because it's applied as a reverse-patch (the changes in the patch 
have already been applied to the source tree, and we are undoing them). 
This reverse-patch is needed, otherwise building the GS shared library 
fails at the final link on 9.56.0.
  • Loading branch information
TheSonicMaster committed Mar 30, 2022
1 parent d55a519 commit e84a375
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 41 deletions.
74 changes: 41 additions & 33 deletions build-system.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3025,15 +3025,15 @@ install -t /usr/share/licenses/graphite2 -Dm644 ../COPYING ../LICENSE
cd ../..
rm -rf graphite2-1.3.14
# HarfBuzz.
tar -xf harfbuzz-4.1.0.tar.xz
cd harfbuzz-4.1.0
tar -xf harfbuzz-4.2.0.tar.xz
cd harfbuzz-4.2.0
mkdir hb-build; cd hb-build
meson --prefix=/usr --buildtype=release -Dgraphite2=enabled ..
ninja
ninja install
install -t /usr/share/licenses/harfbuzz -Dm644 ../COPYING
cd ../..
rm -rf harfbuzz-4.1.0
rm -rf harfbuzz-4.2.0
# FreeType (rebuild to support HarfBuzz).
tar -xf freetype-2.11.1.tar.xz
cd freetype-2.11.1
Expand Down Expand Up @@ -3809,16 +3809,16 @@ install -t /usr/share/licenses/libvdpau -Dm644 ../COPYING
cd ../..
rm -rf libvdpau-1.5
# Mesa.
tar -xf mesa-22.0.0.tar.xz
cd mesa-22.0.0
tar -xf mesa-22.0.1.tar.xz
cd mesa-22.0.1
patch -Np1 -i ../patches/mesa-21.3.3-xdemos.patch
mkdir mesa-build; cd mesa-build
meson --prefix=/usr --buildtype=release -Dgallium-drivers="crocus,d3d12,i915,iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl,zink" -Dvulkan-drivers="amd,intel,swrast" -Dvulkan-layers="device-select,intel-nullhw,overlay" -Dgallium-nine=false -Dglx=dri -Dvalgrind=disabled ..
ninja
ninja install
install -t /usr/share/licenses/mesa -Dm644 ../docs/license.rst
cd ../..
rm -rf mesa-22.0.0
rm -rf mesa-22.0.1
# libva (rebuild to support Mesa).
tar -xf libva-2.14.0.tar.bz2
cd libva-2.14.0
Expand Down Expand Up @@ -4350,14 +4350,14 @@ install -t /usr/share/licenses/cairomm -Dm644 ../COPYING
cd ../..
rm -rf cairomm-1.14.0
# HarfBuzz (rebuild to support Cairo).
tar -xf harfbuzz-4.1.0.tar.xz
cd harfbuzz-4.1.0
tar -xf harfbuzz-4.2.0.tar.xz
cd harfbuzz-4.2.0
mkdir hb-build; cd hb-build
meson --prefix=/usr --buildtype=release -Dgraphite2=enabled ..
ninja
ninja install
cd ../..
rm -rf harfbuzz-4.1.0
rm -rf harfbuzz-4.2.0
# Pango.
tar -xf pango-1.50.6.tar.xz
cd pango-1.50.6
Expand Down Expand Up @@ -5104,9 +5104,9 @@ make prefix=/usr install
cd ../../..
rm -rf poppler-22.03.0
# Ghostscript.
tar -xf ghostscript-9.55.0.tar.xz
cd ghostscript-9.55.0
sed -i 's/gscms_transformm_color_const/gscms_transform_color_const/' base/gsicc_lcms2.c
tar -xf ghostscript-9.56.0.tar.xz
cd ghostscript-9.56.0
patch -Rp1 -i ../MassOS/patches/ghostscript-9.56.0-reversefix.patch
rm -rf freetype lcms2mt jpeg libpng openjpeg zlib
./configure --prefix=/usr --disable-compile-inits --enable-dynamic --with-system-libtiff
make
Expand All @@ -5119,13 +5119,13 @@ make install
make soinstall
install -m644 base/*.h /usr/include/ghostscript
ln -sfn ghostscript /usr/include/ps
cp -r examples/ /usr/share/ghostscript/9.55.0/
cp -r examples/ /usr/share/ghostscript/9.56.0/
tar --no-same-owner -xf ../ghostscript-fonts-std-8.11.tar.gz -C /usr/share/ghostscript
tar --no-same-owner -xf ../gnu-gs-fonts-other-6.0.tar.gz -C /usr/share/ghostscript
fc-cache /usr/share/ghostscript/fonts
install -t /usr/share/licenses/ghostscript -Dm644 LICENSE
cd ..
rm -rf ghostscript-9.55.0
rm -rf ghostscript-9.56.0
# MuPDF.
tar -xf mupdf-1.18.0-source.tar.gz
cd mupdf-1.18.0-source
Expand Down Expand Up @@ -5615,6 +5615,16 @@ ninja install
install -t /usr/share/licenses/libsoup -Dm644 ../COPYING
cd ../..
rm -rf libsoup-2.74.2
# libsoup3.
tar -xf libsoup-3.0.5.tar.xz
cd libsoup-3.0.5
mkdir soup3-build; cd soup3-build
meson --prefix=/usr --buildtype=release ..
ninja
ninja install
install -t /usr/share/licenses/libsoup3 -Dm644 ../COPYING
cd ../..
rm -rf libsoup3-3.0.5
# libostree.
tar -xf libostree-2022.2.tar.xz
cd libostree-2022.2
Expand Down Expand Up @@ -5720,14 +5730,14 @@ install -t /usr/share/licenses/geoclue -Dm644 ../COPYING ../COPYING.LIB
cd ../..
rm -rf geoclue-2.6.0
# xdg-desktop-portal.
tar -xf xdg-desktop-portal-1.14.1.tar.xz
cd xdg-desktop-portal-1.14.1
tar -xf xdg-desktop-portal-1.14.2.tar.xz
cd xdg-desktop-portal-1.14.2
./configure --prefix=/usr --disable-pipewire
make
make install
install -t /usr/share/licenses/xdg-desktop-portal -Dm644 COPYING
cd ..
rm -rf xdg-desktop-portal-1.14.1
rm -rf xdg-desktop-portal-1.14.2
# xdg-desktop-portal-gtk.
tar -xf xdg-desktop-portal-gtk-1.14.0.tar.xz
cd xdg-desktop-portal-gtk-1.14.0
Expand Down Expand Up @@ -6086,7 +6096,7 @@ rm -rf gst-libav-1.20.1
tar -xf webkitgtk-2.34.6.tar.xz
cd webkitgtk-2.34.6
mkdir webkitgtk-build; cd webkitgtk-build
cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON -DPORT=GTK -DLIB_INSTALL_DIR=/usr/lib -DUSE_SOUP2=ON -DUSE_LIBHYPHEN=OFF -DENABLE_GAMEPAD=OFF -DENABLE_MINIBROWSER=ON -DUSE_WOFF2=ON -DUSE_WPE_RENDERER=ON -Wno-dev -G Ninja ..
cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON -DPORT=GTK -DLIB_INSTALL_DIR=/usr/lib -DUSE_LIBHYPHEN=OFF -DENABLE_GAMEPAD=OFF -DENABLE_MINIBROWSER=ON -DUSE_WOFF2=ON -DUSE_WPE_RENDERER=ON -Wno-dev -G Ninja ..
ninja -j$(nproc)
ninja install
install -dm755 /usr/share/licenses/webkitgtk
Expand Down Expand Up @@ -6140,15 +6150,15 @@ install -t /usr/share/licenses/gspell -Dm644 COPYING
cd ..
rm -rf gspell-1.9.1
# gnome-online-accounts.
tar -xf gnome-online-accounts-3.40.1.tar.xz
cd gnome-online-accounts-3.40.1
mkdir GNOME-ONLINE-xbuild; cd GNOME-ONLINE-xbuild
../configure --prefix=/usr --disable-static --enable-kerberos
tar -xf gnome-online-accounts-3.44.0.tar.xz
cd gnome-online-accounts-3.44.0
mkdir goa-build; cd goa-build
../configure --prefix=/usr --disable-static --enable-documentation --enable-kerberos
make
make install
install -t /usr/share/licenses/gnome-online-accounts -Dm644 ../COPYING
cd ../..
rm -rf gnome-online-accounts-3.40.1
rm -rf gnome-online-accounts-3.44.0
# libgdata.
tar -xf libgdata-0.18.1.tar.xz
cd libgdata-0.18.1
Expand All @@ -6159,18 +6169,17 @@ ninja install
install -t /usr/share/licenses/libgdata -Dm644 ../COPYING
cd ../..
rm -rf libgdata-0.18.1
# Gvfs.
tar -xf gvfs-1.48.1.tar.xz
cd gvfs-1.48.1
patch -Np1 -i ../patches/gvfs-1.48.1-mesonfix.patch
# GVFS.
tar -xf gvfs-1.50.0.tar.xz
cd gvfs-1.50.0
mkdir gvfs-build; cd gvfs-build
meson --prefix=/usr --buildtype=release ..
meson --prefix=/usr --buildtype=release -Dman=true ..
ninja
ninja install
glib-compile-schemas /usr/share/glib-2.0/schemas
install -t /usr/share/licenses/gvfs -Dm644 ../COPYING
cd ../..
rm -rf gvfs-1.48.1
rm -rf gvfs-1.50.0
# libxfce4util.
tar -xf libxfce4util-4.17.2.tar.bz2
cd libxfce4util-4.17.2
Expand Down Expand Up @@ -6564,16 +6573,15 @@ install -t /usr/share/licenses/mugshot -Dm644 COPYING
cd ..
rm -rf mugshot-0.4.3
# Evince.
tar -xf evince-41.4.tar.xz
cd evince-41.4
find . -name meson.build | xargs sed -i '/merge_file/{n;d}'
tar -xf evince-42.1.tar.xz
cd evince-42.1
mkdir build; cd build
meson --prefix=/usr --buildtype=release -Dnautilus=false ..
ninja
ninja install
install -t /usr/share/licenses/evince -Dm644 ../COPYING
cd ../..
rm -rf evince-41.4
rm -rf evince-42.1
# Baobab.
tar -xf baobab-41.0.tar.xz
cd baobab-41.0
Expand Down
8 changes: 7 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ Changes:

Upgraded software:

- Development has only just begun, check back soon!
- Evince: `41.4 --> 42.1`
- Ghostscript: `9.55.0 --> 9.56.0`
- gnome-online-accounts: `3.40.1 --> 3.44.0`
- GVFS: `1.48.1 --> 1.50.0`
- HarfBuzz: `4.1.0 --> 4.2.0`
- Mesa: `22.0.0 --> 22.0.1`
- xdg-desktop-portal: `1.14.1 --> 1.14.2`

# MassOS 2022.04
Changes:
Expand Down
41 changes: 41 additions & 0 deletions patches/ghostscript-9.56.0-reversefix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From 9aae213ff3ae971942b427062799b009c07ea713 Mon Sep 17 00:00:00 2001
From: Chris Liddell <chris.liddell@artifex.com>
Date: Thu, 20 Jan 2022 09:06:38 +0000
Subject: [PATCH] Bug 704844: Slight tidy up of .so loader targets

I wasn't able to reproduce the reported problem, but something to try: remove
the multiple build commands for the relevant target, and split them into
separate targets, with appropriate dependencies.
---
base/unix-dll.mak | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/base/unix-dll.mak b/base/unix-dll.mak
index e83390c2c5..0e4bbab4a4 100644
--- a/base/unix-dll.mak
+++ b/base/unix-dll.mak
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2021 Artifex Software, Inc.
+# Copyright (C) 2001-2022 Artifex Software, Inc.
# All Rights Reserved.
#
# This software is provided AS-IS with no warranty, either express or
@@ -193,12 +193,15 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UNIX_DLL_MAK) $(MAKEDIRS)
$(NO_OP)

# Build the small Ghostscript loaders, with Gtk+ and without
-$(GSSOC_XE): gs-so-links-subtarget $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS)
+$(GLOBJ)dxmainc.$(OBJ): $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS)
$(GLCC) $(GLO_)dxmainc.$(OBJ) $(C_) $(PSSRC)dxmainc.c
+
+$(GSSOC_XE): gs-so-links-subtarget $(GLOBJ)dxmainc.$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS)
$(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE)

-$(GSSOX_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER).c $(UNIX_DLL_MAK) $(MAKEDIRS)
- $(GLCC) $(SOC_CFLAGS) $(GLO_)$(SOC_LOADER).$(OBJ) $(C_) $(PSSRC)$(SOC_LOADER).c
+$(GLO_)$(SOC_LOADER).$(OBJ): $(PSSRC)$(SOC_LOADER).c $(UNIX_DLL_MAK) $(MAKEDIRS)
+
+$(GSSOX_XE): gs-so-links-subtarget $(GLO_)$(SOC_LOADER).$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS)
$(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOX_XE) $(GLOBJ)$(SOC_LOADER).$(OBJ) -l$(GS_SO_BASE) $(SOC_LIBS)

$(PCLSOC_XE): gpcl6-so-links-subtarget $(UNIX_DLL_MAK) $(PLOBJ)$(REALMAIN_SRC).$(OBJ) $(MAKEDIRS)
15 changes: 8 additions & 7 deletions source-urls
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ https://deb.debian.org/debian/pool/main/e/efibootmgr/efibootmgr_17.orig.tar.gz
https://github.com/rhboot/efivar/releases/download/38/efivar-38.tar.bz2
https://sourceware.org/ftp/elfutils/0.186/elfutils-0.186.tar.bz2
https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz
https://ftp.acc.umu.se/pub/gnome/sources/evince/41/evince-41.4.tar.xz
https://ftp.acc.umu.se/pub/gnome/sources/evince/42/evince-42.1.tar.xz
https://deb.debian.org/debian/pool/main/e/exfatprogs/exfatprogs_1.1.3.orig.tar.xz
https://github.com/Exiv2/exiv2/releases/download/v0.27.5/exiv2-0.27.5-Source.tar.gz
https://archive.fr.xfce.org/src/xfce/exo/4.17/exo-4.17.1.tar.bz2
Expand Down Expand Up @@ -136,7 +136,7 @@ https://ftp.acc.umu.se/pub/gnome/sources/gedit/41/gedit-41.0.tar.xz
https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.6.0/geoclue-2.6.0.tar.bz2
https://mirror.lyrahosting.com/gnu/gettext/gettext-0.21.tar.xz
https://ftp.acc.umu.se/pub/gnome/sources/gexiv2/0.14/gexiv2-0.14.0.tar.xz
https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9550/ghostscript-9.55.0.tar.xz
https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9560/ghostscript-9.56.0.tar.xz
https://archive.massos.org/sources/ghostscript-fonts-std-8.11.tar.gz
https://ftp.acc.umu.se/pub/gnome/sources/gi-docgen/2022/gi-docgen-2022.1.tar.xz
https://archive.massos.org/sources/giflib-5.2.1.tar.gz
Expand All @@ -148,7 +148,7 @@ https://ftp.acc.umu.se/pub/gnome/sources/glibmm/2.66/glibmm-2.66.2.tar.xz
https://github.com/KhronosGroup/glslang/archive/11.8.0/glslang-11.8.0.tar.gz
https://archive.mesa3d.org/glu/glu-9.0.2.tar.xz
https://mirror.lyrahosting.com/gnu/gmp/gmp-6.2.1.tar.xz
https://ftp.acc.umu.se/pub/gnome/sources/gnome-online-accounts/3.40/gnome-online-accounts-3.40.1.tar.xz
https://ftp.acc.umu.se/pub/gnome/sources/gnome-online-accounts/3.44/gnome-online-accounts-3.44.0.tar.xz
https://ftp.acc.umu.se/pub/gnome/sources/gnome-software/41/gnome-software-41.5.tar.xz
https://archive.massos.org/sources/gnu-efi-3.0.13.tar.bz2
https://archive.massos.org/sources/gnu-gs-fonts-other-6.0.tar.gz
Expand Down Expand Up @@ -180,10 +180,10 @@ https://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.24/gtk+-3.24.33.tar.xz
https://ftp.acc.umu.se/pub/gnome/sources/gtkmm/3.24/gtkmm-3.24.5.tar.xz
https://ftp.acc.umu.se/pub/gnome/sources/gtksourceview/4.8/gtksourceview-4.8.3.tar.xz
https://archive.massos.org/sources/gutenprint-5.3.3.tar.xz
https://ftp.acc.umu.se/pub/gnome/sources/gvfs/1.48/gvfs-1.48.1.tar.xz
https://ftp.acc.umu.se/pub/gnome/sources/gvfs/1.50/gvfs-1.50.0.tar.xz
https://archive.massos.org/sources/gz2xz-1.0.2.tar.gz
https://mirror.lyrahosting.com/gnu/gzip/gzip-1.11.tar.xz
https://github.com/harfbuzz/harfbuzz/releases/download/4.1.0/harfbuzz-4.1.0.tar.xz
https://github.com/harfbuzz/harfbuzz/releases/download/4.2.0/harfbuzz-4.2.0.tar.xz
https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.17.tar.xz
https://mirrorservice.org/sites/distfiles.gentoo.org/distfiles/hplip-3.22.2.tar.gz
https://github.com/htop-dev/htop/releases/download/3.1.2/htop-3.1.2.tar.xz
Expand Down Expand Up @@ -301,6 +301,7 @@ https://mirror.lyrahosting.com/gnu/libsigsegv/libsigsegv-2.14.tar.gz
https://www.x.org/archive/individual/lib/libSM-1.2.3.tar.bz2
https://github.com/libsndfile/libsndfile/releases/download/1.0.31/libsndfile-1.0.31.tar.bz2
https://ftp.acc.umu.se/pub/gnome/sources/libsoup/2.74/libsoup-2.74.2.tar.xz
https://ftp.acc.umu.se/pub/gnome/sources/libsoup/3.0/libsoup-3.0.5.tar.xz
https://www.libssh2.org/download/libssh2-1.10.0.tar.gz
https://archive.massos.org/sources/libstemmer-2.1.0.tar.xz
https://mirror.lyrahosting.com/gnu/libtasn1/libtasn1-4.18.0.tar.gz
Expand Down Expand Up @@ -387,7 +388,7 @@ https://files.pythonhosted.org/packages/source/M/Markdown/Markdown-3.3.6.tar.gz
https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-2.1.1.tar.gz
https://github.com/MassOS-Linux/massos-welcome/archive/7b613e2fd58e3b6be495ddc6e59a67eeeef2c44a/massos-welcome-7b613e2fd58e3b6be495ddc6e59a67eeeef2c44a.tar.gz
https://cdn.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.2.tar.xz
https://archive.mesa3d.org/mesa-22.0.0.tar.xz
https://archive.mesa3d.org/mesa-22.0.1.tar.xz
https://github.com/mesonbuild/meson/releases/download/0.62.0/meson-0.62.0.tar.gz
https://www.x.org/archive/individual/app/mkfontscale-1.2.1.tar.bz2
https://archive.massos.org/sources/mobile-broadband-provider-info-20210805.tar.xz
Expand Down Expand Up @@ -578,7 +579,7 @@ https://www.x.org/archive/individual/app/xcmsdb-1.0.5.tar.bz2
https://www.x.org/archive/individual/data/xcursor-themes-1.0.6.tar.bz2
https://www.x.org/archive/individual/app/xcursorgen-1.0.7.tar.bz2
https://github.com/flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz
https://github.com/flatpak/xdg-desktop-portal/releases/download/1.14.1/xdg-desktop-portal-1.14.1.tar.xz
https://github.com/flatpak/xdg-desktop-portal/releases/download/1.14.2/xdg-desktop-portal-1.14.2.tar.xz
https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.14.0/xdg-desktop-portal-gtk-1.14.0.tar.xz
https://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.17.tar.gz
https://portland.freedesktop.org/download/xdg-utils-1.1.3.tar.gz
Expand Down
1 change: 1 addition & 0 deletions utils/builtins
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ libsigsegv
libsm
libsndfile
libsoup
libsoup3
libssh2
libstemmer
libtasn1
Expand Down

0 comments on commit e84a375

Please sign in to comment.