Page MenuHomeFreeBSD
Differential D17009

graphics/gmic-qt: Update to 2.3.6
ClosedPublic
Actions

Authored by jhale on Sep 4 2018, 1:49 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 8:54 AM
Unknown Object (File)
Mar 14 2025, 7:50 AM
Unknown Object (File)
Jan 28 2025, 12:35 PM
Unknown Object (File)
Dec 14 2024, 8:57 PM
Unknown Object (File)
Dec 8 2024, 4:59 PM
Unknown Object (File)
Dec 7 2024, 6:33 AM
Unknown Object (File)
Dec 5 2024, 2:39 PM
Unknown Object (File)
Dec 4 2024, 9:19 AM
View All 89 Files
Subscribers
mat
tcberner

Details

Reviewers
tcberner
Group Reviewers
kde
Commits
rP478988: Update to 2.3.6
Summary

Update graphics/gmic-qt to 2.3.6
This fixes build with Qt 5.11

@tcberner, your local copy of gmic_stdlib.h needs updated as well or I could put
in my distfiles. Either way.

Test Plan

Poudriere tests done on 10.4-i386, 11.1-amd64, 12.0-ALPHA3-amd64 with Qt 5.10 and Qt 5.11

Diff Detail

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

Event Timeline

jhale created this revision.Sep 4 2018, 1:49 AM
Herald added a subscriber: mat. · View Herald TranscriptSep 4 2018, 1:49 AM
Harbormaster completed remote builds in B19379: Diff 47630.Sep 4 2018, 1:49 AM
mat added inline comments.Sep 4 2018, 7:19 AM
graphics/gmic-qt/Makefile
43
${WRKSRC_cimg}
jhale updated this revision to Diff 47634.Sep 4 2018, 8:24 AM
  • Simplify copy command
  • Fix LICENSE
  • Remove trailing slash from install
Harbormaster completed remote builds in B19381: Diff 47634.Sep 4 2018, 8:24 AM
jhale marked an inline comment as done.Sep 4 2018, 8:24 AM

Fixed. Thanks!

tcberner added a comment.Sep 4 2018, 6:49 PM

@jhale the gmic_stdlib.h already changed again upstream. Can you send me the version you used, then I'll put it in LOCAL folder.

=> Attempting to fetch http://gmic.eu/gmic_stdlib.h
fetch: http://gmic.eu/gmic_stdlib.h: size mismatch: expected 1883290, actual 1884078
tcberner accepted this revision.Sep 4 2018, 8:00 PM

Looks good to me.

The files should be in my LOCAL/ by now.

graphics/gmic-qt/files/patch-gmic_src_gmic.cpp
1

that should probably be upstreamed [tm]

This revision is now accepted and ready to land.Sep 4 2018, 8:00 PM
jhale added inline comments.Sep 4 2018, 8:06 PM
graphics/gmic-qt/files/patch-gmic_src_gmic.cpp
1

I'll add it to my TODO list. :)

Closed by commit rP478988: Update to 2.3.6 (authored by jhale). · Explain WhySep 4 2018, 8:10 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
graphics/
gmic-qt/
19 lines
18 lines
files/
46 lines
20 lines

Diff 47634

View Options

graphics/gmic-qt/Makefile

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines
static void add_compunit(enum e_cut, char *); static void add_compunit(enum e_cut, char *);
static void add_file(char *); static void add_file(char *);
static void usage(void); static void usage(void);
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int c, fflag; int c, fflag, fflagstdin;
char *temp_arg; char *temp_arg;
(void) setlocale(LC_ALL, ""); (void) setlocale(LC_ALL, "");
fflag = 0; fflag = 0;
fflagstdin = 0;
inplace = NULL; inplace = NULL;
while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1) while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)
switch (c) { switch (c) {
case 'r': /* Gnu sed compat */ case 'r': /* Gnu sed compat */
case 'E': case 'E':
rflags = REG_EXTENDED; rflags = REG_EXTENDED;
break; break;
Show All 9 Lines case 'e':
if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL) if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)
err(1, "malloc"); err(1, "malloc");
strcpy(temp_arg, optarg); strcpy(temp_arg, optarg);
strcat(temp_arg, "\n"); strcat(temp_arg, "\n");
add_compunit(CU_STRING, temp_arg); add_compunit(CU_STRING, temp_arg);
break; break;
case 'f': case 'f':
fflag = 1; fflag = 1;
if (strcmp(optarg, "-") == 0)
fflagstdin = 1;
add_compunit(CU_FILE, optarg); add_compunit(CU_FILE, optarg);
break; break;
case 'i': case 'i':
inplace = optarg; inplace = optarg;
ispan = 0; /* don't span across input files */ ispan = 0; /* don't span across input files */
break; break;
case 'l': case 'l':
if(setvbuf(stdout, NULL, _IOLBF, 0) != 0) if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)
Show All 20 Linesmain(int argc, char *argv[])
} }
compile(); compile();
/* Continue with first and start second usage */ /* Continue with first and start second usage */
if (*argv) if (*argv)
for (; *argv; argv++) for (; *argv; argv++)
add_file(*argv); add_file(*argv);
else if (fflagstdin)
0mpAuthorUnsubmitted
Done
Inline Actions

