Skip to content

Commit

Permalink
x11-wm/xfce4: Switch default icon set to x11-themes/xfce-icons-elemen…
Browse files Browse the repository at this point in the history
…tary

After the update x11-themes/adwaita-icon-theme update to version
42.0 (commit 14ac2cbef6484e85669c99a5a8388ea4627f029f) XFCE is not
compatible with it anymore, due to icons being renamed/removed from
the theme.

To work around this, change the default icon theme installed with
XFCE to x11-themes/xfce-icons-elementary.

Users with XFCE desktops already configured to use adwaita-icon-theme
need to install another theme and switch to it manually using the
XFCE settings "appearance" application, see UPDATING entry 20230924.

PR:		274057
  • Loading branch information
madpilot78 committed Sep 25, 2023
1 parent 9ceb20a commit 364a6b8
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
15 changes: 15 additions & 0 deletions UPDATING
Expand Up @@ -5,6 +5,21 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

20230924:
AFFECTS: users of XFCE desktop (x11-wm/xfce4)
AUTHOR: madpilot@FreeBSD.org

XFCE 4.18 is incompatible with the latest version of the adwaita
icon theme (version 42.0 and newer), which was used as the default one.
Due to this the default icon theme has been changed to
x11-themes/xfce-icons-elementary.

Users that have XFCE already installed and are using the adwaita
icon theme will notice missing icons. To fix this you can install
any other icon theme (like x11-themes/xfce-icons-elementary) and
configure XFCE to use that via the "appearance" settings application,
under the "icons" tab.

20230919:
AFFECTS: users of net-p2p/transmission
AUTHOR: mondo.debater_0q@icloud.com
Expand Down
5 changes: 3 additions & 2 deletions sysutils/xfce4-settings/Makefile
@@ -1,5 +1,6 @@
PORTNAME= xfce4-settings
PORTVERSION= 4.18.3
PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
Expand Down Expand Up @@ -51,9 +52,9 @@ CONFIGURE_ARGS+= --enable-debug=yes
.endif

post-patch:
@${REINPLACE_CMD} -e 's|Rodent|Adwaita|g' \
@${REINPLACE_CMD} -e 's|Rodent|elementary-xfce|g' \
${WRKSRC}/dialogs/appearance-settings/main.c
@${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Adwaita|' \
@${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="elementary-xfce|' \
${WRKSRC}/xfsettingsd/xsettings.xml

.include <bsd.port.mk>
3 changes: 2 additions & 1 deletion x11-wm/xfce4/Makefile
@@ -1,5 +1,6 @@
PORTNAME= xfce
PORTVERSION= 4.18
PORTREVISION= 1
CATEGORIES= x11-wm xfce

MAINTAINER= xfce@FreeBSD.org
Expand All @@ -22,7 +23,7 @@ APPFINDER_RUN_DEPENDS= xfce4-appfinder:misc/xfce4-appfinder
APPFINDER_DESC= Launcher and finder
GREYBIRD_DESC= Install Greybird theme
GREYBIRD_RUN_DEPENDS= greybird-theme>0:x11-themes/greybird-theme
ICONS_RUN_DEPENDS= adwaita-icon-theme>0:x11-themes/adwaita-icon-theme
ICONS_RUN_DEPENDS= xfce-icons-elementary>0:x11-themes/xfce-icons-elementary
LIGHTDM_RUN_DEPENDS= lightdm-gtk-greeter:x11/lightdm-gtk-greeter
LIGHTDM_DESC= LightDM display manger
MOUSEPAD_RUN_DEPENDS= mousepad:editors/mousepad
Expand Down

0 comments on commit 364a6b8

Please sign in to comment.