This repository has been archived by the owner on Jan 1, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
1 parent
d55a519
commit e84a375
Showing
5 changed files
with
98 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -286,6 +286,7 @@ libsigsegv | |
libsm | ||
libsndfile | ||
libsoup | ||
libsoup3 | ||
libssh2 | ||
libstemmer | ||
libtasn1 | ||
|