| 1 |
commit: fa85d5355b3c7d3f6d25127e1b6f4ea7450a5a88 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 1 12:42:51 2018 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 1 12:42:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa85d535 |
| 7 |
|
| 8 |
sci-biology/arb: Remove old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
sci-biology/arb/Manifest | 7 --- |
| 13 |
sci-biology/arb/arb-5.1-r1.ebuild | 77 --------------------------- |
| 14 |
sci-biology/arb/arb-5.2.ebuild | 79 ---------------------------- |
| 15 |
sci-biology/arb/arb-5.3.ebuild | 77 --------------------------- |
| 16 |
sci-biology/arb/files/5.1-bfr-overflow.patch | 16 ------ |
| 17 |
sci-biology/arb/files/5.1-libs.patch | 16 ------ |
| 18 |
sci-biology/arb/files/5.2-libpng15.patch | 45 ---------------- |
| 19 |
sci-biology/arb/files/arb-5.2-gcc-47.patch | 15 ------ |
| 20 |
8 files changed, 332 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sci-biology/arb/Manifest b/sci-biology/arb/Manifest |
| 23 |
index 60bfb783165..4f19d30ed17 100644 |
| 24 |
--- a/sci-biology/arb/Manifest |
| 25 |
+++ b/sci-biology/arb/Manifest |
| 26 |
@@ -1,8 +1 @@ |
| 27 |
-DIST arb-5.1-glibc2.10.patch.bz2 24659 BLAKE2B 856b4735c98f13b21af537486f27ae89cca724590f7f4d7975dc7df05d3e3388a29198f6b9bb14b2ef885f5442d6687d6fbcdb44c076656b8e2ff521c633f940 SHA512 a490066efc5001e22bfeab8ce3e05690f5024217261b7b71c5a31116d18611a93f5b15aa7d57fca40e2b5e17e64b695873ccb810bd649b2b109c9b710d3ddfe1 |
| 28 |
-DIST arb-5.1-linker.patch.bz2 4406 BLAKE2B 3214f875c7d58e9a60032397f34a38ec13fc1672cecca475223fe8b79c684d4839e3e7dcf7c1df8290f00912b6268493bf89d77b744c923b3a9769bb466bef15 SHA512 44518d500be457d16e7f6cd5f0863d2dc48cc8a1c8abcbaea79eefec5cd063258aea78d03e9601cd0bdea3c7e57949373d7a909eeed98bf48a6d98576f298e58 |
| 29 |
-DIST arb-5.1.tgz 9727285 BLAKE2B 97660214b1dc513a946256cfdcbbefff282bb125e81e05a92005bd62b4ec00a478fb6639c6f5b0b3893e1c49d8eb9f13d04ec36271daec41c41b9093fefea09a SHA512 236f7c40217146cf5b43d15c7252901a09f2081c1da6db1b90d7720d313e21a2808b31879d700bf894b3c576952c43be751fd0027af8a58d953403028589dd8c |
| 30 |
-DIST arb-5.2-linker.patch.bz2 4441 BLAKE2B c2554cf4e24ab9257dfac06482f05a42e89ad06ecf1b069d80df16d512ce675a29f7c3dbe0bca6b0f3add910617cc5853462aa5593cb9ccb2fb2656cdd5183c1 SHA512 6afae76a4b403ad3139abd4535b5da8bbf2d16aa5f49e30c86c8f186ac585de6c789e8fa4e402576a67ce8c58468e626a46bde5cfae5869ea2c046a1492fa903 |
| 31 |
-DIST arb-5.2.tgz 9729004 BLAKE2B 2ae85529c9c7afdbc0debc0317e0ab3772f881b606f849b6cb60872e2e123b612399dc4dcfa07c5e886703478140515fa31e9b69b37383a12d8526ecb771f77b SHA512 d1f9f7273645af7da0e949971b705303f0715ac98869acc0f75d62bfe88751709f5d5dbbc3079b0abe461ddce8262b165426e347ad28bc28a55cdf6c29b5ff56 |
| 32 |
-DIST arb-5.3-linker.patch.xz 3604 BLAKE2B 0327a94ee4daaca9cc4aa41601ae52b8616d26fd0ede19b36cb2ea72135bc9609d21db74b9588cc79e08242d3e32bb3398d78663c90dc4e3c248877953249789 SHA512 8eb072cd5a3c13b2a6ad0e40f3b155096168dbd70a6e13878d4a62e563903742442373a5e3032d6f78beefe774943fef86f6060e89acd0d18b95a7c0d4a8dec7 |
| 33 |
-DIST arb-5.3.tgz 9543106 BLAKE2B e67859accad1f5aeae3fe3a85530543beb1141e1fe340760e55b2bcef84f1f5cd18fe82ff75beafbf49b1945def0436d862487a630192345568931a335454210 SHA512 faa924b9c6f437f77ed637798c6fe5fe5c2e6a0f2efc9c1f735133fab9c037c7039fc4ef6f6e5b0408fc39ea5c69c747b1887689f4621b608add593d77930282 |
| 34 |
DIST arb-6.0.6.tgz 13286019 BLAKE2B fd9591321111363013084030aef7130ccac580aeb9b16e93e72613dc0b3922873aa3f3b1e76d28c1ed14846c0b0d2d497257366fc5deebf4c40c79f0b7eee859 SHA512 053d4d964d8a299f86d4cab9113f0d2181780bf51e0ccec0459a4d568d09bb4e9723fa8493d8e4fa5c72e6d1f022241721cadf7ceb75ee27142d48f2f9f269b4 |
| 35 |
|
| 36 |
diff --git a/sci-biology/arb/arb-5.1-r1.ebuild b/sci-biology/arb/arb-5.1-r1.ebuild |
| 37 |
deleted file mode 100644 |
| 38 |
index f52beded359..00000000000 |
| 39 |
--- a/sci-biology/arb/arb-5.1-r1.ebuild |
| 40 |
+++ /dev/null |
| 41 |
@@ -1,77 +0,0 @@ |
| 42 |
-# Copyright 1999-2016 Gentoo Foundation |
| 43 |
-# Distributed under the terms of the GNU General Public License v2 |
| 44 |
- |
| 45 |
-EAPI=2 |
| 46 |
- |
| 47 |
-inherit eutils toolchain-funcs |
| 48 |
- |
| 49 |
-DESCRIPTION="Tools for DNA/RNA sequence database handling and phylogenetic analysis" |
| 50 |
-HOMEPAGE="http://www.arb-home.de/" |
| 51 |
-SRC_URI=" |
| 52 |
- http://download.arb-home.de/release/arb_${PV}/arbsrc.tgz -> ${P}.tgz |
| 53 |
- mirror://gentoo/${P}-glibc2.10.patch.bz2 |
| 54 |
- https://dev.gentoo.org/~jlec/${P}-linker.patch.bz2" |
| 55 |
- |
| 56 |
-LICENSE="arb" |
| 57 |
-SLOT="0" |
| 58 |
-IUSE="+opengl" |
| 59 |
-KEYWORDS="~amd64 ~x86" |
| 60 |
- |
| 61 |
-DEPEND=" |
| 62 |
- app-text/sablotron |
| 63 |
- media-libs/libpng |
| 64 |
- media-libs/tiff |
| 65 |
- www-client/lynx |
| 66 |
- x11-libs/libXaw |
| 67 |
- x11-libs/libXpm |
| 68 |
- x11-libs/motif:0 |
| 69 |
- opengl? ( |
| 70 |
- media-libs/glew |
| 71 |
- media-libs/freeglut |
| 72 |
- || ( |
| 73 |
- media-libs/mesa[motif] |
| 74 |
- ( media-libs/mesa x11-libs/libGLw ) ) )" |
| 75 |
-RDEPEND="${DEPEND} |
| 76 |
- sci-visualization/gnuplot" |
| 77 |
-# Recommended: libmotif3 gv xfig xterm treetool java |
| 78 |
- |
| 79 |
-src_unpack() { |
| 80 |
- unpack ${A} |
| 81 |
- mv arbsrc* ${P} |
| 82 |
-} |
| 83 |
- |
| 84 |
-src_prepare() { |
| 85 |
- epatch \ |
| 86 |
- "${WORKDIR}"/${P}-glibc2.10.patch\ |
| 87 |
- "${WORKDIR}"/${P}-linker.patch \ |
| 88 |
- "${FILESDIR}"/${PV}-libs.patch \ |
| 89 |
- "${FILESDIR}"/${PV}-bfr-overflow.patch |
| 90 |
- sed -i \ |
| 91 |
- -e 's/all: checks/all:/' \ |
| 92 |
- -e "s/GCC:=.*/GCC=$(tc-getCC) ${CFLAGS}/" \ |
| 93 |
- -e "s/GPP:=.*/GPP=$(tc-getCXX) ${CXXFLAGS}/" \ |
| 94 |
- -e 's/--export-dynamic/-Wl,--export-dynamic/g' \ |
| 95 |
- "${S}/Makefile" || die |
| 96 |
- cp config.makefile.template config.makefile |
| 97 |
- sed -i -e '/^[ \t]*read/ d' -e 's/SHELL_ANS=0/SHELL_ANS=1/' "${S}/arb_install.sh" || die |
| 98 |
- use amd64 && sed -i -e 's/ARB_64 := 0/ARB_64 := 1/' config.makefile |
| 99 |
- use opengl || sed -i -e 's/OPENGL := 1/OPENGL := 0/' config.makefile |
| 100 |
- emake ARBHOME="${S}" links || die |
| 101 |
-} |
| 102 |
- |
| 103 |
-src_compile() { |
| 104 |
- emake ARBHOME="${S}" PATH="${PATH}:${S}/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" tarfile || die |
| 105 |
- use amd64 && mv arb.tgz arb.64.gentoo.tgz |
| 106 |
- use x86 && mv arb.tgz arb.32.gentoo.tgz |
| 107 |
- ln -s arb.*.tgz arb.tgz || die |
| 108 |
-} |
| 109 |
- |
| 110 |
-src_install() { |
| 111 |
- ARBHOME="${D}/opt/arb" "${S}/arb_install.sh" || die |
| 112 |
- cat <<- EOF > "${S}/99${PN}" |
| 113 |
- ARBHOME=/opt/arb |
| 114 |
- PATH=/opt/arb/bin |
| 115 |
- LD_LIBRARY_PATH=/opt/arb/lib |
| 116 |
- EOF |
| 117 |
- doenvd "${S}/99${PN}" || die |
| 118 |
-} |
| 119 |
|
| 120 |
diff --git a/sci-biology/arb/arb-5.2.ebuild b/sci-biology/arb/arb-5.2.ebuild |
| 121 |
deleted file mode 100644 |
| 122 |
index a7388bf9b81..00000000000 |
| 123 |
--- a/sci-biology/arb/arb-5.2.ebuild |
| 124 |
+++ /dev/null |
| 125 |
@@ -1,79 +0,0 @@ |
| 126 |
-# Copyright 1999-2016 Gentoo Foundation |
| 127 |
-# Distributed under the terms of the GNU General Public License v2 |
| 128 |
- |
| 129 |
-EAPI=4 |
| 130 |
- |
| 131 |
-inherit eutils toolchain-funcs |
| 132 |
- |
| 133 |
-DESCRIPTION="Tools for DNA/RNA sequence database handling and phylogenetic analysis" |
| 134 |
-HOMEPAGE="http://www.arb-home.de/" |
| 135 |
-SRC_URI=" |
| 136 |
- http://download.arb-home.de/release/arb_${PV}/arbsrc.tgz -> ${P}.tgz |
| 137 |
- https://dev.gentoo.org/~jlec/distfiles/${P}-linker.patch.bz2" |
| 138 |
- |
| 139 |
-SLOT="0" |
| 140 |
-LICENSE="arb" |
| 141 |
-IUSE="+opengl" |
| 142 |
-KEYWORDS="~amd64 ~x86" |
| 143 |
- |
| 144 |
-CDEPEND="app-text/sablotron |
| 145 |
- media-libs/libpng |
| 146 |
- media-libs/tiff |
| 147 |
- www-client/lynx |
| 148 |
- x11-libs/libXaw |
| 149 |
- x11-libs/libXpm |
| 150 |
- x11-libs/motif:0 |
| 151 |
- opengl? ( |
| 152 |
- media-libs/glew |
| 153 |
- media-libs/freeglut |
| 154 |
- || ( |
| 155 |
- media-libs/mesa[motif] |
| 156 |
- ( media-libs/mesa x11-libs/libGLw ) ) )" |
| 157 |
-DEPEND="${CDEPEND} |
| 158 |
- sys-process/time" |
| 159 |
-RDEPEND="${CDEPEND} |
| 160 |
- sci-visualization/gnuplot" |
| 161 |
-# Recommended: libmotif3 gv xfig xterm treetool java |
| 162 |
- |
| 163 |
-src_unpack() { |
| 164 |
- unpack ${A} |
| 165 |
- mv arbsrc* ${P} |
| 166 |
-} |
| 167 |
- |
| 168 |
-src_prepare() { |
| 169 |
- epatch \ |
| 170 |
- "${WORKDIR}"/${P}-linker.patch \ |
| 171 |
- "${FILESDIR}"/5.1-libs.patch \ |
| 172 |
- "${FILESDIR}"/5.1-bfr-overflow.patch \ |
| 173 |
- "${FILESDIR}"/${PV}-libpng15.patch \ |
| 174 |
- "${FILESDIR}"/${P}-gcc-47.patch |
| 175 |
- sed \ |
| 176 |
- -e 's/all: checks/all:/' \ |
| 177 |
- -e "s/GCC:=.*/GCC=$(tc-getCC) ${CFLAGS}/" \ |
| 178 |
- -e "s/GPP:=.*/GPP=$(tc-getCXX) ${CXXFLAGS}/" \ |
| 179 |
- -e 's:-O4::g' \ |
| 180 |
- -e 's:-pipe::g' \ |
| 181 |
- -i "${S}/Makefile" || die |
| 182 |
- cp config.makefile.template config.makefile |
| 183 |
- sed -i -e '/^[ \t]*read/ d' -e 's/SHELL_ANS=0/SHELL_ANS=1/' "${S}/arb_install.sh" || die |
| 184 |
- use amd64 && sed -i -e 's/ARB_64 := 0/ARB_64 := 1/' config.makefile |
| 185 |
- use opengl || sed -i -e 's/OPENGL := 1/OPENGL := 0/' config.makefile |
| 186 |
- emake ARBHOME="${S}" links |
| 187 |
-} |
| 188 |
- |
| 189 |
-src_compile() { |
| 190 |
- emake ARBHOME="${S}" PATH="${PATH}:${S}/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" tarfile |
| 191 |
- use amd64 && mv arb.tgz arb.64.gentoo.tgz |
| 192 |
- use x86 && mv arb.tgz arb.32.gentoo.tgz |
| 193 |
- ln -s arb.*.tgz arb.tgz || die |
| 194 |
-} |
| 195 |
- |
| 196 |
-src_install() { |
| 197 |
- ARBHOME="${D}/opt/arb" "${S}/arb_install.sh" || die |
| 198 |
- cat <<- EOF > "${S}/99${PN}" |
| 199 |
- ARBHOME=/opt/arb |
| 200 |
- PATH=/opt/arb/bin |
| 201 |
- LD_LIBRARY_PATH=/opt/arb/lib |
| 202 |
- EOF |
| 203 |
- doenvd "${S}/99${PN}" |
| 204 |
-} |
| 205 |
|
| 206 |
diff --git a/sci-biology/arb/arb-5.3.ebuild b/sci-biology/arb/arb-5.3.ebuild |
| 207 |
deleted file mode 100644 |
| 208 |
index 135bec2695c..00000000000 |
| 209 |
--- a/sci-biology/arb/arb-5.3.ebuild |
| 210 |
+++ /dev/null |
| 211 |
@@ -1,77 +0,0 @@ |
| 212 |
-# Copyright 1999-2016 Gentoo Foundation |
| 213 |
-# Distributed under the terms of the GNU General Public License v2 |
| 214 |
- |
| 215 |
-EAPI=4 |
| 216 |
- |
| 217 |
-inherit eutils toolchain-funcs |
| 218 |
- |
| 219 |
-DESCRIPTION="Tools for DNA/RNA sequence database handling and phylogenetic analysis" |
| 220 |
-HOMEPAGE="http://www.arb-home.de/" |
| 221 |
-SRC_URI=" |
| 222 |
- http://download.arb-home.de/release/arb_${PV}/arbsrc.tgz -> ${P}.tgz |
| 223 |
- https://dev.gentoo.org/~jlec/distfiles/${P}-linker.patch.xz" |
| 224 |
- |
| 225 |
-SLOT="0" |
| 226 |
-LICENSE="arb" |
| 227 |
-IUSE="+opengl" |
| 228 |
-KEYWORDS="~amd64 ~x86" |
| 229 |
- |
| 230 |
-CDEPEND="app-text/sablotron |
| 231 |
- media-libs/libpng |
| 232 |
- media-libs/tiff |
| 233 |
- www-client/lynx |
| 234 |
- x11-libs/libXaw |
| 235 |
- x11-libs/libXpm |
| 236 |
- x11-libs/motif:0 |
| 237 |
- opengl? ( |
| 238 |
- media-libs/glew |
| 239 |
- media-libs/freeglut |
| 240 |
- || ( |
| 241 |
- media-libs/mesa[motif] |
| 242 |
- ( media-libs/mesa x11-libs/libGLw ) ) )" |
| 243 |
-DEPEND="${CDEPEND} |
| 244 |
- sys-process/time" |
| 245 |
-RDEPEND="${CDEPEND} |
| 246 |
- sci-visualization/gnuplot" |
| 247 |
-# Recommended: libmotif3 gv xfig xterm treetool java |
| 248 |
- |
| 249 |
-src_unpack() { |
| 250 |
- unpack ${A} |
| 251 |
- mv arbsrc* ${P} |
| 252 |
-} |
| 253 |
- |
| 254 |
-src_prepare() { |
| 255 |
- epatch \ |
| 256 |
- "${WORKDIR}"/${P}-linker.patch \ |
| 257 |
- "${FILESDIR}"/5.1-libs.patch \ |
| 258 |
- "${FILESDIR}"/5.1-bfr-overflow.patch \ |
| 259 |
- "${FILESDIR}"/5.2-libpng15.patch \ |
| 260 |
- "${FILESDIR}"/${PN}-5.2-gcc-47.patch |
| 261 |
- sed \ |
| 262 |
- -e 's/all: checks/all:/' \ |
| 263 |
- -e "s/GCC:=.*/GCC=$(tc-getCC) ${CFLAGS}/" \ |
| 264 |
- -e "s/GPP:=.*/GPP=$(tc-getCXX) ${CXXFLAGS}/" \ |
| 265 |
- -i "${S}/Makefile" || die |
| 266 |
- cp config.makefile.template config.makefile |
| 267 |
- sed -i -e '/^[ \t]*read/ d' -e 's/SHELL_ANS=0/SHELL_ANS=1/' "${S}/arb_install.sh" || die |
| 268 |
- use amd64 && sed -i -e 's/ARB_64 := 0/ARB_64 := 1/' config.makefile |
| 269 |
- use opengl || sed -i -e 's/OPENGL := 1/OPENGL := 0/' config.makefile |
| 270 |
- emake ARBHOME="${S}" links |
| 271 |
-} |
| 272 |
- |
| 273 |
-src_compile() { |
| 274 |
- emake ARBHOME="${S}" PATH="${PATH}:${S}/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" tarfile |
| 275 |
- use amd64 && mv arb.tgz arb.64.gentoo.tgz |
| 276 |
- use x86 && mv arb.tgz arb.32.gentoo.tgz |
| 277 |
- ln -s arb.*.tgz arb.tgz || die |
| 278 |
-} |
| 279 |
- |
| 280 |
-src_install() { |
| 281 |
- ARBHOME="${D}/opt/arb" "${S}/arb_install.sh" || die |
| 282 |
- cat <<- EOF > "${S}/99${PN}" |
| 283 |
- ARBHOME=/opt/arb |
| 284 |
- PATH=/opt/arb/bin |
| 285 |
- LD_LIBRARY_PATH=/opt/arb/lib |
| 286 |
- EOF |
| 287 |
- doenvd "${S}/99${PN}" |
| 288 |
-} |
| 289 |
|
| 290 |
diff --git a/sci-biology/arb/files/5.1-bfr-overflow.patch b/sci-biology/arb/files/5.1-bfr-overflow.patch |
| 291 |
deleted file mode 100644 |
| 292 |
index 21d21f5ac17..00000000000 |
| 293 |
--- a/sci-biology/arb/files/5.1-bfr-overflow.patch |
| 294 |
+++ /dev/null |
| 295 |
@@ -1,16 +0,0 @@ |
| 296 |
- ARB_GDE/GDE_HGLfile.cxx | 2 +- |
| 297 |
- 1 files changed, 1 insertions(+), 1 deletions(-) |
| 298 |
- |
| 299 |
-diff --git a/ARB_GDE/GDE_HGLfile.cxx b/ARB_GDE/GDE_HGLfile.cxx |
| 300 |
-index e353a89..f69635a 100644 |
| 301 |
---- a/ARB_GDE/GDE_HGLfile.cxx |
| 302 |
-+++ b/ARB_GDE/GDE_HGLfile.cxx |
| 303 |
-@@ -494,7 +494,7 @@ void ReadGDE(char *filename,NA_Alignment *dataset,int type) |
| 304 |
- if(this_elem->id[0] == '\0') |
| 305 |
- strncpy(this_elem->id,uniqueID(),79); |
| 306 |
- if(this_elem->short_name[0] == '\0') |
| 307 |
-- strncpy(this_elem->short_name,this_elem->id,79); |
| 308 |
-+ strncpy(this_elem->short_name,this_elem->id,31); |
| 309 |
- if(this_elem->seqlen == 0) |
| 310 |
- this_elem->protect= |
| 311 |
- PROT_BASE_CHANGES+ |
| 312 |
|
| 313 |
diff --git a/sci-biology/arb/files/5.1-libs.patch b/sci-biology/arb/files/5.1-libs.patch |
| 314 |
deleted file mode 100644 |
| 315 |
index bf0bacad328..00000000000 |
| 316 |
--- a/sci-biology/arb/files/5.1-libs.patch |
| 317 |
+++ /dev/null |
| 318 |
@@ -1,16 +0,0 @@ |
| 319 |
-diff --git a/SOURCE_TOOLS/provide_libs.pl b/SOURCE_TOOLS/provide_libs.pl |
| 320 |
-index b653a66..b346c96 100644 |
| 321 |
---- a/SOURCE_TOOLS/provide_libs.pl |
| 322 |
-+++ b/SOURCE_TOOLS/provide_libs.pl |
| 323 |
-@@ -118,11 +118,6 @@ sub provide_libs($$$) { |
| 324 |
- foreach my $lib (keys %needed_by) { |
| 325 |
- update_lib($lib, $bindir.'/'.$needed_by{$lib}, $addlibsdir); |
| 326 |
- } |
| 327 |
-- if ($opengl==1) { |
| 328 |
-- foreach my $lib (keys %needed_by_opengl) { |
| 329 |
-- update_lib($lib, $bindir.'/'.$needed_by_opengl{$lib}, $addlibsdir); |
| 330 |
-- } |
| 331 |
-- } |
| 332 |
- } |
| 333 |
- |
| 334 |
- sub main() { |
| 335 |
|
| 336 |
diff --git a/sci-biology/arb/files/5.2-libpng15.patch b/sci-biology/arb/files/5.2-libpng15.patch |
| 337 |
deleted file mode 100644 |
| 338 |
index 3d750e76efe..00000000000 |
| 339 |
--- a/sci-biology/arb/files/5.2-libpng15.patch |
| 340 |
+++ /dev/null |
| 341 |
@@ -1,45 +0,0 @@ |
| 342 |
-Fix building with libpng-1.5 |
| 343 |
- |
| 344 |
-https://bugs.gentoo.org/show_bug.cgi?id=378353 |
| 345 |
- |
| 346 |
-Patch written by Samuli Suominen <ssuominen@g.o> |
| 347 |
---- a/GL/glpng/glpng.c |
| 348 |
-+++ b/GL/glpng/glpng.c |
| 349 |
-@@ -285,7 +285,7 @@ |
| 350 |
- endinfo = png_create_info_struct(png); |
| 351 |
- |
| 352 |
- // DH: added following lines |
| 353 |
-- if (setjmp(png->jmpbuf)) |
| 354 |
-+ if (setjmp(png_jmpbuf(png))) |
| 355 |
- { |
| 356 |
- png_destroy_read_struct(&png, &info, &endinfo); |
| 357 |
- return 0; |
| 358 |
-@@ -390,7 +390,7 @@ |
| 359 |
- endinfo = png_create_info_struct(png); |
| 360 |
- |
| 361 |
- // DH: added following lines |
| 362 |
-- if (setjmp(png->jmpbuf)) |
| 363 |
-+ if (setjmp(png_jmpbuf(png))) |
| 364 |
- { |
| 365 |
- png_destroy_read_struct(&png, &info, &endinfo); |
| 366 |
- return 0; |
| 367 |
-@@ -569,7 +569,7 @@ |
| 368 |
- #define ALPHA *q |
| 369 |
- |
| 370 |
- switch (trans) { |
| 371 |
-- case PNG_CALLBACK: |
| 372 |
-+ case PNG_CALLBACKT: |
| 373 |
- FORSTART |
| 374 |
- ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b); |
| 375 |
- FOREND |
| 376 |
---- a/GL/glpng/glpng.h |
| 377 |
-+++ b/GL/glpng/glpng.h |
| 378 |
-@@ -57,7 +57,7 @@ |
| 379 |
- #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS |
| 380 |
- |
| 381 |
- /* Transparency parameters */ |
| 382 |
--#define PNG_CALLBACK -3 /* Call the callback function to generate alpha */ |
| 383 |
-+#define PNG_CALLBACKT -3 /* Call the callback function to generate alpha */ |
| 384 |
- #define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */ |
| 385 |
- #define PNG_SOLID -1 /* No transparency */ |
| 386 |
- #define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */ |
| 387 |
|
| 388 |
diff --git a/sci-biology/arb/files/arb-5.2-gcc-47.patch b/sci-biology/arb/files/arb-5.2-gcc-47.patch |
| 389 |
deleted file mode 100644 |
| 390 |
index 186e78e450b..00000000000 |
| 391 |
--- a/sci-biology/arb/files/arb-5.2-gcc-47.patch |
| 392 |
+++ /dev/null |
| 393 |
@@ -1,15 +0,0 @@ |
| 394 |
- AWTI/AWTI_import.cxx | 1 + |
| 395 |
- 1 files changed, 1 insertions(+), 0 deletions(-) |
| 396 |
- |
| 397 |
-diff --git a/AWTI/AWTI_import.cxx b/AWTI/AWTI_import.cxx |
| 398 |
-index 8e730ac..e3f9ff4 100644 |
| 399 |
---- a/AWTI/AWTI_import.cxx |
| 400 |
-+++ b/AWTI/AWTI_import.cxx |
| 401 |
-@@ -12,6 +12,7 @@ |
| 402 |
- #include <GEN.hxx> |
| 403 |
- |
| 404 |
- #include <climits> |
| 405 |
-+#include <unistd.h> |
| 406 |
- |
| 407 |
- using namespace std; |
| 408 |
- |
Archives