kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkglint-4.129

Browse source 
* explain when desktop-file-utils is required.
* error missing {hicolor,gnome}-icon-theme.
This commit is contained in:
obache 2013-05-06 02:53:24 +00:00
parent 160460647d
commit ab4a8fc6b0
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgtools/pkglint/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.428 2013/03/26 15:11:36 schmonz Exp $
# $NetBSD: Makefile,v 1.429 2013/05/06 02:53:24 obache Exp $
# Note: if you update the version number, please have a look at the
# changes between the CVS tag "pkglint_current" and HEAD.
# After updating, please re-set the CVS tag to HEAD.
DISTNAME= pkglint-4.128
DISTNAME= pkglint-4.129
CATEGORIES= pkgtools
MASTER_SITES= # none
DISTFILES= # none

28
pkgtools/pkglint/files/pkglint.pl
View file

@ -1,5 +1,5 @@
#! @PERL@
# $NetBSD: pkglint.pl,v 1.854 2013/03/26 15:11:20 schmonz Exp $
# $NetBSD: pkglint.pl,v 1.855 2013/05/06 02:53:25 obache Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@ -6754,11 +6754,6 @@ sub checkfile_PLIST($) {
"Directories are removed automatically when they are empty.",
"When a package needs an empty directory, it can use the \@pkgdir",
"command in the PLIST");
# XXX: this check should be made independent of dirrm
if ($pkgpath ne "graphics/hicolor-icon-theme" && $arg =~ m"^share/icons/hicolor(?:$|/)") {
$line->log_error("Please .include \"../../graphics/hicolor-icon-theme/buildlink3.mk\" and remove this line.");
}
} elsif ($cmd eq "imake-man") {
my (@args) = split(/\s+/, $arg);
if (@args != 3) {
@ -6910,9 +6905,28 @@ sub checkfile_PLIST($) {
} elsif ($text =~ m"^share/applications/.*\.desktop$") {
my $f = "../../sysutils/desktop-file-utils/desktopdb.mk";
if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) {
$line->log_warning("Packages that install a .desktop entry should .include \"$f\".");
$line->log_warning("Packages that install a .desktop entry may .include \"$f\".");
$line->explain_warning(
"If *.desktop files contain MimeType keys, global MIME Type registory DB",
"must be updated by desktop-file-utils.",
"Otherwise, this warning is harmless.");
}
} elsif ($pkgpath ne "graphics/hicolor-icon-theme" && $text =~ m"^share/icons/hicolor(?:$|/)") {
my $f = "../../graphics/hicolor-icon-theme/buildlink3.mk";
if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) {
$line->log_error("Please .include \"$f\"");
$line->explain_error(
"If hicolor icon themes are installed, icon theme cache must be maintained.");
}
} elsif ($pkgpath ne "graphics/gnome-icon-theme" && $text =~ m"^share/icons/gnome(?:$|/)") {
my $f = "../../graphics/gnome-icon-theme/buildlink3.mk";
if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) {
$line->log_error("Please .include \"$f\"");
$line->explain_error(
"If Gnome icon themes are installed, icon theme cache must be maintained.");
}
} elsif ($dirname eq "share/aclocal" && $basename =~ m"\.m4$") {
# Fine.