There has to be at least one input file specified.

0mp: There has to be at least one input file specified.
exit(rval);
else else
add_file(NULL); add_file(NULL);
process(); process();
cfclose(prog, NULL); cfclose(prog, NULL);
if (fclose(stdout)) if (fclose(stdout))
err(1, "stdout"); err(1, "stdout");
exit(rval); exit(rval);
} }
Show All 27 Lines case ST_EOF:
if (script == NULL) { if (script == NULL) {
if (more != NULL) if (more != NULL)
*more = 0; *more = 0;
return (NULL); return (NULL);
} }
linenum = 0; linenum = 0;
switch (script->type) { switch (script->type) {
case CU_FILE: case CU_FILE:
if (strcmp(script->s, "-") == 0) {
if ((f = fdopen(0, "r")) == NULL)
0mpAuthorUnsubmitted
Done
Inline Actions

I am not sure if it makes any difference if I try to avoid depending on the presence of /dev/stdin by using the 0th descriptor here instead.

0mp: I am not sure if it makes any difference if I try to avoid depending on the presence of…
err(1, "%s", "stdin");
tobikUnsubmitted
Done
Inline Actions

Can this not just be f = stdin?

tobik: Can this not just be `f = stdin`?
0mpAuthorUnsubmitted
Done
Inline Actions

Good catch! The tests are still passing.

0mp: Good catch! The tests are still passing.
fname = "stdin";
0mpAuthorUnsubmitted
Done
Inline Actions

Is stdin name here alright? Perhaps it could be changed to -?

0mp: Is `stdin` name here alright? Perhaps it could be changed to `-`?
} else {
if ((f = fopen(script->s, "r")) == NULL) if ((f = fopen(script->s, "r")) == NULL)
err(1, "%s", script->s); err(1, "%s", script->s);
fname = script->s; fname = script->s;
}
state = ST_FILE; state = ST_FILE;
goto again; goto again;
case CU_STRING: case CU_STRING:
if (((size_t)snprintf(string_ident, if (((size_t)snprintf(string_ident,
sizeof(string_ident), "\"%s\"", script->s)) >= sizeof(string_ident), "\"%s\"", script->s)) >=
sizeof(string_ident) - 1) sizeof(string_ident) - 1)
(void)strcpy(string_ident + (void)strcpy(string_ident +
sizeof(string_ident) - 6, " ...\""); sizeof(string_ident) - 6, " ...\"");
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines
View Options

graphics/gmic-qt/distinfo

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines
static void add_compunit(enum e_cut, char *); static void add_compunit(enum e_cut, char *);
static void add_file(char *); static void add_file(char *);
static void usage(void); static void usage(void);
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int c, fflag; int c, fflag, fflagstdin;
char *temp_arg; char *temp_arg;
(void) setlocale(LC_ALL, ""); (void) setlocale(LC_ALL, "");
fflag = 0; fflag = 0;
fflagstdin = 0;
inplace = NULL; inplace = NULL;
while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1) while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)
switch (c) { switch (c) {
case 'r': /* Gnu sed compat */ case 'r': /* Gnu sed compat */
case 'E': case 'E':
rflags = REG_EXTENDED; rflags = REG_EXTENDED;
break; break;
Show All 9 Lines case 'e':
if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL) if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)
err(1, "malloc"); err(1, "malloc");
strcpy(temp_arg, optarg); strcpy(temp_arg, optarg);
strcat(temp_arg, "\n"); strcat(temp_arg, "\n");
add_compunit(CU_STRING, temp_arg); add_compunit(CU_STRING, temp_arg);
break; break;
case 'f': case 'f':
fflag = 1; fflag = 1;
if (strcmp(optarg, "-") == 0)
fflagstdin = 1;
add_compunit(CU_FILE, optarg); add_compunit(CU_FILE, optarg);
break; break;
case 'i': case 'i':
inplace = optarg; inplace = optarg;
ispan = 0; /* don't span across input files */ ispan = 0; /* don't span across input files */
break; break;
case 'l': case 'l':
if(setvbuf(stdout, NULL, _IOLBF, 0) != 0) if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)
Show All 20 Linesmain(int argc, char *argv[])
} }
compile(); compile();
/* Continue with first and start second usage */ /* Continue with first and start second usage */
if (*argv) if (*argv)
for (; *argv; argv++) for (; *argv; argv++)
add_file(*argv); add_file(*argv);
else if (fflagstdin)
0mpAuthorUnsubmitted
Done
Inline Actions

There has to be at least one input file specified.

0mp: There has to be at least one input file specified.
exit(rval);
else else
add_file(NULL); add_file(NULL);
process(); process();
cfclose(prog, NULL); cfclose(prog, NULL);
if (fclose(stdout)) if (fclose(stdout))
err(1, "stdout"); err(1, "stdout");
exit(rval); exit(rval);
} }
Show All 27 Lines case ST_EOF:
if (script == NULL) { if (script == NULL) {
if (more != NULL) if (more != NULL)
*more = 0; *more = 0;
return (NULL); return (NULL);
} }
linenum = 0; linenum = 0;
switch (script->type) { switch (script->type) {
case CU_FILE: case CU_FILE:
if (strcmp(script->s, "-") == 0) {
if ((f = fdopen(0, "r")) == NULL)
0mpAuthorUnsubmitted
Done
Inline Actions

I am not sure if it makes any difference if I try to avoid depending on the presence of /dev/stdin by using the 0th descriptor here instead.

0mp: I am not sure if it makes any difference if I try to avoid depending on the presence of…
err(1, "%s", "stdin");
tobikUnsubmitted
Done
Inline Actions

Can this not just be f = stdin?

tobik: Can this not just be `f = stdin`?
0mpAuthorUnsubmitted
Done
Inline Actions

Good catch! The tests are still passing.

0mp: Good catch! The tests are still passing.
fname = "stdin";
0mpAuthorUnsubmitted
Done
Inline Actions

Is stdin name here alright? Perhaps it could be changed to -?

0mp: Is `stdin` name here alright? Perhaps it could be changed to `-`?
} else {
if ((f = fopen(script->s, "r")) == NULL) if ((f = fopen(script->s, "r")) == NULL)
err(1, "%s", script->s); err(1, "%s", script->s);
fname = script->s; fname = script->s;
}
state = ST_FILE; state = ST_FILE;
goto again; goto again;
case CU_STRING: case CU_STRING:
if (((size_t)snprintf(string_ident, if (((size_t)snprintf(string_ident,
sizeof(string_ident), "\"%s\"", script->s)) >= sizeof(string_ident), "\"%s\"", script->s)) >=
sizeof(string_ident) - 1) sizeof(string_ident) - 1)
(void)strcpy(string_ident + (void)strcpy(string_ident +
sizeof(string_ident) - 6, " ...\""); sizeof(string_ident) - 6, " ...\"");
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines
View Options

graphics/gmic-qt/files/patch-CMakeLists.txt

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines
static void add_compunit(enum e_cut, char *); static void add_compunit(enum e_cut, char *);
static void add_file(char *); static void add_file(char *);
static void usage(void); static void usage(void);
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int c, fflag; int c, fflag, fflagstdin;
char *temp_arg; char *temp_arg;
(void) setlocale(LC_ALL, ""); (void) setlocale(LC_ALL, "");
fflag = 0; fflag = 0;
fflagstdin = 0;
inplace = NULL; inplace = NULL;
while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1) while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)
switch (c) { switch (c) {
case 'r': /* Gnu sed compat */ case 'r': /* Gnu sed compat */
case 'E': case 'E':
rflags = REG_EXTENDED; rflags = REG_EXTENDED;
break; break;
Show All 9 Lines case 'e':
if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL) if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)
err(1, "malloc"); err(1, "malloc");
strcpy(temp_arg, optarg); strcpy(temp_arg, optarg);
strcat(temp_arg, "\n"); strcat(temp_arg, "\n");
add_compunit(CU_STRING, temp_arg); add_compunit(CU_STRING, temp_arg);
break; break;
case 'f': case 'f':
fflag = 1; fflag = 1;
if (strcmp(optarg, "-") == 0)
fflagstdin = 1;
add_compunit(CU_FILE, optarg); add_compunit(CU_FILE, optarg);
break; break;
case 'i': case 'i':
inplace = optarg; inplace = optarg;
ispan = 0; /* don't span across input files */ ispan = 0; /* don't span across input files */
break; break;
case 'l': case 'l':
if(setvbuf(stdout, NULL, _IOLBF, 0) != 0) if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)
Show All 20 Linesmain(int argc, char *argv[])
} }
compile(); compile();
/* Continue with first and start second usage */ /* Continue with first and start second usage */
if (*argv) if (*argv)
for (; *argv; argv++) for (; *argv; argv++)
add_file(*argv); add_file(*argv);
else if (fflagstdin)
0mpAuthorUnsubmitted
Done
Inline Actions

There has to be at least one input file specified.

0mp: There has to be at least one input file specified.
exit(rval);
else else
add_file(NULL); add_file(NULL);
process(); process();
cfclose(prog, NULL); cfclose(prog, NULL);
if (fclose(stdout)) if (fclose(stdout))
err(1, "stdout"); err(1, "stdout");
exit(rval); exit(rval);
} }
Show All 27 Lines case ST_EOF:
if (script == NULL) { if (script == NULL) {
if (more != NULL) if (more != NULL)
*more = 0; *more = 0;
return (NULL); return (NULL);
} }
linenum = 0; linenum = 0;
switch (script->type) { switch (script->type) {
case CU_FILE: case CU_FILE:
if (strcmp(script->s, "-") == 0) {
if ((f = fdopen(0, "r")) == NULL)
0mpAuthorUnsubmitted
Done
Inline Actions

I am not sure if it makes any difference if I try to avoid depending on the presence of /dev/stdin by using the 0th descriptor here instead.

0mp: I am not sure if it makes any difference if I try to avoid depending on the presence of…
err(1, "%s", "stdin");
tobikUnsubmitted
Done
Inline Actions

Can this not just be f = stdin?

tobik: Can this not just be `f = stdin`?
0mpAuthorUnsubmitted
Done
Inline Actions

Good catch! The tests are still passing.

0mp: Good catch! The tests are still passing.
fname = "stdin";
0mpAuthorUnsubmitted
Done
Inline Actions

Is stdin name here alright? Perhaps it could be changed to -?

0mp: Is `stdin` name here alright? Perhaps it could be changed to `-`?
} else {
if ((f = fopen(script->s, "r")) == NULL) if ((f = fopen(script->s, "r")) == NULL)
err(1, "%s", script->s); err(1, "%s", script->s);
fname = script->s; fname = script->s;
}
state = ST_FILE; state = ST_FILE;
goto again; goto again;
case CU_STRING: case CU_STRING:
if (((size_t)snprintf(string_ident, if (((size_t)snprintf(string_ident,
sizeof(string_ident), "\"%s\"", script->s)) >= sizeof(string_ident), "\"%s\"", script->s)) >=
sizeof(string_ident) - 1) sizeof(string_ident) - 1)
(void)strcpy(string_ident + (void)strcpy(string_ident +
sizeof(string_ident) - 6, " ...\""); sizeof(string_ident) - 6, " ...\"");
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines
View Options

graphics/gmic-qt/files/patch-gmic_src_gmic.cpp

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines
static void add_compunit(enum e_cut, char *); static void add_compunit(enum e_cut, char *);
static void add_file(char *); static void add_file(char *);
static void usage(void); static void usage(void);
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int c, fflag; int c, fflag, fflagstdin;
char *temp_arg; char *temp_arg;
(void) setlocale(LC_ALL, ""); (void) setlocale(LC_ALL, "");
fflag = 0; fflag = 0;
fflagstdin = 0;
inplace = NULL; inplace = NULL;
while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1) while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)
switch (c) { switch (c) {
case 'r': /* Gnu sed compat */ case 'r': /* Gnu sed compat */
case 'E': case 'E':
rflags = REG_EXTENDED; rflags = REG_EXTENDED;
break; break;
Show All 9 Lines case 'e':
if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL) if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)
err(1, "malloc"); err(1, "malloc");
strcpy(temp_arg, optarg); strcpy(temp_arg, optarg);
strcat(temp_arg, "\n"); strcat(temp_arg, "\n");
add_compunit(CU_STRING, temp_arg); add_compunit(CU_STRING, temp_arg);
break; break;
case 'f': case 'f':
fflag = 1; fflag = 1;
if (strcmp(optarg, "-") == 0)
fflagstdin = 1;
add_compunit(CU_FILE, optarg); add_compunit(CU_FILE, optarg);
break; break;
case 'i': case 'i':
inplace = optarg; inplace = optarg;
ispan = 0; /* don't span across input files */ ispan = 0; /* don't span across input files */
break; break;
case 'l': case 'l':
if(setvbuf(stdout, NULL, _IOLBF, 0) != 0) if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)
Show All 20 Linesmain(int argc, char *argv[])
} }
compile(); compile();
/* Continue with first and start second usage */ /* Continue with first and start second usage */
if (*argv) if (*argv)
for (; *argv; argv++) for (; *argv; argv++)
add_file(*argv); add_file(*argv);
else if (fflagstdin)
0mpAuthorUnsubmitted
Done
Inline Actions

There has to be at least one input file specified.

0mp: There has to be at least one input file specified.
exit(rval);
else else
add_file(NULL); add_file(NULL);
process(); process();
cfclose(prog, NULL); cfclose(prog, NULL);
if (fclose(stdout)) if (fclose(stdout))
err(1, "stdout"); err(1, "stdout");
exit(rval); exit(rval);
} }
Show All 27 Lines case ST_EOF:
if (script == NULL) { if (script == NULL) {
if (more != NULL) if (more != NULL)
*more = 0; *more = 0;
return (NULL); return (NULL);
} }
linenum = 0; linenum = 0;
switch (script->type) { switch (script->type) {
case CU_FILE: case CU_FILE:
if (strcmp(script->s, "-") == 0) {
if ((f = fdopen(0, "r")) == NULL)
0mpAuthorUnsubmitted
Done
Inline Actions

I am not sure if it makes any difference if I try to avoid depending on the presence of /dev/stdin by using the 0th descriptor here instead.

0mp: I am not sure if it makes any difference if I try to avoid depending on the presence of…
err(1, "%s", "stdin");
tobikUnsubmitted
Done
Inline Actions

Can this not just be f = stdin?

tobik: Can this not just be `f = stdin`?
0mpAuthorUnsubmitted
Done
Inline Actions

Good catch! The tests are still passing.

0mp: Good catch! The tests are still passing.
fname = "stdin";
0mpAuthorUnsubmitted
Done
Inline Actions

Is stdin name here alright? Perhaps it could be changed to -?

0mp: Is `stdin` name here alright? Perhaps it could be changed to `-`?
} else {
if ((f = fopen(script->s, "r")) == NULL) if ((f = fopen(script->s, "r")) == NULL)
err(1, "%s", script->s); err(1, "%s", script->s);
fname = script->s; fname = script->s;
}
state = ST_FILE; state = ST_FILE;
goto again; goto again;
case CU_STRING: case CU_STRING:
if (((size_t)snprintf(string_ident, if (((size_t)snprintf(string_ident,
sizeof(string_ident), "\"%s\"", script->s)) >= sizeof(string_ident), "\"%s\"", script->s)) >=
sizeof(string_ident) - 1) sizeof(string_ident) - 1)
(void)strcpy(string_ident + (void)strcpy(string_ident +
sizeof(string_ident) - 6, " ...\""); sizeof(string_ident) - 6, " ...\"");
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines