| 1 |
xmw 13/08/28 10:28:18 |
| 2 |
|
| 3 |
Modified: mupdf-9999.ebuild ChangeLog |
| 4 |
Added: mupdf-1.3.ebuild |
| 5 |
Log: |
| 6 |
Version bump, rename patch files, fix desktop file. |
| 7 |
|
| 8 |
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.41 app-text/mupdf/mupdf-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?rev=1.41&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?rev=1.41&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?r1=1.40&r2=1.41 |
| 16 |
|
| 17 |
Index: mupdf-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v |
| 20 |
retrieving revision 1.40 |
| 21 |
retrieving revision 1.41 |
| 22 |
diff -u -r1.40 -r1.41 |
| 23 |
--- mupdf-9999.ebuild 22 Jul 2013 19:44:33 -0000 1.40 |
| 24 |
+++ mupdf-9999.ebuild 28 Aug 2013 10:28:18 -0000 1.41 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2013 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.40 2013/07/22 19:44:33 xmw Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.41 2013/08/28 10:28:18 xmw Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
@@ -38,21 +38,21 @@ |
| 34 |
rm -rf thirdparty || die |
| 35 |
|
| 36 |
epatch \ |
| 37 |
- "${FILESDIR}"/${P}-CFLAGS.patch \ |
| 38 |
- "${FILESDIR}"/${P}-openjpeg2.patch \ |
| 39 |
- "${FILESDIR}"/${P}-pkg-config.patch \ |
| 40 |
- "${FILESDIR}"/${P}-sys_curl.patch |
| 41 |
+ "${FILESDIR}"/${PN}-1.3-CFLAGS.patch \ |
| 42 |
+ "${FILESDIR}"/${PN}-1.3-openjpeg2.patch \ |
| 43 |
+ "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ |
| 44 |
+ "${FILESDIR}"/${PN}-1.3-sys_curl.patch |
| 45 |
|
| 46 |
sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ |
| 47 |
-e "/^prefix=/s:=.*:=${EROOR}/usr:" \ |
| 48 |
-i platform/debian/${PN}.pc || die |
| 49 |
|
| 50 |
use vanilla || epatch \ |
| 51 |
- "${FILESDIR}"/${P}-zoom-2.patch \ |
| 52 |
- "${FILESDIR}"/${P}-forward_back.patch |
| 53 |
+ "${FILESDIR}"/${PN}-1.3-zoom-2.patch \ |
| 54 |
+ "${FILESDIR}"/${PN}-1.3-forward_back.patch |
| 55 |
|
| 56 |
#http://bugs.ghostscript.com/show_bug.cgi?id=693467 |
| 57 |
- sed -e '/^Actions=/s:=.*:=View;:' \ |
| 58 |
+ sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ |
| 59 |
-i platform/debian/${PN}.desktop || die |
| 60 |
|
| 61 |
sed -e "\$aOS = Linux" \ |
| 62 |
@@ -93,32 +93,32 @@ |
| 63 |
src_compile() { |
| 64 |
emake XCFLAGS="-fpic" |
| 65 |
use static-libs && \ |
| 66 |
- emake -C "${S}"-static build/debug/libmupdf{,-js-none}.a |
| 67 |
+ emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a |
| 68 |
use static && \ |
| 69 |
emake -C "${S}"-static XLIBS="-static" |
| 70 |
} |
| 71 |
|
| 72 |
src_install() { |
| 73 |
if use X ; then |
| 74 |
- domenu platform/debian/mupdf.desktop |
| 75 |
- doicon platform/debian/mupdf.xpm |
| 76 |
+ domenu platform/debian/${PN}.desktop |
| 77 |
+ doicon platform/debian/${PN}.xpm |
| 78 |
else |
| 79 |
- rm docs/man/mupdf.1 |
| 80 |
+ rm docs/man/${PN}.1 |
| 81 |
fi |
| 82 |
|
| 83 |
emake install |
| 84 |
- dosym ${my_soname} /usr/$(get_libdir)/libmupdf.so |
| 85 |
+ dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so |
| 86 |
|
| 87 |
use static-libs && \ |
| 88 |
- dolib.a "${S}"-static/build/debug/libmupdf{,-js-none}.a |
| 89 |
+ dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a |
| 90 |
if use static ; then |
| 91 |
dobin "${S}"-static/build/debug/mu{tool,draw} |
| 92 |
- use X && dobin "${S}"-static/build/debug/mupdf-x11 |
| 93 |
+ use X && dobin "${S}"-static/build/debug/${PN}-x11 |
| 94 |
fi |
| 95 |
- use X && dosym mupdf-x11 /usr/bin/mupdf |
| 96 |
+ use X && dosym ${PN}-x11 /usr/bin/${PN} |
| 97 |
|
| 98 |
insinto /usr/$(get_libdir)/pkgconfig |
| 99 |
- doins platform/debian/mupdf.pc |
| 100 |
+ doins platform/debian/${PN}.pc |
| 101 |
|
| 102 |
dodoc README docs/*.{txt,c} |
| 103 |
} |
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
1.87 app-text/mupdf/ChangeLog |
| 108 |
|
| 109 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.87&view=markup |
| 110 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.87&content-type=text/plain |
| 111 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?r1=1.86&r2=1.87 |
| 112 |
|
| 113 |
Index: ChangeLog |
| 114 |
=================================================================== |
| 115 |
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v |
| 116 |
retrieving revision 1.86 |
| 117 |
retrieving revision 1.87 |
| 118 |
diff -u -r1.86 -r1.87 |
| 119 |
--- ChangeLog 22 Jul 2013 19:44:33 -0000 1.86 |
| 120 |
+++ ChangeLog 28 Aug 2013 10:28:18 -0000 1.87 |
| 121 |
@@ -1,6 +1,18 @@ |
| 122 |
# ChangeLog for app-text/mupdf |
| 123 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 124 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.86 2013/07/22 19:44:33 xmw Exp $ |
| 125 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.87 2013/08/28 10:28:18 xmw Exp $ |
| 126 |
+ |
| 127 |
+*mupdf-1.3 (28 Aug 2013) |
| 128 |
+ |
| 129 |
+ 28 Aug 2013; Michael Weber <xmw@g.o> +files/mupdf-1.3-CFLAGS.patch, |
| 130 |
+ +files/mupdf-1.3-forward_back.patch, +files/mupdf-1.3-openjpeg2.patch, |
| 131 |
+ +files/mupdf-1.3-pkg-config.patch, +files/mupdf-1.3-sys_curl.patch, |
| 132 |
+ +files/mupdf-1.3-zoom-2.patch, +mupdf-1.3.ebuild, |
| 133 |
+ -files/mupdf-9999-CFLAGS.patch, -files/mupdf-9999-forward_back.patch, |
| 134 |
+ -files/mupdf-9999-openjpeg2.patch, -files/mupdf-9999-pkg-config.patch, |
| 135 |
+ -files/mupdf-9999-sys_curl.patch, -files/mupdf-9999-zoom-2.patch, |
| 136 |
+ mupdf-9999.ebuild: |
| 137 |
+ Version bump, rename patch files, fix desktop file. |
| 138 |
|
| 139 |
22 Jul 2013; Michael Weber <xmw@g.o> mupdf-9999.ebuild: |
| 140 |
Update live ebuild for new binary name. |
| 141 |
|
| 142 |
|
| 143 |
|
| 144 |
1.1 app-text/mupdf/mupdf-1.3.ebuild |
| 145 |
|
| 146 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.3.ebuild?rev=1.1&view=markup |
| 147 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.3.ebuild?rev=1.1&content-type=text/plain |
| 148 |
|
| 149 |
Index: mupdf-1.3.ebuild |
| 150 |
=================================================================== |
| 151 |
# Copyright 1999-2013 Gentoo Foundation |
| 152 |
# Distributed under the terms of the GNU General Public License v2 |
| 153 |
# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.3.ebuild,v 1.1 2013/08/28 10:28:18 xmw Exp $ |
| 154 |
|
| 155 |
EAPI=5 |
| 156 |
|
| 157 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 158 |
|
| 159 |
DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" |
| 160 |
HOMEPAGE="http://mupdf.com/" |
| 161 |
SRC_URI="http://${PN}.googlecode.com/files/${P}-source.tar.gz" |
| 162 |
|
| 163 |
LICENSE="AGPL-3" |
| 164 |
SLOT="0/1.2" |
| 165 |
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 166 |
IUSE="X vanilla static static-libs" |
| 167 |
|
| 168 |
LIB_DEPEND="dev-libs/openssl[static-libs?] |
| 169 |
media-libs/freetype:2[static-libs?] |
| 170 |
media-libs/jbig2dec[static-libs?] |
| 171 |
media-libs/openjpeg:2[static-libs?] |
| 172 |
net-misc/curl[static-libs?] |
| 173 |
virtual/jpeg[static-libs?] |
| 174 |
X? ( x11-libs/libX11[static-libs?] |
| 175 |
x11-libs/libXext[static-libs?] )" |
| 176 |
RDEPEND="${LIB_DEPEND}" |
| 177 |
DEPEND="${RDEPEND} |
| 178 |
virtual/pkgconfig |
| 179 |
static-libs? ( ${LIB_DEPEND} ) |
| 180 |
static? ( ${LIB_DEPEND//?} |
| 181 |
app-arch/bzip2[static-libs] |
| 182 |
x11-libs/libXau[static-libs] |
| 183 |
x11-libs/libXdmcp[static-libs] |
| 184 |
x11-libs/libxcb[static-libs] )" |
| 185 |
|
| 186 |
S=${WORKDIR}/${P}-source |
| 187 |
|
| 188 |
src_prepare() { |
| 189 |
rm -rf thirdparty || die |
| 190 |
|
| 191 |
epatch \ |
| 192 |
"${FILESDIR}"/${P}-CFLAGS.patch \ |
| 193 |
"${FILESDIR}"/${P}-openjpeg2.patch \ |
| 194 |
"${FILESDIR}"/${P}-pkg-config.patch \ |
| 195 |
"${FILESDIR}"/${P}-sys_curl.patch |
| 196 |
|
| 197 |
sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ |
| 198 |
-e "/^prefix=/s:=.*:=${EROOR}/usr:" \ |
| 199 |
-i platform/debian/${PN}.pc || die |
| 200 |
|
| 201 |
use vanilla || epatch \ |
| 202 |
"${FILESDIR}"/${P}-zoom-2.patch \ |
| 203 |
"${FILESDIR}"/${P}-forward_back.patch |
| 204 |
|
| 205 |
#http://bugs.ghostscript.com/show_bug.cgi?id=693467 |
| 206 |
sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ |
| 207 |
-i platform/debian/${PN}.desktop || die |
| 208 |
|
| 209 |
sed -e "\$aOS = Linux" \ |
| 210 |
-e "\$aCC = $(tc-getCC)" \ |
| 211 |
-e "\$aLD = $(tc-getCC)" \ |
| 212 |
-e "\$aAR = $(tc-getAR)" \ |
| 213 |
-e "\$averbose = true" \ |
| 214 |
-e "\$abuild = debug" \ |
| 215 |
-e "\$aprefix = ${ED}usr" \ |
| 216 |
-e "\$alibdir = ${ED}usr/$(get_libdir)" \ |
| 217 |
-i Makerules || die |
| 218 |
|
| 219 |
if ! use X ; then |
| 220 |
sed -e "\$aNOX11 = yes" \ |
| 221 |
-i Makerules || die |
| 222 |
fi |
| 223 |
|
| 224 |
if use static-libs || use static ; then |
| 225 |
cp -a "${S}" "${S}"-static || die |
| 226 |
#add missing Libs.private for xcb and freetype |
| 227 |
sed -e 's:\(pkg-config --libs\):\1 --static:' \ |
| 228 |
-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \ |
| 229 |
-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \ |
| 230 |
-i "${S}"-static/Makerules || die |
| 231 |
fi |
| 232 |
|
| 233 |
my_soname=libmupdf.so.1.2 |
| 234 |
my_soname_js_none=libmupdf-js-none.so.1.2 |
| 235 |
sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ |
| 236 |
-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ |
| 237 |
-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ |
| 238 |
-e "\$a\$(MUPDF_JS_NONE_LIB):" \ |
| 239 |
-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ |
| 240 |
-e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \ |
| 241 |
-i Makefile || die |
| 242 |
} |
| 243 |
|
| 244 |
src_compile() { |
| 245 |
emake XCFLAGS="-fpic" |
| 246 |
use static-libs && \ |
| 247 |
emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a |
| 248 |
use static && \ |
| 249 |
emake -C "${S}"-static XLIBS="-static" |
| 250 |
} |
| 251 |
|
| 252 |
src_install() { |
| 253 |
if use X ; then |
| 254 |
domenu platform/debian/${PN}.desktop |
| 255 |
doicon platform/debian/${PN}.xpm |
| 256 |
else |
| 257 |
rm docs/man/${PN}.1 |
| 258 |
fi |
| 259 |
|
| 260 |
emake install |
| 261 |
dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so |
| 262 |
|
| 263 |
use static-libs && \ |
| 264 |
dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a |
| 265 |
if use static ; then |
| 266 |
dobin "${S}"-static/build/debug/mu{tool,draw} |
| 267 |
use X && dobin "${S}"-static/build/debug/${PN}-x11 |
| 268 |
fi |
| 269 |
use X && dosym ${PN}-x11 /usr/bin/${PN} |
| 270 |
|
| 271 |
insinto /usr/$(get_libdir)/pkgconfig |
| 272 |
doins platform/debian/${PN}.pc |
| 273 |
|
| 274 |
dodoc README docs/*.{txt,c} |
| 275 |
} |
Archives