Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/burrow-owl/files/
Date: Tue, 31 Jan 2017 08:42:16
Message-Id: 1485852055.a1e896f9fcf71c5f574e4c71f64527664519bc6e.soap@gentoo
1 commit: a1e896f9fcf71c5f574e4c71f64527664519bc6e
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 30 16:57:10 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 08:40:55 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e896f9
7
8 sci-chemistry/burrow-owl: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3730
11
12 .../burrow-owl/files/1.4-glibc-2.12.patch | 38 ----------------------
13 sci-chemistry/burrow-owl/files/1.4-include.patch | 12 -------
14 .../burrow-owl/files/burrow-owl-1.5-prll.patch | 20 ------------
15 3 files changed, 70 deletions(-)
16
17 diff --git a/sci-chemistry/burrow-owl/files/1.4-glibc-2.12.patch b/sci-chemistry/burrow-owl/files/1.4-glibc-2.12.patch
18 deleted file mode 100644
19 index cca640a..00000000
20 --- a/sci-chemistry/burrow-owl/files/1.4-glibc-2.12.patch
21 +++ /dev/null
22 @@ -1,38 +0,0 @@
23 -Fix build with GLIBC-2.12
24 -
25 -http://bugs.gentoo.org/show_bug.cgi?id=333843
26 -
27 ---- src/Makefile.am
28 -+++ src/Makefile.am
29 -@@ -82,8 +82,8 @@
30 - painter.h \
31 - ticket.c \
32 - ticket.h \
33 --endian.c \
34 --endian.h \
35 -+bo_endian.c \
36 -+bo_endian.h \
37 - version.c \
38 - version.h
39 -
40 ---- src/hosbackingfile.c
41 -+++ src/hosbackingfile.c
42 -@@ -18,6 +18,7 @@
43 - */
44 -
45 - #include "hosbackingfile.h"
46 -+#include "bo_endian.h"
47 -
48 - #define DEFAULT_BUF_SIZE 512
49 -
50 ---- src/nih.c
51 -+++ src/nih.c
52 -@@ -24,7 +24,7 @@
53 - #include "hosdimensionblock.h"
54 - #include "hosbackingblock.h"
55 - #include "hosbackingfile.h"
56 --#include "endian.h"
57 -+#include "bo_endian.h"
58 -
59 - /* --- header contents ----
60 - *
61
62 diff --git a/sci-chemistry/burrow-owl/files/1.4-include.patch b/sci-chemistry/burrow-owl/files/1.4-include.patch
63 deleted file mode 100644
64 index 3dc4cbd..00000000
65 --- a/sci-chemistry/burrow-owl/files/1.4-include.patch
66 +++ /dev/null
67 @@ -1,12 +0,0 @@
68 -diff --git a/src/gw/spectrum-spec.scm b/src/gw/spectrum-spec.scm
69 -index 253464c..605796c 100644
70 ---- a/src/gw/spectrum-spec.scm
71 -+++ b/src/gw/spectrum-spec.scm
72 -@@ -30,6 +30,7 @@
73 - "#include <painter_gdk.h>\n"
74 - "#include <burrow/nih.h>\n"
75 - "#include <hosbackingsim.h>\n"
76 -+ "#include <guile-cairo/guile-cairo-smob-types.h>\n"
77 - "\n"))
78 -
79 - ; couple of disabled sources
80
81 diff --git a/sci-chemistry/burrow-owl/files/burrow-owl-1.5-prll.patch b/sci-chemistry/burrow-owl/files/burrow-owl-1.5-prll.patch
82 deleted file mode 100644
83 index 340ccd2..00000000
84 --- a/sci-chemistry/burrow-owl/files/burrow-owl-1.5-prll.patch
85 +++ /dev/null
86 @@ -1,20 +0,0 @@
87 - burrow/canvas/gw/Makefile.am | 4 +++-
88 - 1 files changed, 3 insertions(+), 1 deletions(-)
89 -
90 -diff --git a/burrow/canvas/gw/Makefile.am b/burrow/canvas/gw/Makefile.am
91 -index da50ee3..2ed89bc 100644
92 ---- a/burrow/canvas/gw/Makefile.am
93 -+++ b/burrow/canvas/gw/Makefile.am
94 -@@ -31,9 +31,11 @@ H2DEF=@top_srcdir@/utils/h2def.py
95 - canvas.defs: $(HEADERS_1)
96 - $(H2DEF) --all $(HEADERS_1) > $@
97 -
98 --canvas-gw.c canvas-gw.h canvas-gw.scm: canvas.defs
99 -+canvas-gw.c canvas-gw.h: canvas.defs
100 - GUILE_LOAD_PATH=@srcdir@:@builddir@:@GUILE_GNOME_MODULE_DIR@:@G_WRAP_MODULE_DIR@:$$GUILE_LOAD_PATH $(GUILE) -s @srcdir@/run-g-wrap.scm
101 -
102 -+BUILT_SOURCES=canvas-gw.c canvas-gw.h canvas.defs
103 -+
104 - INCLUDES=@GTK_CFLAGS@ @G_WRAP_CFLAGS@ @GUILE_GNOME_CFLAGS@ @GUILE_CAIRO_CFLAGS@ @GUILE_CFLAGS@ -I$(headers_dir) -I@top_srcdir@
105 -
106 - moduledir=$(datadir)/guile/burrow