public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/
Date: Fri, 29 Sep 2023 10:33:09 +0000 (UTC)	[thread overview]
Message-ID: <1695983536.9bda5dd1af00436a587b9e5f021835c219f5197c.sam@gentoo> (raw)

commit:     9bda5dd1af00436a587b9e5f021835c219f5197c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 10:29:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 10:32:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bda5dd1

games-fps/urbanterror: drop workaround for newer zlib

See 491bf8bd3ef621da49b168736a04f23aa4c7719c. Could do ifndef in patch
but I'd like to remove all of these eventually and there's only a handful.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
index b0041846f317..28b623b2193d 100644
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -68,7 +68,7 @@ src_configure() {
 src_compile() {
 	# Workaround for used zlib macro, which got renamed in Gentoo
 	# wrt bug #449510
-	append-cppflags "-DOF=_Z_OF"
+	has_version "<sys-libs/zlib-1.3" && append-cppflags "-DOF=_Z_OF"
 
 	local myemakeargs=(
 		ARCH=$(usex amd64 "x86_64" "i686" )


             reply	other threads:[~2023-09-29 10:33 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-29 10:33 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-20 21:41 [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/ James Le Cuirot
2022-06-30  0:40 Kenton Groombridge
2021-03-09  9:26 Joonas Niilola
2021-03-09  9:26 Joonas Niilola
2020-07-19 12:06 James Le Cuirot
2020-07-19 12:06 James Le Cuirot
2018-07-06 21:48 Andreas Sturmlechner
2018-07-06 21:48 Andreas Sturmlechner
2018-05-09 11:15 Michał Górny
2018-03-15 22:27 Andreas Sturmlechner
2018-03-03 12:08 Michał Górny
2018-02-18  0:05 Patrice Clement
2018-02-18  0:05 Patrice Clement
2018-02-13 16:01 Michał Górny
2018-02-13 16:01 Michał Górny
2018-02-07 19:19 Michał Górny
2018-02-07 19:19 Michał Górny
2018-01-09 11:26 Patrice Clement
2017-12-10 20:42 James Le Cuirot
2017-10-25 17:43 Craig Andrews
2017-10-02 22:25 Patrice Clement
2017-08-30  6:26 David Seifert
2017-07-16 21:02 Thomas Deutschmann
2017-06-09 10:34 Thomas Deutschmann
2017-06-09 10:19 Agostino Sarubbo
2017-06-08 10:16 Agostino Sarubbo
2017-05-10 20:14 Thomas Deutschmann
2016-03-19 23:02 Michael Sterrett

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1695983536.9bda5dd1af00436a587b9e5f021835c219f5197c.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox