Page MenuHomeFreeBSD
Differential D31960

graphics/gtk-update-icon-cache: use triggers
ClosedPublic
Actions

Authored by bapt on Sep 14 2021, 3:29 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 10:57 AM
Unknown Object (File)
Fri, Apr 11, 8:48 PM
Unknown Object (File)
Sun, Apr 6, 7:19 AM
Unknown Object (File)
Sat, Mar 29, 11:22 PM
Unknown Object (File)
Mon, Mar 24, 11:30 AM
Unknown Object (File)
Tue, Mar 18, 2:39 PM
Unknown Object (File)
Mar 13 2025, 7:07 AM
Unknown Object (File)
Feb 27 2025, 6:39 PM
View All Files
Subscribers
Alexander88207_protonmail.com
mat

Details

Reviewers
tcberner
Group Reviewers
portmgr
Commits
R11:46bcb098c82f: graphics/gtk-update-icon-cache: use triggers
R11:6f5d234138dc: framework: new USES trigger
Summary

Use triggers instead of enforcing the INSTALL_ICONS which enforces
gtk-update-icon-cache dependency on every ports installing icons.

The bonus:

  • factorize gtk-update-icon-cache update at the end of the build
  • stop adding a gratuicious dependency on gtk-update-icon-cache on packages which do not need it
  • works on packages where INSTALLS_ICONS were forgotten

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 41903
Build 38791: arc lint + arc unit

Event Timeline

bapt created this revision.Sep 14 2021, 3:29 PM
Herald added 1 blocking reviewer(s): portmgr. · View Herald TranscriptSep 14 2021, 3:29 PM
Herald added a subscriber: mat. · View Herald Transcript
bapt requested review of this revision.Sep 14 2021, 3:29 PM
Harbormaster completed remote builds in B41511: Diff 95153.Sep 14 2021, 3:30 PM
bapt updated this revision to Diff 95154.Sep 14 2021, 4:03 PM

Create USES=trigger to simplify everything

Harbormaster completed remote builds in B41512: Diff 95154.Sep 14 2021, 4:03 PM
tcberner added a comment.Sep 14 2021, 4:08 PM
In D31960#720956, @bapt wrote:

Create USES=trigger to simplify everything

very nice

tcberner added inline comments.Sep 14 2021, 4:09 PM
Mk/Uses/trigger.mk
7

maybe add
defaults to ${PORTNAME}.

tcberner added a comment.Sep 14 2021, 4:13 PM

I assume the obsolete INSTALLS_ICONS lines in all the other ports are just not part of this review for brevity?

Alexander88207_protonmail.com added a subscriber: Alexander88207_protonmail.com.Sep 20 2021, 5:23 AM
bapt updated this revision to Diff 95433.Sep 21 2021, 8:29 AM

Fix leftovers

Harbormaster completed remote builds in B41617: Diff 95433.Sep 21 2021, 8:29 AM
bapt marked an inline comment as done.Sep 23 2021, 7:59 PM
bapt updated this revision to Diff 96106.Oct 1 2021, 8:29 PM

Fix share/icons leftover

Harbormaster completed remote builds in B41903: Diff 96106.Oct 1 2021, 8:29 PM
This revision was not accepted when it landed; it landed in state Needs Review.Oct 10 2021, 5:47 PM
Closed by commit R11:6f5d234138dc: framework: new USES trigger (authored by bapt). · Explain Why
This revision was automatically updated to reflect the committed changes.
bapt added a commit: R11:6f5d234138dc: framework: new USES trigger.
bapt added a commit: R11:46bcb098c82f: graphics/gtk-update-icon-cache: use triggers.

Revision Contents
Changeset List

PathSize
Mk/
Uses/
25 lines
29 lines
graphics/
gtk-update-icon-cache/
3 lines
files/
30 lines

Diff 96106

View Options

Mk/Uses/gnome.mk

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines
#include "stand.h" #include "stand.h"
#include "net.h" #include "net.h"
#include "netif.h" #include "netif.h"
#include "bootp.h" #include "bootp.h"
struct in_addr servip; struct in_addr servip;
static n_long nmask, smask;
static time_t bot; static time_t bot;
static char vm_rfc1048[4] = VM_RFC1048; static char vm_rfc1048[4] = VM_RFC1048;
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static char vm_cmu[4] = VM_CMU; static char vm_cmu[4] = VM_CMU;
#endif #endif
/* Local forwards */ /* Local forwards */
▲ Show 20 Lines • Show All 143 Lines • ▼ Show 20 Lines
#endif #endif
myip = d->myip = rbuf.rbootp.bp_yiaddr; myip = d->myip = rbuf.rbootp.bp_yiaddr;
servip = rbuf.rbootp.bp_siaddr; servip = rbuf.rbootp.bp_siaddr;
if(rootip.s_addr == INADDR_ANY) rootip = servip; if(rootip.s_addr == INADDR_ANY) rootip = servip;
bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile)); bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile));
bootfile[sizeof(bootfile) - 1] = '\0'; bootfile[sizeof(bootfile) - 1] = '\0';
if (IN_CLASSA(ntohl(myip.s_addr)))
nmask = htonl(IN_CLASSA_NET);
else if (IN_CLASSB(ntohl(myip.s_addr)))
nmask = htonl(IN_CLASSB_NET);
else
nmask = htonl(IN_CLASSC_NET);
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("'native netmask' is %s\n", intoa(nmask));
#endif
/* Check subnet mask against net mask; toss if bogus */
if ((nmask & smask) != nmask) {
#ifdef BOOTP_DEBUG
if (debug)
printf("subnet mask (%s) bad\n", intoa(smask));
#endif
smask = 0;
}
/* Get subnet (or natural net) mask */
netmask = nmask;
if (smask)
netmask = smask;
#ifdef BOOTP_DEBUG
if (debug)
printf("mask: %s\n", intoa(netmask)); printf("mask: %s\n", intoa(netmask));
#endif #endif
/* We need a gateway if root is on a different net */ /* We need a gateway if root is on a different net */
if (!SAMENET(myip, rootip, netmask)) { if (!SAMENET(myip, rootip, netmask)) {
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("need gateway for root ip\n"); printf("need gateway for root ip\n");
▲ Show 20 Lines • Show All 120 Lines • ▼ Show 20 Lines#endif
while (cp < ep) { while (cp < ep) {
tag = *cp++; tag = *cp++;
size = *cp++; size = *cp++;
if (tag == TAG_END) if (tag == TAG_END)
break; break;
if (tag == TAG_SUBNET_MASK) { if (tag == TAG_SUBNET_MASK) {
bcopy(cp, &smask, sizeof(smask)); bcopy(cp, &netmask, sizeof(netmask));
} }
if (tag == TAG_GATEWAY) { if (tag == TAG_GATEWAY) {
bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr)); bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr));
} }
if (tag == TAG_SWAPSERVER) { if (tag == TAG_SWAPSERVER) {
/* let it override bp_siaddr */ /* let it override bp_siaddr */
bcopy(cp, &rootip.s_addr, sizeof(rootip.s_addr)); bcopy(cp, &rootip.s_addr, sizeof(rootip.s_addr));
} }
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("vend_cmu bootp info.\n"); printf("vend_cmu bootp info.\n");
#endif #endif
vp = (struct cmu_vend *)cp; vp = (struct cmu_vend *)cp;
if (vp->v_smask.s_addr != 0) { if (vp->v_smask.s_addr != 0) {
smask = vp->v_smask.s_addr; netmask = vp->v_smask.s_addr;
} }
if (vp->v_dgate.s_addr != 0) { if (vp->v_dgate.s_addr != 0) {
gateip = vp->v_dgate; gateip = vp->v_dgate;
} }
} }
#endif #endif
#ifdef DHCP_ENV #ifdef DHCP_ENV
▲ Show 20 Lines • Show All 315 Lines • Show Last 20 Lines
View Options

Mk/Uses/trigger.mk

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines
#include "stand.h" #include "stand.h"
#include "net.h" #include "net.h"
#include "netif.h" #include "netif.h"
#include "bootp.h" #include "bootp.h"
struct in_addr servip; struct in_addr servip;
static n_long nmask, smask;
static time_t bot; static time_t bot;
static char vm_rfc1048[4] = VM_RFC1048; static char vm_rfc1048[4] = VM_RFC1048;
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static char vm_cmu[4] = VM_CMU; static char vm_cmu[4] = VM_CMU;
#endif #endif
/* Local forwards */ /* Local forwards */
▲ Show 20 Lines • Show All 143 Lines • ▼ Show 20 Lines
#endif #endif
myip = d->myip = rbuf.rbootp.bp_yiaddr; myip = d->myip = rbuf.rbootp.bp_yiaddr;
servip = rbuf.rbootp.bp_siaddr; servip = rbuf.rbootp.bp_siaddr;
if(rootip.s_addr == INADDR_ANY) rootip = servip; if(rootip.s_addr == INADDR_ANY) rootip = servip;
bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile)); bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile));
bootfile[sizeof(bootfile) - 1] = '\0'; bootfile[sizeof(bootfile) - 1] = '\0';
if (IN_CLASSA(ntohl(myip.s_addr)))
nmask = htonl(IN_CLASSA_NET);
else if (IN_CLASSB(ntohl(myip.s_addr)))
nmask = htonl(IN_CLASSB_NET);
else
nmask = htonl(IN_CLASSC_NET);
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("'native netmask' is %s\n", intoa(nmask));
#endif
/* Check subnet mask against net mask; toss if bogus */
if ((nmask & smask) != nmask) {
#ifdef BOOTP_DEBUG
if (debug)
printf("subnet mask (%s) bad\n", intoa(smask));
#endif
smask = 0;
}
/* Get subnet (or natural net) mask */
netmask = nmask;
if (smask)
netmask = smask;
#ifdef BOOTP_DEBUG
if (debug)
printf("mask: %s\n", intoa(netmask)); printf("mask: %s\n", intoa(netmask));
#endif #endif
/* We need a gateway if root is on a different net */ /* We need a gateway if root is on a different net */
if (!SAMENET(myip, rootip, netmask)) { if (!SAMENET(myip, rootip, netmask)) {
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("need gateway for root ip\n"); printf("need gateway for root ip\n");
▲ Show 20 Lines • Show All 120 Lines • ▼ Show 20 Lines#endif
while (cp < ep) { while (cp < ep) {
tag = *cp++; tag = *cp++;
size = *cp++; size = *cp++;
if (tag == TAG_END) if (tag == TAG_END)
break; break;
if (tag == TAG_SUBNET_MASK) { if (tag == TAG_SUBNET_MASK) {
bcopy(cp, &smask, sizeof(smask)); bcopy(cp, &netmask, sizeof(netmask));
} }
if (tag == TAG_GATEWAY) { if (tag == TAG_GATEWAY) {
bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr)); bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr));
} }
if (tag == TAG_SWAPSERVER) { if (tag == TAG_SWAPSERVER) {
/* let it override bp_siaddr */ /* let it override bp_siaddr */
bcopy(cp, &rootip.s_addr, sizeof(rootip.s_addr)); bcopy(cp, &rootip.s_addr, sizeof(rootip.s_addr));
} }
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("vend_cmu bootp info.\n"); printf("vend_cmu bootp info.\n");
#endif #endif
vp = (struct cmu_vend *)cp; vp = (struct cmu_vend *)cp;
if (vp->v_smask.s_addr != 0) { if (vp->v_smask.s_addr != 0) {
smask = vp->v_smask.s_addr; netmask = vp->v_smask.s_addr;
} }
if (vp->v_dgate.s_addr != 0) { if (vp->v_dgate.s_addr != 0) {
gateip = vp->v_dgate; gateip = vp->v_dgate;
} }
} }
#endif #endif
#ifdef DHCP_ENV #ifdef DHCP_ENV
▲ Show 20 Lines • Show All 315 Lines • Show Last 20 Lines
View Options

graphics/gtk-update-icon-cache/Makefile

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines
#include "stand.h" #include "stand.h"
#include "net.h" #include "net.h"
#include "netif.h" #include "netif.h"
#include "bootp.h" #include "bootp.h"
struct in_addr servip; struct in_addr servip;
static n_long nmask, smask;
static time_t bot; static time_t bot;
static char vm_rfc1048[4] = VM_RFC1048; static char vm_rfc1048[4] = VM_RFC1048;
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static char vm_cmu[4] = VM_CMU; static char vm_cmu[4] = VM_CMU;
#endif #endif
/* Local forwards */ /* Local forwards */
▲ Show 20 Lines • Show All 143 Lines • ▼ Show 20 Lines
#endif #endif
myip = d->myip = rbuf.rbootp.bp_yiaddr; myip = d->myip = rbuf.rbootp.bp_yiaddr;
servip = rbuf.rbootp.bp_siaddr; servip = rbuf.rbootp.bp_siaddr;
if(rootip.s_addr == INADDR_ANY) rootip = servip; if(rootip.s_addr == INADDR_ANY) rootip = servip;
bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile)); bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile));
bootfile[sizeof(bootfile) - 1] = '\0'; bootfile[sizeof(bootfile) - 1] = '\0';
if (IN_CLASSA(ntohl(myip.s_addr)))
nmask = htonl(IN_CLASSA_NET);
else if (IN_CLASSB(ntohl(myip.s_addr)))
nmask = htonl(IN_CLASSB_NET);
else
nmask = htonl(IN_CLASSC_NET);
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("'native netmask' is %s\n", intoa(nmask));
#endif
/* Check subnet mask against net mask; toss if bogus */
if ((nmask & smask) != nmask) {
#ifdef BOOTP_DEBUG
if (debug)
printf("subnet mask (%s) bad\n", intoa(smask));
#endif
smask = 0;
}
/* Get subnet (or natural net) mask */
netmask = nmask;
if (smask)
netmask = smask;
#ifdef BOOTP_DEBUG
if (debug)
printf("mask: %s\n", intoa(netmask)); printf("mask: %s\n", intoa(netmask));
#endif #endif
/* We need a gateway if root is on a different net */ /* We need a gateway if root is on a different net */
if (!SAMENET(myip, rootip, netmask)) { if (!SAMENET(myip, rootip, netmask)) {
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("need gateway for root ip\n"); printf("need gateway for root ip\n");
▲ Show 20 Lines • Show All 120 Lines • ▼ Show 20 Lines#endif
while (cp < ep) { while (cp < ep) {
tag = *cp++; tag = *cp++;
size = *cp++; size = *cp++;
if (tag == TAG_END) if (tag == TAG_END)
break; break;
if (tag == TAG_SUBNET_MASK) { if (tag == TAG_SUBNET_MASK) {
bcopy(cp, &smask, sizeof(smask)); bcopy(cp, &netmask, sizeof(netmask));
} }
if (tag == TAG_GATEWAY) { if (tag == TAG_GATEWAY) {
bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr)); bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr));
} }
if (tag == TAG_SWAPSERVER) { if (tag == TAG_SWAPSERVER) {
/* let it override bp_siaddr */ /* let it override bp_siaddr */
bcopy(cp, &rootip.s_addr, sizeof(rootip.s_addr)); bcopy(cp, &rootip.s_addr, sizeof(rootip.s_addr));
} }
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("vend_cmu bootp info.\n"); printf("vend_cmu bootp info.\n");
#endif #endif
vp = (struct cmu_vend *)cp; vp = (struct cmu_vend *)cp;
if (vp->v_smask.s_addr != 0) { if (vp->v_smask.s_addr != 0) {
smask = vp->v_smask.s_addr; netmask = vp->v_smask.s_addr;
} }
if (vp->v_dgate.s_addr != 0) { if (vp->v_dgate.s_addr != 0) {
gateip = vp->v_dgate; gateip = vp->v_dgate;
} }
} }
#endif #endif
#ifdef DHCP_ENV #ifdef DHCP_ENV
▲ Show 20 Lines • Show All 315 Lines • Show Last 20 Lines
View Options

