diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2013-12-14 11:03:53 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2013-12-14 11:03:53 +0000 |
| commit | 9d4563345b3d208b935b320f811fd460fb369297 (patch) | |
| tree | 78fb9f02c0d064c65d1e93fc5b3d28344a7f95cd /app-text | |
| parent | Version bump. (diff) | |
| download | gentoo-2-9d4563345b3d208b935b320f811fd460fb369297.tar.gz gentoo-2-9d4563345b3d208b935b320f811fd460fb369297.tar.bz2 gentoo-2-9d4563345b3d208b935b320f811fd460fb369297.zip | |
Add upstream patch to fix build with USE=-sqlite. Bug #493514. Patch by Franz Fellner <alpine.art.de@googlemail.com>
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/qpdfview/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/qpdfview/files/qpdfview-0.4.7-fix-sqlite-build.patch | 21 | ||||
| -rw-r--r-- | app-text/qpdfview/qpdfview-0.4.7.ebuild | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/app-text/qpdfview/ChangeLog b/app-text/qpdfview/ChangeLog index 2b06e1a0cd67..e06a56814b14 100644 --- a/app-text/qpdfview/ChangeLog +++ b/app-text/qpdfview/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/qpdfview # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.53 2013/12/07 07:18:33 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.54 2013/12/14 11:03:53 hwoarang Exp $ + + 14 Dec 2013; Markos Chandras <hwoarang@gentoo.org> + +files/qpdfview-0.4.7-fix-sqlite-build.patch, qpdfview-0.4.7.ebuild: + Add upstream patch to fix build with USE=-sqlite. Bug #493514. Patch by Franz + Fellner <alpine.art.de@googlemail.com> *qpdfview-0.4.7 (07 Dec 2013) diff --git a/app-text/qpdfview/files/qpdfview-0.4.7-fix-sqlite-build.patch b/app-text/qpdfview/files/qpdfview-0.4.7-fix-sqlite-build.patch new file mode 100644 index 000000000000..1a5e16124807 --- /dev/null +++ b/app-text/qpdfview/files/qpdfview-0.4.7-fix-sqlite-build.patch @@ -0,0 +1,21 @@ +Upstream: +http://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/1391 +Gentoo bugzilla: +https://bugs.gentoo.org/show_bug.cgi?id=493514 +=== modified file 'sources/database.h' +--- sources/database.h 2013-11-25 16:06:34 +0000 ++++ sources/database.h 2013-12-07 12:28:03 +0000 +@@ -64,10 +64,10 @@ + static Database* s_instance; + Database(QObject* parent = 0); + +-#ifdef WITH_SQL +- + static QString instanceName(); + ++#ifdef WITH_SQL ++ + void migrateTabs_v1_v2(); + void migrateBookmarks_v1_v2(); + + diff --git a/app-text/qpdfview/qpdfview-0.4.7.ebuild b/app-text/qpdfview/qpdfview-0.4.7.ebuild index 76e617a99dfa..4a9e631af335 100644 --- a/app-text/qpdfview/qpdfview-0.4.7.ebuild +++ b/app-text/qpdfview/qpdfview-0.4.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.7.ebuild,v 1.1 2013/12/07 07:18:33 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.7.ebuild,v 1.2 2013/12/14 11:03:53 hwoarang Exp $ EAPI=5 @@ -29,6 +29,7 @@ RDEPEND="dev-qt/qtcore:4[iconv] DEPEND="${RDEPEND} virtual/pkgconfig" +PATCHES=("${FILESDIR}/${P}-fix-sqlite-build.patch") DOCS=( CHANGES CONTRIBUTORS README TODO ) prepare_locale() { |