Page MenuHomeFreeBSD
Differential D12969

textproc/fcitx-qt5: Update to 1.1.1
ClosedPublic
Actions

Authored by yuri on Nov 6 2017, 2:40 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 4, 8:45 PM
Unknown Object (File)
Feb 23 2025, 5:45 AM
Unknown Object (File)
Feb 19 2025, 5:06 AM
Unknown Object (File)
Feb 15 2025, 7:33 PM
Unknown Object (File)
Feb 5 2025, 3:36 AM
Unknown Object (File)
Feb 3 2025, 10:09 PM
Unknown Object (File)
Jan 19 2025, 4:45 PM
Unknown Object (File)
Jan 7 2025, 9:49 AM
View All 79 Files
Subscribers
mat

Details

Reviewers
tcberner
adamw
Commits
rP453703: textproc/fcitx-qt5: Update to 1.1.1
Summary

Simple update

Diff Detail

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

Event Timeline

yuri created this revision.Nov 6 2017, 2:40 AM
Herald added a subscriber: mat. · View Herald TranscriptNov 6 2017, 2:40 AM
yuri updated this revision to Diff 34867.Nov 6 2017, 11:12 PM

DISTVERSION

Harbormaster completed remote builds in B12523: Diff 34867.Nov 7 2017, 3:51 PM
mat added inline comments.Nov 7 2017, 4:50 PM
textproc/fcitx-qt5/Makefile
19

kde:5 was at the right place before, why move it ?

yuri updated this revision to Diff 34885.Nov 7 2017, 5:05 PM

Restored kde position in USES.

Harbormaster completed remote builds in B12533: Diff 34885.Nov 7 2017, 5:05 PM
yuri marked an inline comment as done.Nov 7 2017, 5:05 PM
tcberner accepted this revision.Nov 7 2017, 9:29 PM

The USES could be moved above USE_GITHUB. Otherwise, it looks fine :)

This revision is now accepted and ready to land.Nov 7 2017, 9:29 PM
yuri closed this revision.Nov 7 2017, 9:36 PM

Commit failed to close the revision again.

tcberner added a comment.Nov 7 2017, 9:43 PM

You have to give it some time. I recently waited around a week for one to close :)

Revision Contents
Changeset List

PathSize
textproc/
fcitx-qt5/
8 lines
6 lines

Diff 34885

View Options

textproc/fcitx-qt5/Makefile