graphics/gtk-update-icon-cache/files/gtk-update-icon-cache.ucl.in

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines
#include "stand.h" #include "stand.h"
#include "net.h" #include "net.h"
#include "netif.h" #include "netif.h"
#include "bootp.h" #include "bootp.h"
struct in_addr servip; struct in_addr servip;
static n_long nmask, smask;
static time_t bot; static time_t bot;
static char vm_rfc1048[4] = VM_RFC1048; static char vm_rfc1048[4] = VM_RFC1048;
#ifdef BOOTP_VEND_CMU #ifdef BOOTP_VEND_CMU
static char vm_cmu[4] = VM_CMU; static char vm_cmu[4] = VM_CMU;
#endif #endif
/* Local forwards */ /* Local forwards */
▲ Show 20 Lines • Show All 143 Lines • ▼ Show 20 Lines
#endif #endif
myip = d->myip = rbuf.rbootp.bp_yiaddr; myip = d->myip = rbuf.rbootp.bp_yiaddr;
servip = rbuf.rbootp.bp_siaddr; servip = rbuf.rbootp.bp_siaddr;
if(rootip.s_addr == INADDR_ANY) rootip = servip; if(rootip.s_addr == INADDR_ANY) rootip = servip;
bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile)); bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile));
bootfile[sizeof(bootfile) - 1] = '\0'; bootfile[sizeof(bootfile) - 1] = '\0';
if (IN_CLASSA(ntohl(myip.s_addr)))
nmask = htonl(IN_CLASSA_NET);
else if (IN_CLASSB(ntohl(myip.s_addr)))
nmask = htonl(IN_CLASSB_NET);
else
nmask = htonl(IN_CLASSC_NET);
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("'native netmask' is %s\n", intoa(nmask));
#endif
/* Check subnet mask against net mask; toss if bogus */
if ((nmask & smask) != nmask) {
#ifdef BOOTP_DEBUG
if (debug)
printf("subnet mask (%s) bad\n", intoa(smask));
#endif
smask = 0;
}
/* Get subnet (or natural net) mask */
netmask = nmask;
if (smask)
netmask = smask;
#ifdef BOOTP_DEBUG
if (debug)
printf("mask: %s\n", intoa(netmask)); printf("mask: %s\n", intoa(netmask));
#endif #endif
/* We need a gateway if root is on a different net */ /* We need a gateway if root is on a different net */
if (!SAMENET(myip, rootip, netmask)) { if (!SAMENET(myip, rootip, netmask)) {
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("need gateway for root ip\n"); printf("need gateway for root ip\n");
▲ Show 20 Lines • Show All 120 Lines • ▼ Show 20 Lines#endif
while (cp < ep) { while (cp < ep) {
tag = *cp++; tag = *cp++;
size = *cp++; size = *cp++;
if (tag == TAG_END) if (tag == TAG_END)
break; break;
if (tag == TAG_SUBNET_MASK) { if (tag == TAG_SUBNET_MASK) {
bcopy(cp, &smask, sizeof(smask)); bcopy(cp, &netmask, sizeof(netmask));
} }
if (tag == TAG_GATEWAY) { if (tag == TAG_GATEWAY) {
bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr)); bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr));
} }
if (tag == TAG_SWAPSERVER) { if (tag == TAG_SWAPSERVER) {
/* let it override bp_siaddr */ /* let it override bp_siaddr */
bcopy(cp, &rootip.s_addr, sizeof(rootip.s_addr)); bcopy(cp, &rootip.s_addr, sizeof(rootip.s_addr));
} }
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("vend_cmu bootp info.\n"); printf("vend_cmu bootp info.\n");
#endif #endif
vp = (struct cmu_vend *)cp; vp = (struct cmu_vend *)cp;
if (vp->v_smask.s_addr != 0) { if (vp->v_smask.s_addr != 0) {
smask = vp->v_smask.s_addr; netmask = vp->v_smask.s_addr;
} }
if (vp->v_dgate.s_addr != 0) { if (vp->v_dgate.s_addr != 0) {
gateip = vp->v_dgate; gateip = vp->v_dgate;
} }
} }
#endif #endif
#ifdef DHCP_ENV #ifdef DHCP_ENV
▲ Show 20 Lines • Show All 315 Lines • Show Last 20 Lines