Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-12-29 08:53:17 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-12-29 08:53:17 +0000
commit421b8a9c7b29329e2a464acb05a8934973261ee0 (patch)
tree6da8efb721bdc8c7804337e1d1f5b3c939b9f42e
parentUpdate pulseaudio patches #349665. (diff)
downloadhistorical-421b8a9c7b29329e2a464acb05a8934973261ee0.tar.gz
historical-421b8a9c7b29329e2a464acb05a8934973261ee0.tar.bz2
historical-421b8a9c7b29329e2a464acb05a8934973261ee0.zip
Fix building with recent poppler wrt #349943 by Helmut Jarausch.
Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64
Diffstat
-rw-r--r--app-text/epdfview/ChangeLog7
-rw-r--r--app-text/epdfview/Manifest16
-rw-r--r--app-text/epdfview/epdfview-0.1.7-r2.ebuild9
-rw-r--r--app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r354.patch58
-rw-r--r--app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r357.patch93
5 files changed, 167 insertions, 16 deletions
diff --git a/app-text/epdfview/ChangeLog b/app-text/epdfview/ChangeLog
index 2da37293f44e..87a18b66940e 100644
--- a/app-text/epdfview/ChangeLog
+++ b/app-text/epdfview/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/epdfview
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.38 2010/06/02 06:35:44 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.39 2010/12/29 08:53:17 ssuominen Exp $
+
+ 29 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> epdfview-0.1.7-r2.ebuild,
+ +files/epdfview-0.1.7-poppler-changeset_r354.patch,
+ +files/epdfview-0.1.7-poppler-changeset_r357.patch:
+ Fix building with recent poppler wrt #349943 by Helmut Jarausch.
02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
Remove omp from metadata.xml (#147119)
diff --git a/app-text/epdfview/Manifest b/app-text/epdfview/Manifest
index 5101552b18f7..21c49e49ee7a 100644
--- a/app-text/epdfview/Manifest
+++ b/app-text/epdfview/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX epdfview-0.1.6-gcc-4.3.patch 461 RMD160 762e02e1ec8362ec3d02ea9f66a6cd2754996b80 SHA1 31a379f94acd69ee475a718b011aaf559a5a4b55 SHA256 811b7f3226507594407e93c4509a6e4cf57a3d0d9f7caaf2f111d781e1892ae2
AUX epdfview-0.1.6-print-segfault.patch 4188 RMD160 1688d3fc61e6f980be79c52cbf80c399d7f583f7 SHA1 04dbf1ebb27279446980a22f276553fc71f18772 SHA256 cd23bc65d175a6757eab6d5eb854ddd8c39d69bc959ba6fc7dbc27a3415b7472
AUX epdfview-0.1.7-mouse-scrolling.patch 2068 RMD160 1e9fcf00f62033827606833c1be7cd74c9964e7b SHA1 5fdeb8eb9a2b6228cc3e1a02c4fd1178426de6bc SHA256 98646c9bf343c15a98f295ee0237d3170064202fdb9c29a92469399b612fa464
+AUX epdfview-0.1.7-poppler-changeset_r354.patch 2760 RMD160 e919394e2ec9c70e4cc605316312801da0b45b30 SHA1 36255f35c6a04fe1eee818172d5cda64d58535fc SHA256 f7ad1f3535ae1c3da68132c249219db461908f9d0d8e23fe5625ed53b9e977a3
+AUX epdfview-0.1.7-poppler-changeset_r357.patch 2812 RMD160 8d012ec2f9544fc188cd92b7471103a634300540 SHA1 17f14692e96ed6360f0d8c1c8b654b3b6153ea2b SHA256 c159e55140f70499bf81348ac9727730e1e9cfc69460e742fb4516a5d66be238
DIST epdfview-0.1.6.tar.bz2 406037 RMD160 69484cd68c1d344dfc38d321abd1e07fd22521e3 SHA1 1bb3a1d85b1d5b13c24a38c144910ddc329e0f0e SHA256 61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
DIST epdfview-0.1.7.tar.bz2 443609 RMD160 485399d1982a3f8128322ee7e13d46225573bae3 SHA1 ff46942c285b8e2c28766a38cdfce1a018b4a015 SHA256 0afbb0f348d4ba916cf58da48b4749b7cca6a9038136b27dc652161913704ae8
EBUILD epdfview-0.1.6-r1.ebuild 1111 RMD160 47fc913d9504125fcd423784c106781802ae978c SHA1 2a338cd3924359a7cce90a28ea169b49621dc5cc SHA256 dccb9c1cb66f4c7c46349b7c37b549d700787debc8273291fa238b577e0d52ef
-EBUILD epdfview-0.1.7-r2.ebuild 1315 RMD160 8a38cafd9f0896c3ac30890cf72929d06d5e74d2 SHA1 f53892460795b69521f502d477baf99b14a73a93 SHA256 85b01442b51ecb186bc57b4ece90a0f903f48c7b2bbc2f11d608a0bea5f2e8d7
-MISC ChangeLog 5403 RMD160 78c6403208842c853fd9ca0fb42d7fc43a7628c1 SHA1 ffdf52752db5a9e42aec23169ac2e2e6b04136e6 SHA256 a766492d5afc94ccff30da9ff7b776c935921482a20850e8655b8e4e3d7bcbf0
+EBUILD epdfview-0.1.7-r2.ebuild 1395 RMD160 f989b368676f43f6511c689b987444583103704c SHA1 47eeb8b8b859fabc1a211869a19d6eae04007bbb SHA256 a0630aa41e2669b5935aec8dba9e2dae27db3fe2df50a83ff848c4dea92bc763
+MISC ChangeLog 5664 RMD160 ab51edb62d10923414f3fb3eae9d54850710788b SHA1 94b1063bcc6870bc1b18030d4206e938f08e6c6f SHA256 f1ee720754dcc37cc8aedb5caf34a53641886034b218b3c1d3a70ca7541498cd
MISC metadata.xml 163 RMD160 ba353b61c2868f08c1a5ab7fd17ba07e23803ada SHA1 2c739f5b77738ff409261fc42afe98d34184dd59 SHA256 594509291d2b412ff651880da503140d0e9a954ecf778878edabb1875682b6b8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwF+8UACgkQV3J2n04EauxYvACgxC35utuwWW2yNMhU7a0zs57x
-Q8QAoL1GDVQQOZ/8KltdSBVfmgv4pMt3
-=Wd79
------END PGP SIGNATURE-----
diff --git a/app-text/epdfview/epdfview-0.1.7-r2.ebuild b/app-text/epdfview/epdfview-0.1.7-r2.ebuild
index d3a6fc0cc29c..9e5fedaf7b34 100644
--- a/app-text/epdfview/epdfview-0.1.7-r2.ebuild
+++ b/app-text/epdfview/epdfview-0.1.7-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild,v 1.2 2010/02/10 14:21:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild,v 1.3 2010/12/29 08:53:17 ssuominen Exp $
EAPI=2
-inherit eutils gnome2
+inherit autotools eutils gnome2
DESCRIPTION="Lightweight PDF viewer using Poppler and GTK+ libraries."
HOMEPAGE="http://trac.emma-soft.com/epdfview/"
@@ -36,7 +36,10 @@ src_prepare() {
-e 's:Icon=icon_epdfview-48:Icon=epdfview:' \
data/epdfview.desktop || die
- epatch "${FILESDIR}"/${PN}-0.1.7-mouse-scrolling.patch
+ epatch "${FILESDIR}"/${PN}-0.1.7-mouse-scrolling.patch \
+ "${FILESDIR}"/${P}-poppler-changeset_r35{4,7}.patch
+
+ eautoreconf
gnome2_src_prepare
}
diff --git a/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r354.patch b/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r354.patch
new file mode 100644
index 000000000000..a2d42b964599
--- /dev/null
+++ b/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r354.patch
@@ -0,0 +1,58 @@
+Index: /trunk/src/PDFDocument.cxx
+===================================================================
+--- /trunk/src/PDFDocument.cxx (revision 351)
++++ /trunk/src/PDFDocument.cxx (revision 354)
+@@ -682,4 +682,10 @@
+ poppler_page_get_size(page, &pageWidth, &pageHeight);
+
++#if defined (HAVE_POPPLER_0_15_0)
++ PopplerRectangle textRect = { rect->getX1() / getZoom(),
++ rect->getY1() / getZoom(),
++ rect->getX2() / getZoom(),
++ rect->getY2() / getZoom()};
++#else // !HAVE_POPPLER_0_15_0
+ //for get text we must exchange y coordinate, don't ask me where logic here.
+ PopplerRectangle textRect = { rect->getX1() / getZoom(),
+@@ -687,7 +693,11 @@
+ rect->getX2() / getZoom(),
+ (pageHeight - rect->getY1() / getZoom())};
++#endif // HAVE_POPPLER_0_15_0
+ repairEmpty(textRect);
+
+-#if defined (HAVE_POPPLER_0_6_0)
++#if defined (HAVE_POPPLER_0_15_0)
++ gchar *text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH,
++ &textRect);
++#elif defined (HAVE_POPPLER_0_6_0)
+ gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH,
+ &textRect);
+Index: /trunk/configure.ac
+===================================================================
+--- /trunk/configure.ac (revision 344)
++++ /trunk/configure.ac (revision 354)
+@@ -42,15 +42,19 @@
+ AC_SUBST([POPPLER_LIBS])
+ dnl Check if we have poppler version 0.5.2 or higher.
+-PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_052=yes])
+-if test "x$have_poppler_052" = "xyes"; then
++PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_0_5_2=yes])
++if test "x$have_poppler_0_5_2" = "xyes"; then
+ AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
+ fi
+-PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes])
+-if test "x$have_poppler_060" = "xyes"; then
++PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_0_6_0=yes])
++if test "x$have_poppler_0_6_0" = "xyes"; then
+ AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
+ fi
+-PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
+-if test "x$have_poppler_080" = "xyes"; then
++PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_0_8_0=yes])
++if test "x$have_poppler_0_8_0" = "xyes"; then
+ AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
++fi
++PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes])
++if test "x$have_poppler_0_15_0" = "xyes"; then
++ AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
+ fi
+
diff --git a/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r357.patch b/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r357.patch
new file mode 100644
index 000000000000..e6795ec14165
--- /dev/null
+++ b/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r357.patch
@@ -0,0 +1,93 @@
+Index: /trunk/src/IDocument.cxx
+===================================================================
+--- /trunk/src/IDocument.cxx (revision 338)
++++ /trunk/src/IDocument.cxx (revision 357)
+@@ -750,4 +750,8 @@
+ IDocument::getLinearized ()
+ {
++#if defined (HAVE_POPPLER_0_15_1)
++ if ( m_Linearized ) return "Yes";
++ else return "No";
++#else
+ if ( NULL == m_Linearized )
+ {
+@@ -755,4 +759,5 @@
+ }
+ return m_Linearized;
++#endif
+ }
+
+@@ -763,6 +768,13 @@
+ /// otherwise. IDocument will free it.
+ ///
+-void
+-IDocument::setLinearized (gchar *linearized)
++#if defined (HAVE_POPPLER_0_15_1)
++void
++IDocument::setLinearized (gboolean *linearized)
++{
++ m_Linearized = linearized;
++}
++#else
++void
++ IDocument::setLinearized (gchar *linearized)
+ {
+ g_free (m_Linearized);
+@@ -770,4 +782,5 @@
+ g_free (linearized);
+ }
++#endif
+
+ ///
+Index: /trunk/src/PDFDocument.cxx
+===================================================================
+--- /trunk/src/PDFDocument.cxx (revision 356)
++++ /trunk/src/PDFDocument.cxx (revision 357)
+@@ -328,5 +328,9 @@
+ gchar *keywords = NULL;
+ PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET;
++#if defined (HAVE_POPPLER_0_15_1)
++ gboolean *linearized = NULL;
++#else
+ gchar *linearized = NULL;
++#endif
+ GTime modDate;
+ PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET;
+Index: /trunk/src/IDocument.h
+===================================================================
+--- /trunk/src/IDocument.h (revision 340)
++++ /trunk/src/IDocument.h (revision 357)
+@@ -307,5 +307,9 @@
+ void setFormat (gchar *format);
+ const gchar *getLinearized (void);
++#if defined (HAVE_POPPLER_0_15_1)
++ void setLinearized (gboolean *linearized);
++#else
+ void setLinearized (gchar *linearized);
++#endif
+ const gchar *getCreationDate (void);
+ void setCreationDate (gchar *date);
+@@ -383,5 +387,9 @@
+ gchar *m_Keywords;
+ /// Tells if the document is linearized or not.
++#if defined (HAVE_POPPLER_0_15_1)
++ gboolean *m_Linearized;
++#else
+ gchar *m_Linearized;
++#endif
+ /// The document's modification date and time.
+ gchar *m_ModifiedDate;
+Index: /trunk/configure.ac
+===================================================================
+--- /trunk/configure.ac (revision 354)
++++ /trunk/configure.ac (revision 357)
+@@ -58,4 +58,9 @@
+ AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
+ fi
++PKG_CHECK_EXISTS([poppler-glib >= 0.15.1], [have_poppler_0_15_1=yes])
++if test "x$have_poppler_0_15_1" = "xyes"; then
++ AC_DEFINE([HAVE_POPPLER_0_15_1], [1], [Define to 1 if you have Poppler version 0.15.1 or higher.])
++fi
++
+
+ AC_MSG_CHECKING([for native Win32])