public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
Date: Thu, 29 Dec 2022 20:50:01 +0000 (UTC)	[thread overview]
Message-ID: <1672346922.4a46119e0149990be553c6ee7723cdeb16410c7f.flow@gentoo> (raw)

commit:     4a46119e0149990be553c6ee7723cdeb16410c7f
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 20:48:22 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 20:48:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a46119e

app-text/mupdf: rename drm macro to GENTOO_MUPDF_DRM

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-text/mupdf/files/mupdf-1.21.1-no-drm.patch | 2 +-
 app-text/mupdf/mupdf-1.21.1.ebuild             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch
index 356ee4b852dd..9f2b9d692f4e 100644
--- a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch
+++ b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch
@@ -6,7 +6,7 @@ index f764242..83888dc 100644
  	epub_chapter **tailp;
  	int i;
  
-+	#ifdef drm
++	#ifdef GENTOO_MUPDF_DRM
 	if (fz_has_archive_entry(ctx, zip, "META-INF/rights.xml"))
  		fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM");
  	if (fz_has_archive_entry(ctx, zip, "META-INF/encryption.xml"))

diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild
index 5b4674fadf25..ac2702bc5da4 100644
--- a/app-text/mupdf/mupdf-1.21.1.ebuild
+++ b/app-text/mupdf/mupdf-1.21.1.ebuild
@@ -60,7 +60,7 @@ src_prepare() {
 
 	use hppa && append-cflags -ffunction-sections
 
-	use drm && append-cflags -Ddrm
+	use drm && append-cflags -DGENTOO_MUPDF_DRM
 
 	append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
 


             reply	other threads:[~2022-12-29 20:50 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-29 20:50 Florian Schmaus [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-28  6:11 [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/ Joonas Niilola
2024-08-28  6:11 Joonas Niilola
2024-05-25  7:06 Arthur Zamarin
2024-05-25  7:06 Arthur Zamarin
2023-02-26  7:02 Joonas Niilola
2023-01-04  5:50 Sam James
2022-12-29 20:50 Florian Schmaus
2022-07-19  7:41 Florian Schmaus
2022-06-30 13:33 Florian Schmaus
2021-12-04  8:20 Joonas Niilola
2021-04-14 22:03 Sam James
2020-10-13 23:21 Sam James
2020-08-14  4:21 Sam James
2020-01-21 23:04 Sergei Trofimovich
2019-11-26 14:25 Jory Pratt
2019-05-07  2:39 Virgil Dupras
2019-02-19 21:02 Virgil Dupras
2018-12-16 20:24 Virgil Dupras
2018-08-27 19:53 Virgil Dupras
2018-04-12  1:03 Thomas Deutschmann
2018-01-28  9:53 Michael Weber
2017-03-06 22:12 Michael Weber
2017-02-09 21:10 Michael Weber
2017-01-23  0:31 Michael Weber
2016-06-04 19:46 Michael Weber
2015-08-10 22:52 Michael Weber

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=1672346922.4a46119e0149990be553c6ee7723cdeb16410c7f.flow@gentoo \
    --to=flow@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