Page MenuHomeFreeBSD
Differential D9335

Update phonon to 4.9.1
ClosedPublic
Actions

Authored by tcberner on Jan 25 2017, 6:02 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 8, 12:33 AM
Unknown Object (File)
Mar 1 2025, 7:41 PM
Unknown Object (File)
Feb 26 2025, 10:13 PM
Unknown Object (File)
Feb 18 2025, 11:18 PM
Unknown Object (File)
Feb 4 2025, 5:16 PM
Unknown Object (File)
Feb 3 2025, 3:43 AM
Unknown Object (File)
Dec 5 2024, 11:30 AM
Unknown Object (File)
Dec 1 2024, 10:34 AM
View All Files
Subscribers
None

Details

Reviewers
adridg
rakuco
mat
Group Reviewers
kde
Commits
rP432527: Update phonon to 4.9.1
Summary

The backends have not been updated

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

tcberner updated this revision to Diff 24440.Jan 25 2017, 6:02 PM
tcberner retitled this revision from to Update phonon to 4.9.1.
tcberner updated this object.
tcberner edited the test plan for this revision. (Show Details)
tcberner added reviewers: kde, rakuco, mat, adridg.
rakuco accepted this revision.Jan 26 2017, 11:12 AM
rakuco edited edge metadata.

lgtm

This revision is now accepted and ready to land.Jan 26 2017, 11:12 AM
Closed by commit rP432527: Update phonon to 4.9.1 (authored by tcberner). · Explain WhyJan 26 2017, 6:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
multimedia/
phonon-designerplugin/
4 lines
phonon/
4 lines
6 lines
qt5-phonon4-designerplugin/
5 lines
qt5-phonon4/
3 lines
6 lines

Diff 24485

View Options

head/multimedia/phonon-designerplugin/Makefile

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Lines
#include <wctype.h> #include <wctype.h>
#include "fastmatch.h" #include "fastmatch.h"
#include "grep.h" #include "grep.h"
static int linesqueued; static int linesqueued;
static int procline(struct str *l, int); static int procline(struct str *l, int);
static int lasta;
static bool ctxover;
bool bool
file_matching(const char *fname) file_matching(const char *fname)
{ {
char *fname_base, *fname_buf; char *fname_base, *fname_buf;
bool ret; bool ret;
ret = finclude ? false : true; ret = finclude ? false : true;
fname_buf = strdup(fname); fname_buf = strdup(fname);
▲ Show 20 Lines • Show All 141 Lines • ▼ Show 20 Lines if (!sflag)
warn("%s", fn); warn("%s", fn);
return (0); return (0);
} }
ln.file = grep_malloc(strlen(fn) + 1); ln.file = grep_malloc(strlen(fn) + 1);
strcpy(ln.file, fn); strcpy(ln.file, fn);
ln.line_no = 0; ln.line_no = 0;
ln.len = 0; ln.len = 0;
ctxover = false;
linesqueued = 0; linesqueued = 0;
tail = 0; tail = 0;
lasta = 0;
ln.off = -1; ln.off = -1;
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol) if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
return (0); return (0);
} }
/* Process the file line-by-line */
/* Process the file line-by-line, enqueue non-matching lines */
if ((t = procline(&ln, f->binary)) == 0 && Bflag > 0) { if ((t = procline(&ln, f->binary)) == 0 && Bflag > 0) {
/* Except don't enqueue lines that appear in -A ctx */
if (ln.line_no == 0 || lasta != ln.line_no) {
/* queue is maxed to Bflag number of lines */
enqueue(&ln); enqueue(&ln);
linesqueued++; linesqueued++;
ctxover = false;
} else {
/*
* Indicate to procline() that we have ctx
* overlap and make sure queue is empty.
*/
if (!ctxover)
clearqueue();
ctxover = true;
} }
}
c += t; c += t;
if (mflag && mcount <= 0) if (mflag && mcount <= 0)
break; break;
} }
if (Bflag > 0) if (Bflag > 0)
clearqueue(); clearqueue();
grep_close(f); grep_close(f);
▲ Show 20 Lines • Show All 140 Lines • ▼ Show 20 Lines if (mflag)
mcount -= c; mcount -= c;
if (c && binbehave == BINFILE_BIN && nottext) if (c && binbehave == BINFILE_BIN && nottext)
return (c); /* Binary file */ return (c); /* Binary file */
/* Dealing with the context */ /* Dealing with the context */
if ((tail || c) && !cflag && !qflag && !lflag && !Lflag) { if ((tail || c) && !cflag && !qflag && !lflag && !Lflag) {
if (c) { if (c) {
if (!first && !prev && !tail && Aflag) if (!first && !prev && !tail && (Bflag || Aflag) &&
!ctxover)
printf("--\n"); printf("--\n");
tail = Aflag; tail = Aflag;
if (Bflag > 0) { if (Bflag > 0) {
if (!first && !prev)
printf("--\n");
printqueue(); printqueue();
ctxover = false;
} }
linesqueued = 0; linesqueued = 0;
printline(l, ':', matches, m); printline(l, ':', matches, m);
} else { } else {
/* Print -A lines following matches */
lasta = l->line_no;
printline(l, '-', matches, m); printline(l, '-', matches, m);
tail--; tail--;
} }
} }
if (c) { if (c) {
prev = true; prev = true;
first = false; first = false;
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines
View Options

head/multimedia/phonon/Makefile

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Lines
#include <wctype.h> #include <wctype.h>
#include "fastmatch.h" #include "fastmatch.h"
#include "grep.h" #include "grep.h"
static int linesqueued; static int linesqueued;
static int procline(struct str *l, int); static int procline(struct str *l, int);
static int lasta;
static bool ctxover;
bool bool
file_matching(const char *fname) file_matching(const char *fname)
{ {
char *fname_base, *fname_buf; char *fname_base, *fname_buf;
bool ret; bool ret;
ret = finclude ? false : true; ret = finclude ? false : true;
fname_buf = strdup(fname); fname_buf = strdup(fname);
▲ Show 20 Lines • Show All 141 Lines • ▼ Show 20 Lines if (!sflag)
warn("%s", fn); warn("%s", fn);
return (0); return (0);
} }
ln.file = grep_malloc(strlen(fn) + 1); ln.file = grep_malloc(strlen(fn) + 1);
strcpy(ln.file, fn); strcpy(ln.file, fn);
ln.line_no = 0; ln.line_no = 0;
ln.len = 0; ln.len = 0;
ctxover = false;
linesqueued = 0; linesqueued = 0;
tail = 0; tail = 0;
lasta = 0;
ln.off = -1; ln.off = -1;
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol) if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
return (0); return (0);
} }
/* Process the file line-by-line */
/* Process the file line-by-line, enqueue non-matching lines */
if ((t = procline(&ln, f->binary)) == 0 && Bflag > 0) { if ((t = procline(&ln, f->binary)) == 0 && Bflag > 0) {
/* Except don't enqueue lines that appear in -A ctx */
if (ln.line_no == 0 || lasta != ln.line_no) {
/* queue is maxed to Bflag number of lines */
enqueue(&ln); enqueue(&ln);
linesqueued++; linesqueued++;
ctxover = false;
} else {
/*
* Indicate to procline() that we have ctx
* overlap and make sure queue is empty.
*/
if (!ctxover)
clearqueue();
ctxover = true;
} }
}
c += t; c += t;
if (mflag && mcount <= 0) if (mflag && mcount <= 0)
break; break;
} }
if (Bflag > 0) if (Bflag > 0)
clearqueue(); clearqueue();
grep_close(f); grep_close(f);
▲ Show 20 Lines • Show All 140 Lines • ▼ Show 20 Lines if (mflag)
mcount -= c; mcount -= c;
if (c && binbehave == BINFILE_BIN && nottext) if (c && binbehave == BINFILE_BIN && nottext)
return (c); /* Binary file */ return (c); /* Binary file */
/* Dealing with the context */ /* Dealing with the context */
if ((tail || c) && !cflag && !qflag && !lflag && !Lflag) { if ((tail || c) && !cflag && !qflag && !lflag && !Lflag) {
if (c) { if (c) {
if (!first && !prev && !tail && Aflag) if (!first && !prev && !tail && (Bflag || Aflag) &&
!ctxover)
printf("--\n"); printf("--\n");
tail = Aflag; tail = Aflag;
if (Bflag > 0) { if (Bflag > 0) {
if (!first && !prev)
printf("--\n");
printqueue(); printqueue();
ctxover = false;
} }
linesqueued = 0; linesqueued = 0;
printline(l, ':', matches, m); printline(l, ':', matches, m);
} else { } else {
/* Print -A lines following matches */
lasta = l->line_no;
printline(l, '-', matches, m); printline(l, '-', matches, m);
tail--; tail--;
} }
} }
if (c) { if (c) {
prev = true; prev = true;
first = false; first = false;
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines
View Options

head/multimedia/phonon/distinfo

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Lines
#include <wctype.h> #include <wctype.h>
#include "fastmatch.h" #include "fastmatch.h"
#include "grep.h" #include "grep.h"
static int linesqueued; static int linesqueued;
static int procline(struct str *l, int); static int procline(struct str *l, int);
static int lasta;
static bool ctxover;
bool bool
file_matching(const char *fname) file_matching(const char *fname)
{ {
char *fname_base, *fname_buf; char *fname_base, *fname_buf;
bool ret; bool ret;
ret = finclude ? false : true; ret = finclude ? false : true;
fname_buf = strdup(fname); fname_buf = strdup(fname);
▲ Show 20 Lines • Show All 141 Lines • ▼ Show 20 Lines if (!sflag)
warn("%s", fn); warn("%s", fn);
return (0); return (0);
} }
ln.file = grep_malloc(strlen(fn) + 1); ln.file = grep_malloc(strlen(fn) + 1);
strcpy(ln.file, fn); strcpy(ln.file, fn);
ln.line_no = 0; ln.line_no = 0;
ln.len = 0; ln.len = 0;
ctxover = false;
linesqueued = 0; linesqueued = 0;
tail = 0; tail = 0;
lasta = 0;
ln.off = -1; ln.off = -1;
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol) if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
return (0); return (0);
} }
/* Process the file line-by-line */
/* Process the file line-by-line, enqueue non-matching lines */
if ((t = procline(&ln, f->binary)) == 0 && Bflag > 0) { if ((t = procline(&ln, f->binary)) == 0 && Bflag > 0) {
/* Except don't enqueue lines that appear in -A ctx */
if (ln.line_no == 0 || lasta != ln.line_no) {
/* queue is maxed to Bflag number of lines */
enqueue(&ln); enqueue(&ln);
linesqueued++; linesqueued++;
ctxover = false;
} else {
/*
* Indicate to procline() that we have ctx
* overlap and make sure queue is empty.
*/
if (!ctxover)
clearqueue();
ctxover = true;
} }
}
c += t; c += t;
if (mflag && mcount <= 0) if (mflag && mcount <= 0)
break; break;
} }
if (Bflag > 0) if (Bflag > 0)
clearqueue(); clearqueue();
grep_close(f); grep_close(f);
▲ Show 20 Lines • Show All 140 Lines • ▼ Show 20 Lines if (mflag)
mcount -= c; mcount -= c;
if (c && binbehave == BINFILE_BIN && nottext) if (c && binbehave == BINFILE_BIN && nottext)
return (c); /* Binary file */ return (c); /* Binary file */
/* Dealing with the context */ /* Dealing with the context */
if ((tail || c) && !cflag && !qflag && !lflag && !Lflag) { if ((tail || c) && !cflag && !qflag && !lflag && !Lflag) {
if (c) { if (c) {
if (!first && !prev && !tail && Aflag) if (!first && !prev && !tail && (Bflag || Aflag) &&
!ctxover)
printf("--\n"); printf("--\n");
tail = Aflag; tail = Aflag;
if (Bflag > 0) { if (Bflag > 0) {
if (!first && !prev)
printf("--\n");
printqueue(); printqueue();
ctxover = false;
} }
linesqueued = 0; linesqueued = 0;
printline(l, ':', matches, m); printline(l, ':', matches, m);
} else { } else {
/* Print -A lines following matches */
lasta = l->line_no;
printline(l, '-', matches, m); printline(l, '-', matches, m);
tail--; tail--;
} }
} }
if (c) { if (c) {
prev = true; prev = true;
first = false; first = false;
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines
View Options

head/multimedia/qt5-phonon4-designerplugin/Makefile

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Lines
#include <wctype.h> #include <wctype.h>
#include "fastmatch.h" #include "fastmatch.h"
#include "grep.h" #include "grep.h"
static int linesqueued; static int linesqueued;
static int procline(struct str *l, int); static int procline(struct str *l, int);
static int lasta;
static bool ctxover;
bool bool
file_matching(const char *fname) file_matching(const char *fname)
{ {
char *fname_base, *fname_buf; char *fname_base, *fname_buf;
bool ret; bool ret;
ret = finclude ? false : true; ret = finclude ? false : true;
fname_buf = strdup(fname); fname_buf = strdup(fname);
▲ Show 20 Lines • Show All 141 Lines • ▼ Show 20 Lines if (!sflag)
warn("%s", fn); warn("%s", fn);
return (0); return (0);
} }
ln.file = grep_malloc(strlen(fn) + 1); ln.file = grep_malloc(strlen(fn) + 1);
strcpy(ln.file, fn); strcpy(ln.file, fn);
ln.line_no = 0; ln.line_no = 0;
ln.len = 0; ln.len = 0;
ctxover = false;
linesqueued = 0; linesqueued = 0;
tail = 0; tail = 0;
lasta = 0;
ln.off = -1; ln.off = -1;
for (c = 0; c == 0 || !(lflag || qflag); ) { for (c = 0; c == 0 || !(lflag || qflag); ) {
ln.off += ln.len + 1; ln.off += ln.len + 1;
if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) { if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL || ln.len == 0) {
if (ln.line_no == 0 && matchall) if (ln.line_no == 0 && matchall)
exit(0); exit(0);
else else
break; break;
} }
if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol) if (ln.len > 0 && ln.dat[ln.len - 1] == fileeol)
--ln.len; --ln.len;
ln.line_no++; ln.line_no++;
/* Return if we need to skip a binary file */ /* Return if we need to skip a binary file */
if (f->binary && binbehave == BINFILE_SKIP) { if (f->binary && binbehave == BINFILE_SKIP) {
grep_close(f); grep_close(f);
free(ln.file); free(ln.file);
free(f); free(f);
return (0); return (0);
} }
/* Process the file line-by-line */
/* Process the file line-by-line, enqueue non-matching lines */
if ((t = procline(&ln, f->binary)) == 0 && Bflag > 0) { if ((t = procline(&ln, f->binary)) == 0 && Bflag > 0) {
/* Except don't enqueue lines that appear in -A ctx */
if (ln.line_no == 0 || lasta != ln.line_no) {
/* queue is maxed to Bflag number of lines */
enqueue(&ln); enqueue(&ln);
linesqueued++; linesqueued++;
ctxover = false;
} else {
/*
* Indicate to procline() that we have ctx
* overlap and make sure queue is empty.
*/
if (!ctxover)
clearqueue();
ctxover = true;
} }
}
c += t; c += t;
if (mflag && mcount <= 0) if (mflag && mcount <= 0)
break; break;
} }
if (Bflag > 0) if (Bflag > 0)
clearqueue(); clearqueue();
grep_close(f); grep_close(f);
▲ Show 20 Lines • Show All 140 Lines • ▼ Show 20 Lines if (mflag)
mcount -= c; mcount -= c;
if (c && binbehave == BINFILE_BIN && nottext) if (c && binbehave == BINFILE_BIN && nottext)
return (c); /* Binary file */ return (c); /* Binary file */
/* Dealing with the context */ /* Dealing with the context */
if ((tail || c) && !cflag && !qflag && !lflag && !Lflag) { if ((tail || c) && !cflag && !qflag && !lflag && !Lflag) {
if (c) { if (c) {
if (!first && !prev && !tail && Aflag) if (!first && !prev && !tail && (Bflag || Aflag) &&
!ctxover)
printf("--\n"); printf("--\n");
tail = Aflag; tail = Aflag;
if (Bflag > 0) { if (Bflag > 0) {
if (!first && !prev)
printf("--\n");
printqueue(); printqueue();
ctxover = false;
} }
linesqueued = 0; linesqueued = 0;
printline(l, ':', matches, m); printline(l, ':', matches, m);
} else { } else {
/* Print -A lines following matches */
lasta = l->line_no;
printline(l, '-', matches, m); printline(l, '-', matches, m);
tail--; tail--;
} }
} }
if (c) { if (c) {
prev = true; prev = true;
first = false; first = false;
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines
View Options

head/multimedia/qt5-phonon4/Makefile

Loading...
View Options

head/multimedia/qt5-phonon4/distinfo

Loading...