Skip to content

Commit

Permalink
XFCE: Cleanup dependencies
Browse files Browse the repository at this point in the history 
- Update xfce.mk to avid forcing too many dependencies on consumers
- Change dependency on garcon to reference libgarcon-1.so (main
  library)
- Explicitly add USE_XFCE components to the ports actually needing
  them.
- Cleanup dependencies, adding/removing missing/extra dependencies
- Change the referenced library in some LIB_DEPENDS to the actually
  linked one (avoids false positives in poudriere Q/A tests)
- Bump PORTREVISION on all touched ports, even indirectly due to
  the effect of removing forced dependencies on certain components
- Remove USES=fuse from gigolo. I could not find any kind f reference
  to fuse in the code.
- xfce4-bsdcpufreq-plugin: Also remove empty comment at the top of
  the Makefile
  • Loading branch information
@madpilot78
madpilot78 committed Oct 2, 2023
1 parent af63ff3 commit 0afc866
Show file tree
Hide file tree
Showing 63 changed files with 129 additions and 116 deletions.
5 changes: 1 addition & 4 deletions Mk/Uses/xfce.mk
View file
Expand Up @@ -23,24 +23,21 @@ LIBS+= -L${LOCALBASE}/lib
libmenu_LIB_DEPENDS= libxfce4ui-2.so:x11/libxfce4menu
libmenu_USE_XFCE_REQ= libutil

garcon_LIB_DEPENDS= libgarcon-gtk3-1.so:sysutils/garcon
garcon_LIB_DEPENDS= libgarcon-1.so:sysutils/garcon
garcon_USE_XFCE_REQ= libmenu

libexo_LIB_DEPENDS= libexo-2.so:x11/libexo
libexo_USE_XFCE_REQ= libmenu

panel_LIB_DEPENDS= libxfce4panel-2.0.so:x11-wm/xfce4-panel
panel_RUN_DEPENDS= xfce4-panel:x11-wm/xfce4-panel
panel_USE_XFCE_REQ= garcon libexo xfconf

libutil_LIB_DEPENDS= libxfce4util.so:x11/libxfce4util

thunar_LIB_DEPENDS= libthunarx-3.so:x11-fm/thunar
thunar_RUN_DEPENDS= Thunar:x11-fm/thunar
thunar_USE_XFCE_REQ= xfconf libmenu

xfconf_LIB_DEPENDS= libxfconf-0.so:x11/xfce4-conf
xfconf_USE_XFCE_REQ= libutil

. if defined(USE_XFCE)
# First, expand all USE_XFCE_REQ recursively.
Expand Down
1 change: 1 addition & 0 deletions archivers/thunar-archive-plugin/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= thunar-archive-plugin
PORTVERSION= 0.5.1
PORTREVISION= 1
CATEGORIES= archivers xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
Expand Down
2 changes: 1 addition & 1 deletion audio/thunar-media-tags-plugin/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= thunar-media-tags-plugin
PORTVERSION= 0.4.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
Expand Down
4 changes: 2 additions & 2 deletions audio/xfce4-mixer/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= xfce4-mixer
PORTVERSION= 4.18.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
Expand All @@ -25,7 +25,7 @@ USES= compiler:c11 gettext-tools gmake gnome gstreamer libtool \
pkgconfig tar:bzip2 xfce xorg
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
USE_GSTREAMER= good
USE_XFCE= panel
USE_XFCE= libmenu panel xfconf
USE_XORG= x11

GNU_CONFIGURE= yes
Expand Down
3 changes: 2 additions & 1 deletion audio/xfce4-mpc-plugin/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= xfce4-mpc-plugin
PORTVERSION= 0.5.3
PORTREVISION= 1
CATEGORIES= audio xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
Expand All @@ -17,7 +18,7 @@ RUN_DEPENDS= musicpd:audio/musicpd
USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_XFCE= panel
USE_XFCE= libmenu panel

GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
Expand Down
3 changes: 2 additions & 1 deletion audio/xfce4-pulseaudio-plugin/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= xfce4-pulseaudio-plugin
PORTVERSION= 0.4.8
PORTREVISION= 1
CATEGORIES= audio xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
Expand All @@ -18,7 +19,7 @@ RUN_DEPENDS= pavucontrol>=2.0:audio/pavucontrol
USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
tar:bzip2 xfce xorg
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libwnck3
USE_XFCE= panel
USE_XFCE= libexo panel xfconf
USE_XORG= x11

