1 |
commit: be2e696c9bc52030cda8ec8d2710d8cf0d6d23dd |
2 |
Author: Theo Anderson <telans <AT> posteo <DOT> de> |
3 |
AuthorDate: Sat Dec 26 06:43:08 2020 +0000 |
4 |
Commit: Theo Anderson <telans <AT> posteo <DOT> de> |
5 |
CommitDate: Sat Dec 26 09:09:31 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=be2e696c |
7 |
|
8 |
dev-lang/fbc: bump to 1.07.2 |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Theo Anderson <telans <AT> posteo.de> |
12 |
|
13 |
dev-lang/fbc/Manifest | 2 ++ |
14 |
dev-lang/fbc/fbc-1.07.0.ebuild | 6 +++--- |
15 |
dev-lang/fbc/fbc-1.07.1.ebuild | 6 +++--- |
16 |
.../fbc/{fbc-1.07.0.ebuild => fbc-1.07.2.ebuild} | 15 +++++++------ |
17 |
.../files/1.07.1/0001-Pass-ltinfo-to-linker.patch | 25 ---------------------- |
18 |
...atch => fbc-1.07.0-Pass-ltinfo-to-linker.patch} | 0 |
19 |
6 files changed, 17 insertions(+), 37 deletions(-) |
20 |
|
21 |
diff --git a/dev-lang/fbc/Manifest b/dev-lang/fbc/Manifest |
22 |
index d123fada..fd2d44fc 100644 |
23 |
--- a/dev-lang/fbc/Manifest |
24 |
+++ b/dev-lang/fbc/Manifest |
25 |
@@ -1,8 +1,10 @@ |
26 |
DIST FreeBASIC-1.06.0-source-bootstrap.tar.xz 7742292 BLAKE2B fd32c6e5edf6e8c27538465141c6b870d6c893f8e05fc8d91b273f9268a68065709cba95e8c5cd8b86786522b2ac1eaf1a6a547227432bbc9998eb1288b29515 SHA512 42878091994cae7e0a2f4ba1d2d83a80d32d62ad06790ac06643a266200b53b7ce2480a651b1622910a2733756b7ca032a5be1bb73ee3f796146394eebb9f43c |
27 |
DIST FreeBASIC-1.07.0-source-bootstrap.tar.xz 8237216 BLAKE2B f657f8a81d412435b8b4167ded5019e9821f0cf47db9d38708da0eea6bdc8835a77c643122e792616aefbbb557f228e6ab06e823c10e1afe922c9e4b34088989 SHA512 3a69e2fe5a81b8990e0ec811a9aeb0c9bdd84e858983800c444717197754a0b8e2945091d80d4c6736b691798dbc571b3e7f885d6a6e4564c9ca1021a2fae71c |
28 |
DIST FreeBASIC-1.07.1-source-bootstrap.tar.xz 9098748 BLAKE2B 3c3970ab014f79193dad23b6f22c5ffc61d6f588219dcf00f430ce2c9045dc2af8aa42bdad4f1d63d76591aae14b42553cf6ece88052f0dc78e09c6fb5c4d875 SHA512 89250fb4d79e420151bae8208945e26c5d4e63ba8bbb60658b2c5601ceeea238b387d7d7a2b52d60da2243e5d3d31f602c3657394be72a37c256e777be23b0a8 |
29 |
+DIST FreeBASIC-1.07.2-source-bootstrap.tar.xz 10700992 BLAKE2B e7016e5f58ae79086c0445bf6a09f33d4335af771422778be407e3351d583522e16f137763e471ba88e47b4318ab5bd2aec882ef5e5ff85cc334b0eccf27fdc5 SHA512 f381d14343496f68d3401ad1a66ff4fb1314270eddebb72ed2bc5624b856c4b29e7e14062f531a5158d892bb73d9aa80ff54fe7c260b4b8967b1330d26b2ecfc |
30 |
DIST fbc-1.06.0-bootstrap-dist-linux-x86.patch 147301 BLAKE2B 8320f988bc84f5df1b732719a11d1a8edbfceff04ad51b1fbd883eb21d20f1c2f16b8c6ae41b5b0472e4faf1058345969b85ed0c93c071de3c9ed703e298106a SHA512 b2ee285504ce0f8a6a01ee5da7661e40c4a6bb0075f26751fbc79a328cac66f7809ad4c2489eaab01a6e6432ca6d76e19835c86bddf9df5af3b89c547fd8ffb3 |
31 |
DIST fbc-1.06.0-bootstrap-dist-linux-x86_64.patch 198197 BLAKE2B 72083bef84aed5ec2d95badb70a42db2e5d89084454f79aef41808a018ab238b1d230cb7282f4adf1be9d003c3865cb914fbf057fbd84c069dfecc4abd3da80b SHA512 771077a2526164223c3ae157558355538701224863b2a5923881ac2d2568f4cd1f5489df73aa8d55b1efccc82fe9e251e893a2b361363c1862d4c1e7bc3fb4ba |
32 |
DIST fbc-1.06.0.tar.gz 8847831 BLAKE2B 9245137995f9f3e2ff5adaf9b273593434ac9ec96919b2c970ec26183fe6fb7afee35753f2dd92f4b34d1aade92871e5a6722571a5ba04dde323fd7fb06c55c5 SHA512 687dcf665bb10e6a771cc01d02c21da77d89e052308600038dce526ba1ccfc6554d409dab184f3495557c9e4fdf744fd7a9088b4b137b782a9ab8633622c5484 |
33 |
DIST fbc-1.07.0.tar.gz 8938137 BLAKE2B 14849dd0cfb0f0a2d0f2e4966a855964027adbacc2253e236f9f10ba73c40b16714d8fb75778cac8cb6eb1600d6adeb2037929a376b4938961e53e5de83fafba SHA512 1cab52e97854b3ef17db6ba4750c0216f3bd04e23997f005189988007014574467c0f63f41ad822d089a18e97439ba52743223d1bb282133b41c0625b66cd8f5 |
34 |
DIST fbc-1.07.1.tar.gz 8938056 BLAKE2B 965425426605b9e0018e066852a67c355d168276b434e6779e151fad38820a956b5b763aad427c6728be4a74b0956b099a0bb8abd0d76fececc6cf8f0204d3c1 SHA512 7d49b9546e242b1c366b2378f71cf1640b85c85e09f4c2bd99ef268e6b4e5e45a710b7a00f7d807245aec518f299d173635572b77483826c1f273e047dbe3679 |
35 |
+DIST fbc-1.07.2.tar.gz 9032306 BLAKE2B c44eb74bb0b11f8315cda29e13157ce5f7a92070f0e6df833ad9dda4ebe37db6450afe2b82eb763ebee5ed0c33b4ce458fd3b53430f32da8ad5a71cd84411c67 SHA512 0577203fb8a325f611c88456446721e8bb14656beb235f3965bcd53e14cc7c7fa012a68535ff4c12351fad31d9a22a759f12bc9fe0be5d1dad124d3fe377daaf |
36 |
|
37 |
diff --git a/dev-lang/fbc/fbc-1.07.0.ebuild b/dev-lang/fbc/fbc-1.07.0.ebuild |
38 |
index e48cfbaf..6df41992 100644 |
39 |
--- a/dev-lang/fbc/fbc-1.07.0.ebuild |
40 |
+++ b/dev-lang/fbc/fbc-1.07.0.ebuild |
41 |
@@ -27,7 +27,7 @@ DEPEND=" |
42 |
)" |
43 |
RDEPEND="${DEPEND}" |
44 |
|
45 |
-PATCHES="${FILESDIR}/${PV}" |
46 |
+PATCHES=( "${FILESDIR}"/${P}-Pass-ltinfo-to-linker.patch ) |
47 |
|
48 |
DOCS="${S}/doc/fbc.1" |
49 |
|
50 |
@@ -45,10 +45,10 @@ src_prepare() { |
51 |
# We only need bootstrap source code if fbc is not already present |
52 |
if ! has_version dev-lang/fbc; then |
53 |
cd "${BOOTSTRAP_S}" || die "cd failed" |
54 |
- eapply "${FILESDIR}/${PV}" |
55 |
+ eapply "${PATCHES[@]}" |
56 |
cd "${S}" || die "cd failed" |
57 |
fi |
58 |
- default |
59 |
+ eapply_user |
60 |
} |
61 |
|
62 |
src_compile() { |
63 |
|
64 |
diff --git a/dev-lang/fbc/fbc-1.07.1.ebuild b/dev-lang/fbc/fbc-1.07.1.ebuild |
65 |
index e48cfbaf..dff47787 100644 |
66 |
--- a/dev-lang/fbc/fbc-1.07.1.ebuild |
67 |
+++ b/dev-lang/fbc/fbc-1.07.1.ebuild |
68 |
@@ -27,7 +27,7 @@ DEPEND=" |
69 |
)" |
70 |
RDEPEND="${DEPEND}" |
71 |
|
72 |
-PATCHES="${FILESDIR}/${PV}" |
73 |
+PATCHES=( "${FILESDIR}"/${PN}-1.07.0-Pass-ltinfo-to-linker.patch ) |
74 |
|
75 |
DOCS="${S}/doc/fbc.1" |
76 |
|
77 |
@@ -45,10 +45,10 @@ src_prepare() { |
78 |
# We only need bootstrap source code if fbc is not already present |
79 |
if ! has_version dev-lang/fbc; then |
80 |
cd "${BOOTSTRAP_S}" || die "cd failed" |
81 |
- eapply "${FILESDIR}/${PV}" |
82 |
+ eapply "${PATCHES[@]}" |
83 |
cd "${S}" || die "cd failed" |
84 |
fi |
85 |
- default |
86 |
+ eapply_user |
87 |
} |
88 |
|
89 |
src_compile() { |
90 |
|
91 |
diff --git a/dev-lang/fbc/fbc-1.07.0.ebuild b/dev-lang/fbc/fbc-1.07.2.ebuild |
92 |
similarity index 89% |
93 |
copy from dev-lang/fbc/fbc-1.07.0.ebuild |
94 |
copy to dev-lang/fbc/fbc-1.07.2.ebuild |
95 |
index e48cfbaf..2db1af5c 100644 |
96 |
--- a/dev-lang/fbc/fbc-1.07.0.ebuild |
97 |
+++ b/dev-lang/fbc/fbc-1.07.2.ebuild |
98 |
@@ -5,8 +5,10 @@ EAPI=7 |
99 |
|
100 |
DESCRIPTION="A free/open source, multi-platform BASIC compiler." |
101 |
HOMEPAGE="https://www.freebasic.net" |
102 |
-SRC_URI="https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
103 |
- https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz" |
104 |
+SRC_URI=" |
105 |
+ https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
106 |
+ https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz |
107 |
+" |
108 |
|
109 |
LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+" |
110 |
SLOT="0" |
111 |
@@ -24,10 +26,11 @@ DEPEND=" |
112 |
x11-libs/libXpm |
113 |
x11-libs/libXrandr |
114 |
x11-libs/libXrender |
115 |
- )" |
116 |
+ ) |
117 |
+" |
118 |
RDEPEND="${DEPEND}" |
119 |
|
120 |
-PATCHES="${FILESDIR}/${PV}" |
121 |
+PATCHES=( "${FILESDIR}"/${PN}-1.07.0-Pass-ltinfo-to-linker.patch ) |
122 |
|
123 |
DOCS="${S}/doc/fbc.1" |
124 |
|
125 |
@@ -45,10 +48,10 @@ src_prepare() { |
126 |
# We only need bootstrap source code if fbc is not already present |
127 |
if ! has_version dev-lang/fbc; then |
128 |
cd "${BOOTSTRAP_S}" || die "cd failed" |
129 |
- eapply "${FILESDIR}/${PV}" |
130 |
+ eapply "${PATCHES[@]}" |
131 |
cd "${S}" || die "cd failed" |
132 |
fi |
133 |
- default |
134 |
+ eapply_user |
135 |
} |
136 |
|
137 |
src_compile() { |
138 |
|
139 |
diff --git a/dev-lang/fbc/files/1.07.1/0001-Pass-ltinfo-to-linker.patch b/dev-lang/fbc/files/1.07.1/0001-Pass-ltinfo-to-linker.patch |
140 |
deleted file mode 100644 |
141 |
index 72bd51fa..00000000 |
142 |
--- a/dev-lang/fbc/files/1.07.1/0001-Pass-ltinfo-to-linker.patch |
143 |
+++ /dev/null |
144 |
@@ -1,25 +0,0 @@ |
145 |
-From c62adcd85c4e9d8b793a7a4f71fc88f6fbb79798 Mon Sep 17 00:00:00 2001 |
146 |
-From: William Breathitt Gray <vilhelm.gray@×××××.com> |
147 |
-Date: Tue, 27 Aug 2019 20:41:07 +0900 |
148 |
-Subject: [PATCH] Pass -ltinfo to linker |
149 |
- |
150 |
---- |
151 |
- makefile | 2 +- |
152 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
153 |
- |
154 |
-diff --git a/makefile b/makefile |
155 |
-index e093bb1..eb3f759 100644 |
156 |
---- a/makefile |
157 |
-+++ b/makefile |
158 |
-@@ -1109,7 +1109,7 @@ endif |
159 |
- # Use gcc to link fbc from the bootstrap .o's |
160 |
- # (assuming the rtlib was built already) |
161 |
- ifneq ($(filter darwin freebsd linux netbsd openbsd solaris,$(TARGET_OS)),) |
162 |
-- BOOTSTRAP_LIBS := -lncurses -lm -pthread |
163 |
-+ BOOTSTRAP_LIBS := -ltinfo -lncurses -lm -pthread |
164 |
- endif |
165 |
- $(BOOTSTRAP_FBC): rtlib $(BOOTSTRAP_OBJ) |
166 |
- $(QUIET_LINK)$(CC) -o $@ $(libdir)/fbrt0.o bootstrap/$(FBTARGET)/*.o $(libdir)/libfb.a $(BOOTSTRAP_LIBS) |
167 |
--- |
168 |
-2.22.1 |
169 |
- |
170 |
|
171 |
diff --git a/dev-lang/fbc/files/1.07.0/0001-Pass-ltinfo-to-linker.patch b/dev-lang/fbc/files/fbc-1.07.0-Pass-ltinfo-to-linker.patch |
172 |
similarity index 100% |
173 |
rename from dev-lang/fbc/files/1.07.0/0001-Pass-ltinfo-to-linker.patch |
174 |
rename to dev-lang/fbc/files/fbc-1.07.0-Pass-ltinfo-to-linker.patch |