Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Arch and SteamOS Deps #82

Merged
merged 4 commits into from
Jun 14, 2024
Merged

Update Arch and SteamOS Deps #82

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c62873
Initial dependency separation of Arch from SteamOS
c-reeder Mar 15, 2024
2144612
removed a few from steam and arch
c-reeder Mar 15, 2024
2295bf0
removed more packages from arch
c-reeder Mar 15, 2024
137e4f0
Merge branch 'main' into 1-break-arch-from-steamos
thw26 Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,10 @@ def get_package_manager():
config.PACKAGE_MANAGER_COMMAND_INSTALL = r"pacman -Syu --overwrite * --noconfirm --needed"
config.PACKAGE_MANAGER_COMMAND_REMOVE = r"pacman -R --no-confirm"
config.PACKAGE_MANAGER_COMMAND_QUERY = "pacman -Q | grep -E ^"
config.PACKAGES = "patch wget sed grep gawk cabextract samba bc libxml2 curl print-manager system-config-printer cups-filters nss-mdns foomatic-db-engine foomatic-db-ppds foomatic-db-nonfree-ppds ghostscript glibc samba extra-rel/apparmor core-rel/libcurl-gnutls winetricks cabextract appmenu-gtk-module patch bc lib32-libjpeg-turbo qt5-virtualkeyboard wine-staging giflib lib32-giflib libpng lib32-libpng libldap lib32-libldap gnutls lib32-gnutls mpg123 lib32-mpg123 openal lib32-openal v4l-utils lib32-v4l-utils libpulse lib32-libpulse libgpg-error lib32-libgpg-error alsa-plugins lib32-alsa-plugins alsa-lib lib32-alsa-lib libjpeg-turbo lib32-libjpeg-turbo sqlite lib32-sqlite libxcomposite lib32-libxcomposite libxinerama lib32-libgcrypt libgcrypt lib32-libxinerama ncurses lib32-ncurses ocl-icd lib32-ocl-icd libxslt lib32-libxslt libva lib32-libva gtk3 lib32-gtk3 gst-plugins-base-libs lib32-gst-plugins-base-libs vulkan-icd-loader lib32-vulkan-icd-loader"
if config.OS_NAME == "steamos": # steamOS
config.PACKAGES = "patch wget sed grep gawk cabextract samba bc libxml2 curl print-manager system-config-printer cups-filters nss-mdns foomatic-db-engine foomatic-db-ppds foomatic-db-nonfree-ppds ghostscript glibc samba extra-rel/apparmor core-rel/libcurl-gnutls winetricks cabextract appmenu-gtk-module lib32-libjpeg-turbo qt5-virtualkeyboard wine-staging giflib lib32-giflib libpng lib32-libpng libldap lib32-libldap gnutls lib32-gnutls mpg123 lib32-mpg123 openal lib32-openal v4l-utils lib32-v4l-utils libpulse lib32-libpulse libgpg-error lib32-libgpg-error alsa-plugins lib32-alsa-plugins alsa-lib lib32-alsa-lib libjpeg-turbo lib32-libjpeg-turbo sqlite lib32-sqlite libxcomposite lib32-libxcomposite libxinerama lib32-libgcrypt libgcrypt lib32-libxinerama ncurses lib32-ncurses ocl-icd lib32-ocl-icd libxslt lib32-libxslt libva lib32-libva gtk3 lib32-gtk3 gst-plugins-base-libs lib32-gst-plugins-base-libs vulkan-icd-loader lib32-vulkan-icd-loader"
c-reeder marked this conversation as resolved.
Show resolved Hide resolved
else: # arch
config.PACKAGES = "patch wget sed grep cabextract samba print-manager system-config-printer cups-filters nss-mdns foomatic-db-engine foomatic-db-ppds foomatic-db-nonfree-ppds ghostscript glibc samba apparmor libcurl-gnutls winetricks cabextract appmenu-gtk-module lib32-libjpeg-turbo qt5-virtualkeyboard wine giflib lib32-giflib libpng lib32-libpng libldap lib32-libldap gnutls lib32-gnutls mpg123 lib32-mpg123 openal lib32-openal v4l-utils lib32-v4l-utils libpulse lib32-libpulse libgpg-error lib32-libgpg-error alsa-plugins lib32-alsa-plugins alsa-lib lib32-alsa-lib libjpeg-turbo lib32-libjpeg-turbo sqlite lib32-sqlite libxcomposite lib32-libxcomposite libxinerama lib32-libgcrypt libgcrypt lib32-libxinerama ncurses lib32-ncurses ocl-icd lib32-ocl-icd libxslt lib32-libxslt libva lib32-libva gtk3 lib32-gtk3 gst-plugins-base-libs lib32-gst-plugins-base-libs vulkan-icd-loader lib32-vulkan-icd-loader"
Copy link
Collaborator

@thw26 thw26 Mar 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove the duplicate cabextract package here? Also, let's remove print-manager system-config-printer cups-filters nss-mdns foomatic-db-engine foomatic-db-ppds foomatic-db-nonfree-ppds ghostscript and qt5-virtualkeyboard from Arch but not from SteamOS.

You can also move the remaining cabextract to L9PACKAGES.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could also create a new OPTIONALPACKAGES config option here to add the printing packages. Any thoughts on this @n8marti?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thw26 made those changes. Let me know if you spot anything else to be trimmed out.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What kinds of features/improvements would be handled by OPTIONALPACKAGES? Just printing support? I guess I'd tend to prefer to keep the user's installation steps simpler by not having another choice to make, unless including OPTIONALPACKAGES was the default but then there was a simple CLI option to disable them. That would keep the GUI/TUI cleaner.

Copy link
Collaborator

@thw26 thw26 Mar 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we are letting @jg00dman handle SteamOS, then let's just keep that distro as is. We can put in the README's Arch instructions how to get the printing support rather than supporting optional dependencies.

The reason why I ask is that without these, Arch is missing key Logos functionality, i.e., printing from a Logos resource or document. But I'm okay separating that out.

Copy link
Collaborator

@thw26 thw26 Mar 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@c-reeder, can you make a modification to the README file as part of this PR that adds the printing deps to the instructions?

Once you do that, please feel free to squash your commits and to force push, then we can merge this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thw26 , Sorry, I'm getting a little jumbled in the back-and-forth. Just so I'm clear..

  1. Do you want me to not touch the SteamOS dependencies at all? E.g. leave them as they would have been before this PR? (not even removing duplicates)
  2. If so, should I not move the cabextract package to the L9PACKAGES for SteamOS? If that's the case, it seems like rather than just having my Arch/Steam split condition around config.PACKAGE, I would have a top-level condition (so that PACKAGE_MANAGER_COMMAND_*, L9PACKAGES, and BADPACKAGES are also separately set between Arch/Steam).
  3. Or do you just mean to keep the PR the way it currently is but your ask is just to add the printing packages back to Steam?

(either way, I'll add the Readme updates)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1, 2. Don't touch SteamOS dependencies, but as noted, move cabextract to L9PACKAGES.
3. I'd leave printing in SteamOS and remove from Arch proper.

Perhaps in the future we will consider adding optional dependencies. For now, let's just add the printing dependencies to the README under Arch so that users know what is needed.

Otherwise, squash your commits to a single commit, and all should be well!

config.L9PACKAGES = "" # FIXME: Missing Logos 9 Packages
config.BADPACKAGES = "appimagelauncher"
# Add more conditions for other package managers as needed
Expand Down