GNU_CONFIGURE= yes
Expand Down
7 changes: 2 additions & 5 deletions deskutils/orage/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= orage
PORTVERSION= 4.18.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
Expand All @@ -12,10 +12,7 @@ WWW= https://git.xfce.org/apps/orage/about/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= libpopt.so:devel/popt \
libical.so:devel/libical \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
LIB_DEPENDS= libical.so:devel/libical \
libharfbuzz.so:print/harfbuzz

USES= compiler:c++11-lang desktop-file-utils gettext gmake gnome \
Expand Down
5 changes: 2 additions & 3 deletions deskutils/xfce4-generic-slider/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= xfce4-generic-slider
PORTVERSION= 1.0.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/panel-plugins
Expand All @@ -12,9 +13,7 @@ WWW= https://gitlab.xfce.org/panel-plugins/xfce4-generic-slider
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz
LIB_DEPENDS= libharfbuzz.so:print/harfbuzz

USES= compiler:c11 gettext gmake gnome libtool pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
Expand Down
8 changes: 3 additions & 5 deletions deskutils/xfce4-notes-plugin/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= xfce4-notes-plugin
PORTVERSION= 1.10.0
PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
Expand All @@ -10,15 +11,12 @@ WWW= https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin

LICENSE= GPLv2

LIB_DEPENDS= libunique-1.0.so:x11-toolkits/unique \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz
LIB_DEPENDS= libharfbuzz.so:print/harfbuzz

USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
tar:bzip2 xfce xorg
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
USE_XFCE= panel
USE_XFCE= libmenu panel xfconf
USE_XORG= ice sm x11

GNU_CONFIGURE= yes
Expand Down
3 changes: 2 additions & 1 deletion deskutils/xfce4-notifyd/Makefile
View file
Expand Up @@ -5,6 +5,7 @@

PORTNAME= xfce4-notifyd
PORTVERSION= 0.9.2
PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
Expand All @@ -22,7 +23,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \
USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
sqlite tar:bzip2 xfce xorg
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
USE_XFCE= libutil panel
USE_XFCE= libmenu panel xfconf
USE_XORG= ice sm x11

GNU_CONFIGURE= yes
Expand Down
5 changes: 2 additions & 3 deletions deskutils/xfce4-tumbler/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= tumbler
PORTVERSION= 4.18.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE
PKGNAMEPREFIX= xfce4-
Expand All @@ -18,7 +18,7 @@ LIB_DEPENDS= libpng.so:graphics/png

USES= compiler:c11 gettext-tools gmake gnome libtool \
localbase:ldflags pathfix pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 glib20 intltool libgsf librsvg2
USE_GNOME= cairo gdkpixbuf2 glib20 intltool libgsf
USE_XFCE= libutil
USE_LDCONFIG= yes

Expand Down Expand Up @@ -58,7 +58,6 @@ GSTREAMER_CONFIGURE_ENABLE= gstreamer-thumbnailer
GSTREAMER_USES= gstreamer

JPEG_CONFIGURE_ENABLE= jpeg-thumbnailer
JPEG_LIB_DEPENDS= libexif.so:graphics/libexif
JPEG_USES= jpeg

NLS_CONFIGURE_ENABLE= nls
Expand Down
4 changes: 2 additions & 2 deletions deskutils/xfce4-volumed-pulse/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= xfce4-volumed-pulse
PORTVERSION= 0.2.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
Expand All @@ -17,7 +17,7 @@ LIB_DEPENDS= libkeybinder-3.0.so:x11/keybinder-gtk3 \
libpulse.so:audio/pulseaudio

USES= gmake gnome libtool pkgconfig tar:bz2 xfce
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30
USE_GNOME= glib20 gtk30
USE_XFCE= xfconf

GNU_CONFIGURE= yes
Expand Down
4 changes: 2 additions & 2 deletions deskutils/xfce4-xkb-plugin/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= xfce4-xkb-plugin
PORTVERSION= 0.8.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/panel-plugins

Expand All @@ -16,7 +16,7 @@ LIB_DEPENDS= libxklavier.so:x11/libxklavier \
USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
tar:bzip2 xfce xorg
USE_GNOME= cairo gtk30 intltool librsvg2 libwnck3
USE_XFCE= panel
USE_XFCE= garcon libmenu panel xfconf
USE_XORG= x11

