public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-text/mupdf: mupdf-1.7a.ebuild ChangeLog
@ 2015-05-20 15:08 Michael Weber (xmw)
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber (xmw) @ 2015-05-20 15:08 UTC (permalink / raw
  To: gentoo-commits

xmw         15/05/20 15:08:10

  Modified:             ChangeLog
  Added:                mupdf-1.7a.ebuild
  Log:
  Version bump (chneukirchen).
  
  (Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

Revision  Changes    Path
1.117                app-text/mupdf/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.117&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.117&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?r1=1.116&r2=1.117

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ChangeLog	17 Apr 2015 15:37:50 -0000	1.116
+++ ChangeLog	20 May 2015 15:08:10 -0000	1.117
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.116 2015/04/17 15:37:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.117 2015/05/20 15:08:10 xmw Exp $
+
+*mupdf-1.7a (20 May 2015)
+
+  20 May 2015; Michael Weber <xmw@gentoo.org> +mupdf-1.7a.ebuild:
+  Version bump (chneukirchen).
 
 *mupdf-1.7 (17 Apr 2015)
 



1.1                  app-text/mupdf/mupdf-1.7a.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild?rev=1.1&content-type=text/plain

Index: mupdf-1.7a.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild,v 1.1 2015/05/20 15:08:10 xmw Exp $

EAPI=5

inherit eutils multilib toolchain-funcs vcs-snapshot

DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
HOMEPAGE="http://mupdf.com/"
SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=987969ac033151810aade57d45c3d968dbf83d60;sf=tgz -> ${P}.tar.gz"

LICENSE="AGPL-3"
MY_SOVER=1.7
SLOT="0/${MY_SOVER}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="X vanilla +curl +openssl static static-libs"

LIB_DEPEND="dev-libs/openssl[static-libs?]
	media-libs/freetype:2[static-libs?]
	media-libs/jbig2dec[static-libs?]
	media-libs/openjpeg:2[static-libs?]
	net-misc/curl[static-libs?]
	virtual/jpeg[static-libs?]
	X? ( x11-libs/libX11[static-libs?]
		x11-libs/libXext[static-libs?] )"
RDEPEND="${LIB_DEPEND}"
DEPEND="${RDEPEND}
	virtual/pkgconfig
	static-libs? ( ${LIB_DEPEND} )
	static? ( ${LIB_DEPEND//?}
		app-arch/bzip2[static-libs]
		x11-libs/libXau[static-libs]
		x11-libs/libXdmcp[static-libs]
		x11-libs/libxcb[static-libs] )"

src_prepare() {
	rm -rf thirdparty || die

	epatch \
		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch

	if has_version ">=media-libs/openjpeg-2.1:2" ; then
		epatch \
			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
	fi

	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
		-i platform/debian/${PN}.pc || die

	use vanilla || epatch \
		"${FILESDIR}"/${PN}-1.3-zoom-2.patch

	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
		-i platform/debian/${PN}.desktop || die

	sed -e "1iOS = Linux" \
		-e "1iCC = $(tc-getCC)" \
		-e "1iLD = $(tc-getCC)" \
		-e "1iAR = $(tc-getAR)" \
		-e "1iverbose = yes" \
		-e "1ibuild = debug" \
		-e "1iprefix = ${ED}usr" \
		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
	    -e "1iHAVE_X11 = $(usex X)" \
		-e "1iWANT_OPENSSL = $(usex openssl)" \
		-e "1iWANT_CURL = $(usex curl)" \
		-i Makerules || die

	if use static-libs || use static ; then
		cp -a "${S}" "${S}"-static || die
		#add missing Libs.private for xcb and freetype
		sed -e 's:\(pkg-config --libs\):\1 --static:' \
		    -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
		    -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
			-i "${S}"-static/Makerules || die
	fi

	my_soname=libmupdf.so.${MY_SOVER}
	my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
		-e "/install/s: COPYING : :" \
		-i Makefile || die
}

src_compile() {
	emake XCFLAGS="-fpic"
	use static-libs && \
		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
	use static && \
		emake -C "${S}"-static XLIBS="-static"
}

src_install() {
	if use X ; then
		domenu platform/debian/${PN}.desktop
		doicon platform/debian/${PN}.xpm
	else
		rm docs/man/${PN}.1
	fi

	emake install
	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so

	use static-libs && \
		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
	if use static ; then
		dobin "${S}"-static/build/debug/mu{tool,draw}
		use X && dobin "${S}"-static/build/debug/${PN}-x11
	fi
	use X && dosym ${PN}-x11 /usr/bin/${PN}

	insinto /usr/$(get_libdir)/pkgconfig
	doins platform/debian/${PN}.pc

	dodoc README docs/*.{txt,c}
}





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/mupdf: mupdf-1.7a.ebuild ChangeLog
@ 2015-06-01 12:31 Michael Weber (xmw)
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber (xmw) @ 2015-06-01 12:31 UTC (permalink / raw
  To: gentoo-commits

xmw         15/06/01 12:31:41

  Modified:             mupdf-1.7a.ebuild ChangeLog
  Log:
  Enable javascript support (bug 550286, Cedric Sodhi).
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

Revision  Changes    Path
1.2                  app-text/mupdf/mupdf-1.7a.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild?r1=1.1&r2=1.2

Index: mupdf-1.7a.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mupdf-1.7a.ebuild	20 May 2015 15:08:10 -0000	1.1
+++ mupdf-1.7a.ebuild	1 Jun 2015 12:31:41 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild,v 1.1 2015/05/20 15:08:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild,v 1.2 2015/06/01 12:31:41 xmw Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@
 MY_SOVER=1.7
 SLOT="0/${MY_SOVER}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla +curl +openssl static static-libs"
+IUSE="X vanilla +curl javascript +openssl static static-libs"
 
 LIB_DEPEND="dev-libs/openssl[static-libs?]
 	media-libs/freetype:2[static-libs?]
@@ -23,7 +23,8 @@
 	net-misc/curl[static-libs?]
 	virtual/jpeg[static-libs?]
 	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )"
+		x11-libs/libXext[static-libs?] )
+	javascript? ( dev-lang/mujs )"
 RDEPEND="${LIB_DEPEND}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -41,7 +42,8 @@
 		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
 		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
 		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
+		"${FILESDIR}"/${PN}-1.7a-system-mujs.patch
 
 	if has_version ">=media-libs/openjpeg-2.1:2" ; then
 		epatch \
@@ -71,6 +73,9 @@
 	    -e "1iHAVE_X11 = $(usex X)" \
 		-e "1iWANT_OPENSSL = $(usex openssl)" \
 		-e "1iWANT_CURL = $(usex curl)" \
+		-e "1iHAVE_MUJS = $(usex javascript)" \
+		-e "1iMUJS_LIBS = -lmujs" \
+		-e "1iMUJS_CFLAGS =" \
 		-i Makerules || die
 
 	if use static-libs || use static ; then



1.118                app-text/mupdf/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.118&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.118&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?r1=1.117&r2=1.118

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ChangeLog	20 May 2015 15:08:10 -0000	1.117
+++ ChangeLog	1 Jun 2015 12:31:41 -0000	1.118
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.117 2015/05/20 15:08:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.118 2015/06/01 12:31:41 xmw Exp $
+
+  01 Jun 2015; Michael Weber <xmw@gentoo.org>
+  +files/mupdf-1.7a-system-mujs.patch, mupdf-1.7a.ebuild:
+  Enable javascript support (bug 550286, Cedric Sodhi).
 
 *mupdf-1.7a (20 May 2015)
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-06-01 12:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-20 15:08 [gentoo-commits] gentoo-x86 commit in app-text/mupdf: mupdf-1.7a.ebuild ChangeLog Michael Weber (xmw)
  -- strict thread matches above, loose matches on Subject: below --
2015-06-01 12:31 Michael Weber (xmw)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox