[SCM] faust/master: Removed patches applied upstream.
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Tue Jan 3 16:01:02 UTC 2017
The following commit has been merged in the master branch:
commit 288042ec3b948262b1d3d8769f56fb4b95605dc5
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Tue Jan 3 16:15:14 2017 +0100
Removed patches applied upstream.
diff --git a/debian/patches/clean.patch b/debian/patches/clean.patch
deleted file mode 100644
index 3616788..0000000
--- a/debian/patches/clean.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fixed 'make clean' target
- since there is no examples/Makefile, a 'make -C examples clean' fails the build
-Author: IOhannes m zmölnig
-Last-Update: 2016-09-24
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- faust.orig/Makefile
-+++ faust/Makefile
-@@ -76,7 +76,6 @@
-
- clean :
- $(MAKE) -C compiler -f $(MAKEFILE) clean
-- $(MAKE) -C examples clean
- $(MAKE) -C architecture/osclib clean
- $(MAKE) -C architecture/httpdlib/src clean
- $(MAKE) -C tools/sound2faust clean
diff --git a/debian/patches/debian_privacy.patch b/debian/patches/debian_privacy.patch
deleted file mode 100644
index 0a9e3d8..0000000
--- a/debian/patches/debian_privacy.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: closing privacy breaches
- the html-page references external ressources, which makes it possible to track
- the use of a *local* copy of the page
-Author: Debian
-Forwarded: no
-Last-Update: 2016-09-25
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- faust.orig/architecture/webaudio/export-wrapper.html
-+++ faust/architecture/webaudio/export-wrapper.html
-@@ -85,8 +85,8 @@
- </svg>
- </div>
-
--<script src="http://faust.grame.fr/webaudio/ExportLib.js"></script>
--<script src="http://faust.grame.fr/webaudio/qrcode.js"></script>
-+<script src="ExportLib.js"></script>
-+<script src="qrcode.js"></script>
-
- <script >
-
diff --git a/debian/patches/kFreeBSD.patch b/debian/patches/kFreeBSD.patch
deleted file mode 100644
index b3b3f88..0000000
--- a/debian/patches/kFreeBSD.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Add support for the GNU/kFreeBSD architecture
-Author: Mario Lang <mlang at debian.org>
-Bug-Debian: http://bugs.debian.org/644590
-
---- faust.orig/architecture/osclib/oscpack/Makefile
-+++ faust/architecture/osclib/oscpack/Makefile
-@@ -14,11 +14,18 @@
- CXXFLAGS += -fPIC
-
- else
-+ifeq ($(system), GNU/kFreeBSD)
-+subprojects := ip ip/posix osc
-+sources := $(wildcard ip/*.cpp) $(wildcard ip/posix/*.cpp) $(wildcard osc/*.cpp)
-+ARCHFLAGS :=
-+
-+else
- subprojects := ip ip/win32 osc
- sources := $(wildcard ip/*.cpp) $(wildcard ip/win32/*.cpp) $(wildcard osc/*.cpp)
- ARCHFLAGS :=
- endif
- endif
-+endif
-
- VPATH = $(subprojects)
-
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
deleted file mode 100644
index d5e93ce..0000000
--- a/debian/patches/reproducible-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Author: Reiner Herrmann <reiner at reiner-h.de>
-Description: Sort list of source files for deterministic linking order
-
---- faust.orig/compiler/Makefile.unix
-+++ faust/compiler/Makefile.unix
-@@ -1,6 +1,6 @@
- subprojects := boxes errors evaluate generator normalize parser propagate parallelize signals tlib draw draw/device draw/schema extended patternmatcher documentator utils
-
--sources = $(wildcard *.cpp) $(wildcard */*.cpp) $(wildcard draw/*/*.cpp)
-+sources = $(sort $(wildcard *.cpp) $(wildcard */*.cpp) $(wildcard draw/*/*.cpp))
-
- objects = $(sources:.cpp=.o)
-
---- faust.orig/architecture/osclib/faust/Makefile
-+++ faust/architecture/osclib/faust/Makefile
-@@ -1,5 +1,5 @@
- subprojects := . src src/lib src/msg src/nodes src/osc src/threads ../..
--sources = $(wildcard src/*.cpp) $(wildcard src/*/*.cpp)
-+sources = $(sort $(wildcard src/*.cpp) $(wildcard src/*/*.cpp))
- objects = $(sources:.cpp=.o)
-
- VPATH = $(subprojects)
---- faust.orig/architecture/osclib/oscpack/Makefile
-+++ faust/architecture/osclib/oscpack/Makefile
-@@ -3,25 +3,25 @@
-
- ifeq ($(system), Darwin)
- subprojects := ip ip/posix osc
--sources := $(wildcard ip/*.cpp) $(wildcard ip/posix/*.cpp) $(wildcard osc/*.cpp)
-+sources := $(sort $(wildcard ip/*.cpp) $(wildcard ip/posix/*.cpp) $(wildcard osc/*.cpp))
- ARCHFLAGS := -mmacosx-version-min=10.9
-
- else
- ifeq ($(system), Linux)
- subprojects := ip ip/posix osc
--sources := $(wildcard ip/*.cpp) $(wildcard ip/posix/*.cpp) $(wildcard osc/*.cpp)
-+sources := $(sort $(wildcard ip/*.cpp) $(wildcard ip/posix/*.cpp) $(wildcard osc/*.cpp))
- ARCHFLAGS :=
- CXXFLAGS += -fPIC
-
- else
- ifeq ($(system), GNU/kFreeBSD)
- subprojects := ip ip/posix osc
--sources := $(wildcard ip/*.cpp) $(wildcard ip/posix/*.cpp) $(wildcard osc/*.cpp)
-+sources := $(sort $(wildcard ip/*.cpp) $(wildcard ip/posix/*.cpp) $(wildcard osc/*.cpp))
- ARCHFLAGS :=
-
- else
- subprojects := ip ip/win32 osc
--sources := $(wildcard ip/*.cpp) $(wildcard ip/win32/*.cpp) $(wildcard osc/*.cpp)
-+sources := $(sort $(wildcard ip/*.cpp) $(wildcard ip/win32/*.cpp) $(wildcard osc/*.cpp))
- ARCHFLAGS :=
- endif
- endif
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 30e66e8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-kFreeBSD.patch
-spelling.patch
-reproducible-build.patch
-clean.patch
-debian_privacy.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 3e2265e..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Description: fixed spelling
-Author: Debian
-Forwarded: no
-Last-Update: 2016-05-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- faust.orig/benchmark/alsa-gtk-bench.cpp
-+++ faust/benchmark/alsa-gtk-bench.cpp
-@@ -575,7 +575,7 @@
- }
-
- } else {
-- check_error_msg(-10000, "unknow access mode");
-+ check_error_msg(-10000, "unknown access mode");
- }
-
-
-@@ -663,7 +663,7 @@
- }
-
- } else {
-- check_error_msg(-10000, "unknow access mode");
-+ check_error_msg(-10000, "unknown access mode");
- }
- }
-
---- faust.orig/compiler/generator/occurences.cpp
-+++ faust/compiler/generator/occurences.cpp
-@@ -63,7 +63,7 @@
- void OccMarkup::mark(Tree root)
- {
- fRootTree = root;
-- fPropKey = tree(unique("OCCURENCES"));
-+ fPropKey = tree(unique("OCCURRENCES"));
-
- if (isList(root)) {
- while (isList(root)) {
-@@ -172,4 +172,4 @@
- if (hd(env) == t) return p;
- else return position (tl(env), t, p+1);
- }
--#endif
-\ No newline at end of file
-+#endif
---- faust.orig/compiler/signals/sigorderrules.cpp
-+++ faust/compiler/signals/sigorderrules.cpp
-@@ -176,7 +176,7 @@
- }
-
- // unrecognized signal here
-- fprintf(stderr, "ERROR infering signal order : unrecognized signal : "); print(sig, stderr); fprintf(stderr, "\n");
-+ fprintf(stderr, "ERROR inferring signal order : unrecognized signal : "); print(sig, stderr); fprintf(stderr, "\n");
- exit(1);
- return 0;
- }
---- faust.orig/compiler/signals/sigtyperules.cpp
-+++ faust/compiler/signals/sigtyperules.cpp
-@@ -389,7 +389,7 @@
- else if (isList(sig)) { return T( hd(sig),env ) * T( tl(sig),env ); }
-
- // unrecognized signal here
-- fprintf(stderr, "ERROR infering signal type : unrecognized signal : "); print(sig, stderr); fprintf(stderr, "\n");
-+ fprintf(stderr, "ERROR inferring signal type : unrecognized signal : "); print(sig, stderr); fprintf(stderr, "\n");
- exit(1);
- return 0;
- }
-@@ -403,7 +403,7 @@
- {
- TupletType* tt = isTupletType(t);
- if (tt == 0) {
-- cerr << "ERROR infering projection type, not a tuplet type : " << t << endl;
-+ cerr << "ERROR inferring projection type, not a tuplet type : " << t << endl;
- exit(1);
- }
- //return (*tt)[i] ->promoteVariability(t->variability())
-@@ -428,12 +428,12 @@
- {
- TableType* tt = isTableType(tbl);
- if (tt == 0) {
-- cerr << "ERROR infering write table type, wrong table type : " << tbl << endl;
-+ cerr << "ERROR inferring write table type, wrong table type : " << tbl << endl;
- exit(1);
- }
- SimpleType* st = isSimpleType(wi);
- if (st == 0 || st->nature() > kInt) {
-- cerr << "ERROR infering write table type, wrong write index type : " << wi << endl;
-+ cerr << "ERROR inferring write table type, wrong write index type : " << wi << endl;
- exit(1);
- }
-
-@@ -455,12 +455,12 @@
- {
- TableType* tt = isTableType(tbl);
- if (tt == 0) {
-- cerr << "ERROR infering read table type, wrong table type : " << tbl << endl;
-+ cerr << "ERROR inferring read table type, wrong table type : " << tbl << endl;
- exit(1);
- }
- SimpleType* st = isSimpleType(ri);
- if (st == 0 || st->nature() > kInt) {
-- cerr << "ERROR infering read table type, wrong write index type : " << ri << endl;
-+ cerr << "ERROR inferring read table type, wrong write index type : " << ri << endl;
- exit(1);
- }
-
--
faust packaging
More information about the pkg-multimedia-commits
mailing list