diff options
Diffstat (limited to 'app-text/mupdf')
| -rw-r--r-- | app-text/mupdf/Manifest | 4 | ||||
| -rw-r--r-- | app-text/mupdf/mupdf-1.14.0-r3.ebuild | 2 | ||||
| -rw-r--r-- | app-text/mupdf/mupdf-1.15.0.ebuild | 12 |
3 files changed, 13 insertions, 5 deletions
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 1d75ebac4ec4..b5636b577356 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -12,6 +12,6 @@ AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a76 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320 SHA512 ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd EBUILD mupdf-1.14.0-r2.ebuild 3116 BLAKE2B 1700ed8f0eacc1c986393b597df20d4b45a2158ddedbe472281e900d8dc79ce4a76aafc5be0e3f35977afd6cecb643b7a382c6a7e0a422987d23b20bf2697343 SHA512 442a258938c868062ddd3de127da51c475c89908f466aa12d8baf44b4c29fa961c99f3e1eb3649672e1855cc447eb1b30f2aa31ed80ff1c2c751716b743ee6d8 -EBUILD mupdf-1.14.0-r3.ebuild 3238 BLAKE2B 8abeb9aed58d3222403f305c51b2ac04c2b2e03ae933e2fdf4bfd7f12abf32ff09ef1b1e0204c28a25eedbf17397b02037dfc60cc6bbe29404fe5d34b4bca0d7 SHA512 a2cacbc18f138ec601bb09b2760d949af8aeb78486f54f8c6a9dd069dca563e175c80d587f75622038e94f096d345258bd9738da4ae37ef86df285f0dcad76e9 -EBUILD mupdf-1.15.0.ebuild 3137 BLAKE2B ff4724df2f1510c9b0449e598df551c051a1c1fea623349129039e65be80f7164edb43e74288ae7f904b173633b14b7ce494159b477a75be96c20408ef04300d SHA512 f7dbb3e75e186f6d6a907349a36a78782dbdf468bc120c5c8b2a70ca81a404eb542edde585f53fa9476e0a625726ae5f828d80f6e93852cf71e47262c1255383 +EBUILD mupdf-1.14.0-r3.ebuild 3236 BLAKE2B c2f0ac79635932c9c662c176056342a1e26428390fa850da680e2682b26ae01b09e687cfdbe5426403c96e0cafe992bfb4adf157b0b095d23763818dd6ec9495 SHA512 090559082f61ccaa0e9e787de6e660b68ff8143300dbab9605e00a4d95901ab278586fd8d702a7e854678e1ec879fc1990580fee88b338b4f2126990dc64acdb +EBUILD mupdf-1.15.0.ebuild 3505 BLAKE2B be357aae0944fda68a0e95cf12e2936ec94428d5baa645399add9f87ca5127de85898f22fb56762d7fb88d6ed3e61874723f7668fb9c4a2ac942585e3ddbde6f SHA512 41209dd40db318acaa224a031672fb9281dd674a6803b789da1cd673ab18af08c4fcdd2f5d82ccc5076026fec056986d2b67f1adc4b4cf3a7a0aca56787d7b75 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild index 34e7a6e9d187..cc0d347167e7 100644 --- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild +++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz" LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla" RDEPEND=" diff --git a/app-text/mupdf/mupdf-1.15.0.ebuild b/app-text/mupdf/mupdf-1.15.0.ebuild index 258ffd768026..7d1f75d3ee14 100644 --- a/app-text/mupdf/mupdf-1.15.0.ebuild +++ b/app-text/mupdf/mupdf-1.15.0.ebuild @@ -14,14 +14,17 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X +javascript libressl opengl ssl static-libs vanilla" +# Although we use the bundled, patched version of freeglut in mupdf (because of +# bug #653298), the best way to ensure that its dependencies are present is to +# install system's freeglut. RDEPEND=" - >=dev-lang/mujs-1.0.4 media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?,truetype] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] virtual/jpeg[static-libs?] + opengl? ( >=media-libs/freeglut-3.0.0:= ) ssl? ( libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] ) !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) @@ -73,15 +76,20 @@ src_prepare() { _emake() { # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. + # We don't use system's freeglut because upstream has a special modified # version of it that gives mupdf clipboard support. See bug #653298 + + # As of v1.15.0, mupdf started using symbols in mujs that were not part + # of any release. We thus go back to using the bundled version of it. + # Bug #685244 emake \ GENTOO_PV=${PV} \ HAVE_GLUT=$(usex opengl) \ HAVE_LIBCRYPTO=$(usex ssl) \ HAVE_X11=$(usex X) \ USE_SYSTEM_LIBS=yes \ - USE_SYSTEM_MUJS=yes \ + USE_SYSTEM_MUJS=no \ USE_SYSTEM_GLUT=no \ HAVE_OBJCOPY=no \ "$@" |