View | Details | Raw Unified | Return to bug 223498
Collapse All | Expand All

(-)portlint (-3 / +19 lines)
Lines 153-159 Link Here
153
	WRKDIR WRKSRC NO_WRKSUBDIR SCRIPTDIR FILESDIR
153
	WRKDIR WRKSRC NO_WRKSUBDIR SCRIPTDIR FILESDIR
154
	PKGDIR COMMENT DESCR PLIST PKGCATEGORY PKGINSTALL PKGDEINSTALL
154
	PKGDIR COMMENT DESCR PLIST PKGCATEGORY PKGINSTALL PKGDEINSTALL
155
	PKGREQ PKGMESSAGE DISTINFO_FILE .CURDIR USE_LDCONFIG USE_AUTOTOOLS
155
	PKGREQ PKGMESSAGE DISTINFO_FILE .CURDIR USE_LDCONFIG USE_AUTOTOOLS
156
	USE_GNOME USE_PERL5 INDEXFILE PKGORIGIN CONFLICTS PKG_VERSION
156
	USE_GNOME USE_PERL5 USE_QT5 INDEXFILE PKGORIGIN CONFLICTS PKG_VERSION
157
	PLIST_FILES PLIST_DIRS PORTDOCS PORTEXAMPLES
157
	PLIST_FILES PLIST_DIRS PORTDOCS PORTEXAMPLES
158
	OPTIONS_DEFINE OPTIONS_RADIO OPTIONS_SINGLE OPTIONS_MULTI
158
	OPTIONS_DEFINE OPTIONS_RADIO OPTIONS_SINGLE OPTIONS_MULTI
159
	OPTIONS_GROUP OPTIONS_SUB INSTALLS_OMF USE_RC_SUBR USES DIST_SUBDIR
159
	OPTIONS_GROUP OPTIONS_SUB INSTALLS_OMF USE_RC_SUBR USES DIST_SUBDIR
Lines 776-782 Link Here
776
		}
776
		}
777
777
778
		if ($_ =~ m|^share/icons/.*/| &&
778
		if ($_ =~ m|^share/icons/.*/| &&
779
			$makevar{INSTALLS_ICONS} eq '') {
779
			$makevar{INSTALLS_ICONS} eq '' &&
780
			needs_installs_icons()) {
780
			&perror("WARN", $file, $., "installing icons, ".
781
			&perror("WARN", $file, $., "installing icons, ".
781
				"please define INSTALLS_ICONS as appropriate");
782
				"please define INSTALLS_ICONS as appropriate");
782
		}
783
		}
Lines 1476-1482 Link Here
1476
					"If possible, install this file with a different name.");
1477
					"If possible, install this file with a different name.");
1477
			}
1478
			}
1478
			if ($plist_file =~ m|^share/icons/.*/| &&
1479
			if ($plist_file =~ m|^share/icons/.*/| &&
1479
				$makevar{INSTALLS_ICONS} eq '') {
1480
				$makevar{INSTALLS_ICONS} eq '' &&
1481
				needs_installs_icons()) {
1480
				&perror("WARN", "", -1, "PLIST_FILES: installing icons, ".
1482
				&perror("WARN", "", -1, "PLIST_FILES: installing icons, ".
1481
					"please define INSTALLS_ICONS as appropriate");
1483
					"please define INSTALLS_ICONS as appropriate");
1482
			}
1484
			}
Lines 1825-1830 Link Here
1825
	}
1827
	}
1826
1828
1827
	#
1829
	#
1830
	# whole file: using INSTALLS_ICONS when it is not wanted
1831
	#
1832
	if (!($makevar{INSTALLS_ICONS} eq '') &&
1833
		!needs_installs_icons()) {
1834
		&perror("WARN", $file, -1, "INSTALLS_ICONS is set, but should not be.");
1835
	}
1836
1837
	#
1828
	# whole file: EXPIRATION_DATE
1838
	# whole file: EXPIRATION_DATE
1829
	#
1839
	#
1830
	print "OK: checking for valid EXPIRATION_DATE.\n" if ($verbose);
1840
	print "OK: checking for valid EXPIRATION_DATE.\n" if ($verbose);
Lines 3570-3575 Link Here
3570
}
3580
}
3571
sub TRUE {1;}
3581
sub TRUE {1;}
3572
3582
3583
# GNOME wants INSTALL_ICONS, but Qt-based applications, including KDE, don't.
3584
# Be pessimistic: everything needs it unless we know it doesn't.
3585
sub needs_installs_icons {
3586
	return $makevar{USE_QT5} eq ''
3587
}
3588
3573
# Local variables:
3589
# Local variables:
3574
# tab-width: 4
3590
# tab-width: 4
3575
# End:
3591
# End:

Return to bug 223498