diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-10 15:31:34 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-10 15:31:34 +0000 |
| commit | 269fce7f72e5ba8f067d254615540d74ad893514 (patch) | |
| tree | c9345b779f0cd8e8b656234da8b544b2395f7e77 | |
| parent | Add back jruby support. (diff) | |
| download | gentoo-2-269fce7f72e5ba8f067d254615540d74ad893514.tar.gz gentoo-2-269fce7f72e5ba8f067d254615540d74ad893514.tar.bz2 gentoo-2-269fce7f72e5ba8f067d254615540d74ad893514.zip | |
Add libproxy include patch so it actualy finds the header file.
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
| -rw-r--r-- | sci-geosciences/merkaartor/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/files/0.17.2-libproxy.patch | 12 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog index 6da82b505e02..29f655c25757 100644 --- a/sci-geosciences/merkaartor/ChangeLog +++ b/sci-geosciences/merkaartor/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/merkaartor # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.19 2011/06/09 20:30:38 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.20 2011/06/10 15:31:33 scarabeus Exp $ + + 10 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> + +files/0.17.2-libproxy.patch, merkaartor-0.17.2.ebuild: + Add libproxy include patch so it actualy finds the header file. 09 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> merkaartor-0.17.2.ebuild, merkaartor-9999.ebuild: diff --git a/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch b/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch new file mode 100644 index 000000000000..d5fdf70f4735 --- /dev/null +++ b/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch @@ -0,0 +1,12 @@ +diff -urN merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h +--- merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h 2011-06-10 17:26:49.000000000 +0200 ++++ merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h 2011-06-10 17:29:46.000000000 +0200 +@@ -21,7 +21,7 @@ + #include <QNetworkProxy> + + #ifdef USE_LIBPROXY +-#include <libproxy/proxy.h> ++#include <proxy.h> + #endif + + #include "Maps/Coord.h" diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild index 0d19ba91fdf0..cec83168b06c 100644 --- a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.2 2011/06/09 20:30:38 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.3 2011/06/10 15:31:33 scarabeus Exp $ EAPI=4 @@ -36,6 +36,7 @@ DOCS="AUTHORS CHANGELOG HACKING" PATCHES=( "${FILESDIR}/${PV}-includes.patch" + "${FILESDIR}/${PV}-libproxy.patch" ) merkaartor_use() { |