Skip to content

Commit 2c672a4

Browse files
committed
INSTALLS_ICONS: retire the macro and rework the related dependencies
While here, make sure gtk-update-icon-cache is only on run dependency where added as a dependency Enforce gtk3 to depend on gtk-update-icon-cache (previously it was inheriting the dependency)
1 parent 221a492 commit 2c672a4

586 files changed

Lines changed: 2 additions & 594 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Mk/Uses/gnome.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ pangox-compat_USE_GNOME_IMPL= glib20 pango
171171
gdkpixbuf2_LIB_DEPENDS= libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
172172
gdkpixbuf2_USE_GNOME_IMPL=glib20
173173

174-
gtk-update-icon-cache_BUILD_DEPENDS= gtk-update-icon-cache:graphics/gtk-update-icon-cache
175174
gtk-update-icon-cache_RUN_DEPENDS= gtk-update-icon-cache:graphics/gtk-update-icon-cache
176175
gtk-update-icon-cache_USE_GNOME_IMPL= atk pango gdkpixbuf2
177176

@@ -312,10 +311,6 @@ gvfs_BUILD_DEPENDS= gvfs>=0:devel/gvfs
312311
gvfs_RUN_DEPENDS= gvfs>=0:devel/gvfs
313312
gvfs_USE_GNOME_IMPL= glib20
314313

315-
.if defined(INSTALLS_ICONS)
316-
USE_GNOME+= gtk-update-icon-cache
317-
.endif
318-
319314
# End component definition section
320315

321316
.if defined(USE_GNOME)

accessibility/accerciser/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ RUN_DEPENDS= gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
2121
NO_ARCH= yes
2222
USES= gettext gmake gnome localbase:ldflags pkgconfig python:3.4+ shebangfix tar:xz
2323
USE_GNOME= gtk30 pygobject3
24-
INSTALLS_ICONS= yes
2524
GNU_CONFIGURE= yes
2625
SHEBANG_FILES= plugins/ipython_view.py
2726

accessibility/orca/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ NO_ARCH= yes
3030
USES= cpe gettext gmake gnome localbase pathfix pkgconfig \
3131
python:3.4+ tar:xz
3232
USE_GNOME= gtk30 pygobject3
33-
INSTALLS_ICONS= yes
3433
GNU_CONFIGURE= yes
3534
CPE_VENDOR= gnome
3635

accessibility/redshift/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ USE_GITHUB= yes
2525
GH_ACCOUNT= jonls
2626
USE_GNOME= intltool
2727
GNU_CONFIGURE= yes
28-
INSTALLS_ICONS= yes
2928
SHEBANG_FILES= src/redshift-gtk/redshift-gtk.in
3029

3130
CONFIGURE_ARGS+= --disable-wingdi

archivers/engrampa/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ USE_GNOME= cairo gtk30 intltool
2626
USE_LDCONFIG= yes
2727
GNU_CONFIGURE= yes
2828
CONFIGURE_ARGS= --disable-packagekit
29-
INSTALLS_ICONS= yes
3029
INSTALL_TARGET= install-strip
3130

3231
GLIB_SCHEMAS= org.mate.engrampa.gschema.xml

archivers/file-roller/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ PORTSCOUT= limitw:1,even
2323
USES= cpe desktop-file-utils gettext gnome libarchive localbase \
2424
meson pkgconfig python:3.5+,build tar:xz
2525
USE_GNOME= cairo gtk30
26-
INSTALLS_ICONS= yes
2726
USE_LDCONFIG= yes
2827
MESON_ARGS= -Dpackagekit=false
2928
BINARY_ALIAS= python3=${PYTHON_VERSION}

archivers/thunar-archive-plugin/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ USE_GNOME= cairo gtk30 intltool
1919
USE_XFCE= libexo thunar
2020

2121
GNU_CONFIGURE= yes
22-
INSTALLS_ICONS= yes
2322
INSTALL_TARGET= install-strip
2423

2524
OPTIONS_DEFINE= NLS

archivers/xarchiver/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ GH_ACCOUNT= ib
2626

2727
USE_GNOME= cairo glib20 intltool
2828
GNU_CONFIGURE= yes
29-
INSTALLS_ICONS= yes
3029

3130
OPTIONS_DEFINE= DOCS NLS
3231
OPTIONS_GROUP= FORMATS

astro/foxtrotgps/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ USES= compiler:c++11-lang gettext gmake gnome pkgconfig python \
2222
shebangfix sqlite:3
2323
USE_GNOME= cairo gconf2 gtk20 intltool libglade2 libxml2
2424
GLIB_SCHEMAS= org.foxtrotgps.gschema.xml
25-
INSTALLS_ICONS= yes
2625

2726
SHEBANG_FILES= contrib/convert2gpx \
2827
contrib/convert2osm \

astro/merkaartor/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1
4949
NLS_USES= qt:5
5050
NLS_USE= QT=linguisttools_build
5151

52-
INSTALLS_ICONS= yes
53-
5452
OPTIONS_SUB= yes
5553

5654
pre-build-NLS-on:

0 commit comments

Comments
 (0)