Show First 20 Lines • Show All 99 Lines • ▼ Show 20 Linesstatic struct timecounter arm_tmr_timecount = {
.tc_counter_mask = ~0u, .tc_counter_mask = ~0u,
.tc_frequency = 0, .tc_frequency = 0,
.tc_quality = 1000, .tc_quality = 1000,
}; };
static int static int
get_freq(void) get_freq(void)
{ {
uint32_t val; return (cp15_cntfrq_get());
impUnsubmitted
Not Done
Inline Actions

When wouldn't this be defined?

imp: When wouldn't this be defined?
andrewAuthorUnsubmitted
Not Done
Inline Actions

On aarch64

andrew: On aarch64
/* cntfrq */
__asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (val));
return (val);
} }
static long static long
get_cntxct(bool physical) get_cntxct(bool physical)
{ {
uint64_t val; uint64_t val;
isb(); isb();
if (physical) if (physical)
/* cntpct */ val = cp15_cntpct_get();
__asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (val));
else else
/* cntvct */ val = cp15_cntvct_get();
__asm volatile("mrrc p15, 1, %Q0, %R0, c14" : "=r" (val));
return (val); return (val);
} }
static int static int
set_ctrl(uint32_t val, bool physical) set_ctrl(uint32_t val, bool physical)
{ {
if (physical) if (physical)
/* cntp_ctl */ cp15_cntp_ctl_set(val);
__asm volatile("mcr p15, 0, %[val], c14, c2, 1" : :
[val] "r" (val));
else else
/* cntv_ctl */ cp15_cntv_ctl_set(val);
__asm volatile("mcr p15, 0, %[val], c14, c3, 1" : :
[val] "r" (val));
isb(); isb();
return (0); return (0);
} }
static int static int
set_tval(uint32_t val, bool physical) set_tval(uint32_t val, bool physical)
{ {
if (physical) if (physical)
/* cntp_tval */ cp15_cntp_tval_set(val);
__asm volatile("mcr p15, 0, %[val], c14, c2, 0" : :
[val] "r" (val));
else else
/* cntv_tval */ cp15_cntv_tval_set(val);
__asm volatile("mcr p15, 0, %[val], c14, c3, 0" : :
[val] "r" (val));
isb(); isb();
return (0); return (0);
} }
static int static int
get_ctrl(bool physical) get_ctrl(bool physical)
{ {
uint32_t val; uint32_t val;
if (physical) if (physical)
/* cntp_ctl */ val = cp15_cntp_ctl_get();
__asm volatile("mrc p15, 0, %0, c14, c2, 1" : "=r" (val));
else else
/* cntv_ctl */ val = cp15_cntv_ctl_get();
__asm volatile("mrc p15, 0, %0, c14, c3, 1" : "=r" (val));
return (val); return (val);
} }
static void static void
disable_user_access(void) disable_user_access(void)
{ {
uint32_t cntkctl; uint32_t cntkctl;
__asm volatile("mrc p15, 0, %0, c14, c1, 0" : "=r" (cntkctl)); cntkctl = cp15_cntkctl_get();
cntkctl &= ~(GT_CNTKCTL_PL0PTEN | GT_CNTKCTL_PL0VTEN | cntkctl &= ~(GT_CNTKCTL_PL0PTEN | GT_CNTKCTL_PL0VTEN |
GT_CNTKCTL_EVNTEN | GT_CNTKCTL_PL0VCTEN | GT_CNTKCTL_PL0PCTEN); GT_CNTKCTL_EVNTEN | GT_CNTKCTL_PL0VCTEN | GT_CNTKCTL_PL0PCTEN);
__asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl)); cp15_cntkctl_set(cntkctl);
isb(); isb();
} }
static unsigned static unsigned
arm_tmr_get_timecount(struct timecounter *tc) arm_tmr_get_timecount(struct timecounter *tc)
{ {
return (get_cntxct(arm_tmr_sc->physical)); return (get_cntxct(arm_tmr_sc->physical));
▲ Show 20 Lines • Show All 204 Lines • Show Last 20 Lines
View Options

textproc/fcitx-qt5/distinfo

Show First 20 Lines • Show All 99 Lines • ▼ Show 20 Linesstatic struct timecounter arm_tmr_timecount = {
.tc_counter_mask = ~0u, .tc_counter_mask = ~0u,
.tc_frequency = 0, .tc_frequency = 0,
.tc_quality = 1000, .tc_quality = 1000,
}; };
static int static int
get_freq(void) get_freq(void)
{ {
uint32_t val; return (cp15_cntfrq_get());
impUnsubmitted
Not Done
Inline Actions

When wouldn't this be defined?

imp: When wouldn't this be defined?
andrewAuthorUnsubmitted
Not Done
Inline Actions

On aarch64

andrew: On aarch64
/* cntfrq */
__asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (val));
return (val);
} }
static long static long
get_cntxct(bool physical) get_cntxct(bool physical)
{ {
uint64_t val; uint64_t val;
isb(); isb();
if (physical) if (physical)
/* cntpct */ val = cp15_cntpct_get();
__asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (val));
else else
/* cntvct */ val = cp15_cntvct_get();
__asm volatile("mrrc p15, 1, %Q0, %R0, c14" : "=r" (val));
return (val); return (val);
} }
static int static int
set_ctrl(uint32_t val, bool physical) set_ctrl(uint32_t val, bool physical)
{ {
if (physical) if (physical)
/* cntp_ctl */ cp15_cntp_ctl_set(val);
__asm volatile("mcr p15, 0, %[val], c14, c2, 1" : :
[val] "r" (val));
else else
/* cntv_ctl */ cp15_cntv_ctl_set(val);
__asm volatile("mcr p15, 0, %[val], c14, c3, 1" : :
[val] "r" (val));
isb(); isb();
return (0); return (0);
} }
static int static int
set_tval(uint32_t val, bool physical) set_tval(uint32_t val, bool physical)
{ {
if (physical) if (physical)
/* cntp_tval */ cp15_cntp_tval_set(val);
__asm volatile("mcr p15, 0, %[val], c14, c2, 0" : :
[val] "r" (val));
else else
/* cntv_tval */ cp15_cntv_tval_set(val);
__asm volatile("mcr p15, 0, %[val], c14, c3, 0" : :
[val] "r" (val));
isb(); isb();
return (0); return (0);
} }
static int static int
get_ctrl(bool physical) get_ctrl(bool physical)
{ {
uint32_t val; uint32_t val;
if (physical) if (physical)
/* cntp_ctl */ val = cp15_cntp_ctl_get();
__asm volatile("mrc p15, 0, %0, c14, c2, 1" : "=r" (val));
else else
/* cntv_ctl */ val = cp15_cntv_ctl_get();
__asm volatile("mrc p15, 0, %0, c14, c3, 1" : "=r" (val));
return (val); return (val);
} }
static void static void
disable_user_access(void) disable_user_access(void)
{ {
uint32_t cntkctl; uint32_t cntkctl;
__asm volatile("mrc p15, 0, %0, c14, c1, 0" : "=r" (cntkctl)); cntkctl = cp15_cntkctl_get();
cntkctl &= ~(GT_CNTKCTL_PL0PTEN | GT_CNTKCTL_PL0VTEN | cntkctl &= ~(GT_CNTKCTL_PL0PTEN | GT_CNTKCTL_PL0VTEN |
GT_CNTKCTL_EVNTEN | GT_CNTKCTL_PL0VCTEN | GT_CNTKCTL_PL0PCTEN); GT_CNTKCTL_EVNTEN | GT_CNTKCTL_PL0VCTEN | GT_CNTKCTL_PL0PCTEN);
__asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl)); cp15_cntkctl_set(cntkctl);
isb(); isb();
} }
static unsigned static unsigned
arm_tmr_get_timecount(struct timecounter *tc) arm_tmr_get_timecount(struct timecounter *tc)
{ {
return (get_cntxct(arm_tmr_sc->physical)); return (get_cntxct(arm_tmr_sc->physical));
▲ Show 20 Lines • Show All 204 Lines • Show Last 20 Lines