You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
gtk{2,3}{,-devel}: Use GTK3 version of gtk-update-icon-cache by default
* GTK2 applications: Use `gtk-update-icon-cache-2.0` * GTK3 applications: Use `gtk-update-icon-cache` As opposed to `gtk-update-icon-cache-3.0`
This commit is contained in:
@@ -87,7 +87,7 @@ subport easytag-devel {
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
|
||||
}
|
||||
|
||||
|
||||
@@ -50,5 +50,5 @@ configure.args --disable-update-desktop-database
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ destroot {
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
app.icon gcstar/share/gcstar/icons/GCstar.ico
|
||||
|
||||
@@ -221,7 +221,7 @@ To view the Gda Browser Help manual, use
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
livecheck.type gnome
|
||||
|
||||
@@ -91,7 +91,7 @@ app.executable ${filespath}/launch
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
livecheck.type regex
|
||||
|
||||
@@ -30,7 +30,7 @@ depends_lib port:desktop-file-utils \
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
livecheck.type gnome
|
||||
|
||||
@@ -126,7 +126,7 @@ To view the Glade Interface Designer Manual (GTK+ 3 version), use
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
variant x11 conflicts quartz {
|
||||
|
||||
@@ -100,7 +100,7 @@ To view the Glade Interface Designer Manual (GTK+ 2 version), use
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
livecheck.type gnome
|
||||
|
||||
@@ -104,6 +104,6 @@ variant evolution description "Enable Evolution data server" {
|
||||
# }
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ if {[variant_isset quartz]} {
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
livecheck.type regex
|
||||
|
||||
@@ -34,5 +34,5 @@ autoreconf.args -fvi
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ autoreconf.args -fvi
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
livecheck.type regex
|
||||
|
||||
@@ -65,7 +65,7 @@ configure.args --disable-scrollkeeper
|
||||
post-activate {
|
||||
system "${prefix}/bin/scrollkeeper-update"
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
# Last release was in 2011. No new releases are expected.
|
||||
|
||||
@@ -61,7 +61,7 @@ post-configure {
|
||||
}
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 --ignore-theme-index ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache --ignore-theme-index ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/update-mime-database -V ${prefix}/share/mime"
|
||||
system "${prefix}/bin/gdk-pixbuf-query-loaders > ${prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
|
||||
}
|
||||
|
||||
@@ -33,8 +33,7 @@ depends_lib-append \
|
||||
path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
|
||||
path:lib/pkgconfig/librsvg-2.0.pc:librsvg
|
||||
|
||||
patchfiles-append patch-configure.ac.diff \
|
||||
patch-adwaita-icon-theme-makefile.diff
|
||||
patchfiles-append patch-adwaita-icon-theme-makefile.diff
|
||||
|
||||
use_autoreconf yes
|
||||
autoreconf.args -fvi
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- configure.ac.orig 2016-09-21 03:07:06.000000000 -0700
|
||||
+++ configure.ac 2016-09-21 08:24:32.000000000 -0700
|
||||
@@ -30,7 +30,7 @@
|
||||
AC_SUBST([install_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 64x64 96x96 256x256 512x512"])
|
||||
|
||||
AC_PROG_LN_S
|
||||
-AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
|
||||
+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache-3.0)
|
||||
|
||||
# need git, icontool, and inkscape for rendering
|
||||
allow_rendering=yes
|
||||
@@ -83,7 +83,7 @@ notes "
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
livecheck.type gnome
|
||||
|
||||
@@ -175,7 +175,7 @@ if {![variant_isset quartz] && ![variant_isset x11]} {
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
|
||||
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ configure.cflags-append -D_DARWIN_C_SOURCE
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
}
|
||||
|
||||
livecheck.type regex
|
||||
|
||||
@@ -48,7 +48,7 @@ configure.args --disable-schemas-compile \
|
||||
|
||||
post-activate {
|
||||
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
|
||||
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
|
||||
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
|
||||
}
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user