GNU_CONFIGURE= yes
Expand Down
2 changes: 1 addition & 1 deletion devel/thunar-vcs-plugin/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= thunar-vcs-plugin
PORTVERSION= 0.2.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
Expand Down
3 changes: 2 additions & 1 deletion editors/mousepad/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= mousepad
PORTVERSION= 0.6.1
PORTREVISION= 1
CATEGORIES= editors xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
Expand All @@ -15,7 +16,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz

USES= desktop-file-utils gettext-tools gmake gnome libtool perl5 \
pkgconfig tar:bzip2 xfce
USE_GNOME= cairo dconf gdkpixbuf2 glib20 gtk30 gtksourceview3 intltool
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 gtksourceview3 intltool
USE_LDCONFIG= yes

GNU_CONFIGURE= yes
Expand Down
2 changes: 1 addition & 1 deletion graphics/ristretto/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= ristretto
PORTVERSION= 0.13.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
Expand Down
6 changes: 2 additions & 4 deletions mail/xfce4-mailwatch-plugin/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= xfce4-mailwatch-plugin
PORTVERSION= 1.3.1
PORTREVISION= 1
CATEGORIES= mail xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
Expand All @@ -12,15 +13,12 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= libgnutls.so:security/gnutls \
libgpg-error.so:security/libgpg-error \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz

USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
tar:bzip2 xfce xorg
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
USE_XFCE= panel
USE_XFCE= libexo panel
USE_XORG= x11

GNU_CONFIGURE= yes
Expand Down
3 changes: 2 additions & 1 deletion math/xfce4-calculator-plugin/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= xfce4-calculator-plugin
PORTVERSION= 0.7.2
PORTREVISION= 1
CATEGORIES= math xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
Expand All @@ -15,7 +16,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
tar:bz2 xfce xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_XFCE= panel
USE_XFCE= libmenu panel
USE_XORG= x11

GNU_CONFIGURE= yes
Expand Down
3 changes: 2 additions & 1 deletion misc/xfce4-appfinder/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= xfce4-appfinder
PORTVERSION= 4.18.1
PORTREVISION= 1
CATEGORIES= misc xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
Expand All @@ -12,7 +13,7 @@ LICENSE= GPLv2

USES= compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool
USE_XFCE= garcon xfconf
USE_XFCE= garcon libmenu xfconf

GNU_CONFIGURE= yes

Expand Down
3 changes: 2 additions & 1 deletion misc/xfce4-weather-plugin/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= xfce4-weather-plugin
PORTVERSION= 0.11.1
PORTREVISION= 1
CATEGORIES= misc xfce geography
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
Expand All @@ -17,7 +18,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
tar:bzip2 xfce
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libxml2
USE_XFCE= panel
USE_XFCE= libmenu panel xfconf
USE_LDCONFIG= yes

GNU_CONFIGURE= yes
Expand Down
6 changes: 3 additions & 3 deletions multimedia/xfce4-parole/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= parole
PORTVERSION= 4.18.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= multimedia xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
Expand All @@ -15,15 +15,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
libnotify.so:devel/libnotify \
libtag.so:audio/taglib \
libtag_c.so:audio/taglib \
libharfbuzz.so:print/harfbuzz
RUN_DEPENDS= xdg-screensaver:devel/xdg-utils

USES= compiler:c++11-lang desktop-file-utils gettext-tools \
gmake gnome gstreamer libtool pkgconfig tar:bzip2 xfce xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 glib20 intltool
USE_GSTREAMER= core faad flac wavpack rtmp x
USE_XFCE= panel
USE_XFCE= libmenu xfconf
USE_XORG= ice sm x11

GNU_CONFIGURE= yes
Expand Down
5 changes: 2 additions & 3 deletions sysutils/garcon/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= garcon
PORTVERSION= 4.18.1
PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
Expand All @@ -12,9 +13,7 @@ WWW= https://www.xfce.org/
# documentation is under GFDL 1.1.
LICENSE= GPLv2

LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz
LIB_DEPENDS= libharfbuzz.so:print/harfbuzz

USES= compiler:c11 gettext-tools gmake gnome libtool pathfix \
pkgconfig tar:bzip2 xfce
Expand Down
3 changes: 2 additions & 1 deletion sysutils/gigolo/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= gigolo
PORTVERSION= 0.5.3
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= XFCE/apps

Expand All @@ -12,7 +13,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
LIB_DEPENDS= libharfbuzz.so:print/harfbuzz

USES= fuse gettext-tools gmake gnome pkgconfig tar:bzip2 xfce xorg
USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 gvfs intltool
USE_XORG= x11

Expand Down

0 comments on commit 0afc866

Please sign in to comment.