* [gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-0.12.4-r3.ebuild
@ 2010-05-19 20:39 Fabian Groffen (grobian)
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen (grobian) @ 2010-05-19 20:39 UTC (permalink / raw
To: gentoo-commits
grobian 10/05/19 20:39:53
Modified: poppler-0.12.4-r3.ebuild
Log:
fix whitespace
(Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc)
Revision Changes Path
1.4 app-text/poppler/poppler-0.12.4-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?r1=1.3&r2=1.4
Index: poppler-0.12.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poppler-0.12.4-r3.ebuild 19 May 2010 20:38:58 -0000 1.3
+++ poppler-0.12.4-r3.ebuild 19 May 2010 20:39:53 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.3 2010/05/19 20:38:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.4 2010/05/19 20:39:53 grobian Exp $
EAPI="2"
@@ -63,7 +63,7 @@
# configure, since it typically is good at knowing this), I need to take
# this upstream still, configure and cmake conflict in this regard.
[[ ${CHOST} == *-darwin8 ]] && \
- sed -i -e '/add_definitions/d' cmake/modules/PopplerMacros.cmake
+ sed -i -e '/add_definitions/d' cmake/modules/PopplerMacros.cmake
}
src_configure() {
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-0.12.4-r3.ebuild
@ 2010-06-08 12:28 Fabian Groffen (grobian)
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen (grobian) @ 2010-06-08 12:28 UTC (permalink / raw
To: gentoo-commits
grobian 10/06/08 12:28:55
Modified: poppler-0.12.4-r3.ebuild
Log:
add upstream bug reference
(Portage version: 2.2.00.15842-prefix/cvs/SunOS i386)
Revision Changes Path
1.6 app-text/poppler/poppler-0.12.4-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?r1=1.5&r2=1.6
Index: poppler-0.12.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- poppler-0.12.4-r3.ebuild 8 Jun 2010 12:17:09 -0000 1.5
+++ poppler-0.12.4-r3.ebuild 8 Jun 2010 12:28:55 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.5 2010/06/08 12:17:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.6 2010/06/08 12:28:55 grobian Exp $
EAPI="2"
@@ -59,8 +59,8 @@
epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
epatch "${FILESDIR}"/${PN}-0.12.4-strings_h.patch #314925
epatch "${FILESDIR}"/${PN}-0.12.4-xopen_source.patch #314925
- # The whole _XOPEN_SOURCE thing breaks OSX Tiger and Solaris, I need to
- # take this upstream still, configure and cmake conflict in this regard.
+ # The whole _XOPEN_SOURCE thing breaks OSX Tiger and Solaris,
+ # upstream bug 28442.
[[ ${CHOST} == *-darwin8 || ${CHOST} == *-solaris* ]] && \
sed -i -e '/add_definitions/d' cmake/modules/PopplerMacros.cmake
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-0.12.4-r3.ebuild
@ 2010-06-08 19:18 Fabian Groffen (grobian)
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen (grobian) @ 2010-06-08 19:18 UTC (permalink / raw
To: gentoo-commits
grobian 10/06/08 19:18:43
Modified: poppler-0.12.4-r3.ebuild
Log:
update comment, the whole problem is caused by our own patches, and hence not a problem at all on upstream side
(Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc)
Revision Changes Path
1.7 app-text/poppler/poppler-0.12.4-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?r1=1.6&r2=1.7
Index: poppler-0.12.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- poppler-0.12.4-r3.ebuild 8 Jun 2010 12:28:55 -0000 1.6
+++ poppler-0.12.4-r3.ebuild 8 Jun 2010 19:18:43 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.6 2010/06/08 12:28:55 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.7 2010/06/08 19:18:43 grobian Exp $
EAPI="2"
@@ -59,8 +59,12 @@
epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
epatch "${FILESDIR}"/${PN}-0.12.4-strings_h.patch #314925
epatch "${FILESDIR}"/${PN}-0.12.4-xopen_source.patch #314925
- # The whole _XOPEN_SOURCE thing breaks OSX Tiger and Solaris,
- # upstream bug 28442.
+ # The whole _XOPEN_SOURCE thing breaks OSX Tiger and Solaris, this
+ # is introduced by #309297, and made worse by #314925. Since
+ # vanilla sources don't have this enabled, the whole _XOPEN_SOURCE
+ # isn't set by default, and hence correct from upstream's point of
+ # view. FreeBSD folks should file a proper bug for #314925 if they
+ # really need it to compile vanilla sources.
[[ ${CHOST} == *-darwin8 || ${CHOST} == *-solaris* ]] && \
sed -i -e '/add_definitions/d' cmake/modules/PopplerMacros.cmake
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-0.12.4-r3.ebuild
@ 2010-07-18 14:34 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 4+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-07-18 14:34 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/07/18 14:34:52
Modified: poppler-0.12.4-r3.ebuild
Log:
backport correct lcms depend from 0.14.0
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.13 app-text/poppler/poppler-0.12.4-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild?r1=1.12&r2=1.13
Index: poppler-0.12.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- poppler-0.12.4-r3.ebuild 18 Jul 2010 14:05:21 -0000 1.12
+++ poppler-0.12.4-r3.ebuild 18 Jul 2010 14:34:52 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.12 2010/07/18 14:05:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r3.ebuild,v 1.13 2010/07/18 14:34:52 ssuominen Exp $
EAPI="2"
@@ -27,7 +27,7 @@
)
jpeg? ( >=media-libs/jpeg-7:0 )
jpeg2k? ( media-libs/openjpeg )
- lcms? ( media-libs/lcms )
+ lcms? ( =media-libs/lcms-1* )
png? ( media-libs/libpng )
qt4? (
x11-libs/qt-core:4
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-18 14:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-08 19:18 [gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-0.12.4-r3.ebuild Fabian Groffen (grobian)
-- strict thread matches above, loose matches on Subject: below --
2010-07-18 14:34 Samuli Suominen (ssuominen)
2010-06-08 12:28 Fabian Groffen (grobian)
2010-05-19 20:39 Fabian Groffen (grobian)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox