diff options
| author |   Peter Volkov <pva@gentoo.org> | 2010-05-17 15:40:51 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2010-05-17 15:40:51 +0000 |
| commit | ede3b2f72ae6c09786a4f5e8bb774d77b50f3ff1 (patch) | |
| tree | c3c5a8c6c2f800b03d834c2343e1347f5f040f1c /app-text/kchmviewer | |
| parent | Fix USE flags descriptions (diff) | |
| download | historical-ede3b2f72ae6c09786a4f5e8bb774d77b50f3ff1.tar.gz historical-ede3b2f72ae6c09786a4f5e8bb774d77b50f3ff1.tar.bz2 historical-ede3b2f72ae6c09786a4f5e8bb774d77b50f3ff1.zip | |
Fix build issue with USE=kde, bug #320191, thank Leonid Podolny and Vasileios P. Lourdas for report.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'app-text/kchmviewer')
| -rw-r--r-- | app-text/kchmviewer/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/kchmviewer/Manifest | 5 | ||||
| -rw-r--r-- | app-text/kchmviewer/files/kchmviewer-5.2-kde-build.patch | 21 | ||||
| -rw-r--r-- | app-text/kchmviewer/kchmviewer-5.2.ebuild | 5 |
4 files changed, 34 insertions, 4 deletions
diff --git a/app-text/kchmviewer/ChangeLog b/app-text/kchmviewer/ChangeLog index 733a728b2e91..bdc8e85420a0 100644 --- a/app-text/kchmviewer/ChangeLog +++ b/app-text/kchmviewer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/kchmviewer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.33 2010/05/17 10:28:39 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.34 2010/05/17 15:40:51 pva Exp $ + + 17 May 2010; Peter Volkov <pva@gentoo.org> kchmviewer-5.2.ebuild, + +files/kchmviewer-5.2-kde-build.patch: + Fix build issue with USE=kde, bug #320191, thank Leonid Podolny and + Vasileios P. Lourdas for report. 17 May 2010; Peter Volkov <pva@gentoo.org> -files/kchmviewer-3.1_p2-gcc43.patch, -kchmviewer-4.1.ebuild, diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest index 9c08207c00a4..3b4768e14c3d 100644 --- a/app-text/kchmviewer/Manifest +++ b/app-text/kchmviewer/Manifest @@ -1,6 +1,7 @@ +AUX kchmviewer-5.2-kde-build.patch 509 RMD160 de7f1b389efef08ac5c8f8cff94bcef209c5d7e9 SHA1 a43d9287841903b98b985d51660d5000307357be SHA256 08fa3ff39026e9e2e6b4c55e0d69a2bf15d5c5c584c74e61929eaf915eb75287 DIST kchmviewer-5.1.tar.gz 263934 RMD160 381f946f58461540f8f87fe4f398e3bd06b8b900 SHA1 465ae7864d7b2f58036043232161a86e80d35350 SHA256 a1ed61f35e35432d23fb98d9d11bf6755ff388d45571436bb3cadb8c08ecb38f DIST kchmviewer-5.2.tar.gz 283874 RMD160 596ecd96c94f1a33c180869ec91b5e774e1f5e12 SHA1 bba7c5ff141e224cbbcc306f8c07d08708ec386f SHA256 4b5054baa7dc7a5969c64eb7dec860c335f0e3603bf96688f3b121908a20c947 EBUILD kchmviewer-5.1.ebuild 1905 RMD160 782beed3b9ad29d083ed77198cbe9722fcd5b713 SHA1 94de1b16da43d020894bddf5d4e3c2ec77fb6567 SHA256 608c20832d82e62a41e81e65500e9a4998c240917062e1f5f627c30f524b2621 -EBUILD kchmviewer-5.2.ebuild 1905 RMD160 56a50729192adae661a6c18fd6ef6fec0de85520 SHA1 cd79d9d9aaac47e96c896d994fbd0684440b532a SHA256 faef7177fa7ddb836665b6b1486aec6527688f5726753b491c16b75dcd07c95d -MISC ChangeLog 10827 RMD160 36c0d178f59ffa8b9c5b061888bbd253c355c894 SHA1 006ef375eeecf6b5eca03b100e91c3e10cfc967a SHA256 98885f46381b889ac410980b04ac91cf596dae5830d509b0a10ba179c7670846 +EBUILD kchmviewer-5.2.ebuild 1971 RMD160 dafc445b3ae0450ebe5ead722f0ba492c179e06d SHA1 3d9888285629c1a6099faed8e39a06f0efcb1626 SHA256 458c9cdfe4105cfd97f9c9edc42f0e2115584cd79d2bbc9154d304cc8141a8a3 +MISC ChangeLog 11042 RMD160 5e0649decd8d8d73d9fab0b577c7ee057d3ebd38 SHA1 54b3d2dddddfc91d7cfd8935cba2d72990f64916 SHA256 fc43187c19ff00857dc19ad3b89ef0cfe41302fcfba6a0b6ea61553d1bde9f06 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b diff --git a/app-text/kchmviewer/files/kchmviewer-5.2-kde-build.patch b/app-text/kchmviewer/files/kchmviewer-5.2-kde-build.patch new file mode 100644 index 000000000000..40be430fbeba --- /dev/null +++ b/app-text/kchmviewer/files/kchmviewer-5.2-kde-build.patch @@ -0,0 +1,21 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0374a16..b25dad2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -12,6 +12,8 @@ SET( kchmviewerSources + main.cpp + mainwindow.cpp + navigationpanel.cpp ++ toolbareditor.cpp ++ toolbarmanager.cpp + recentfiles.cpp + settings.cpp + tab_bookmarks.cpp +@@ -30,6 +32,7 @@ KDE4_ADD_UI_FILES( kchmviewerSources + dialog_about.ui + dialog_setup.ui + dialog_topicselector.ui ++ toolbareditor.ui + mainwindow.ui + navigatorpanel.ui + tab_bookmarks.ui diff --git a/app-text/kchmviewer/kchmviewer-5.2.ebuild b/app-text/kchmviewer/kchmviewer-5.2.ebuild index 76192d5a257b..e16885755b20 100644 --- a/app-text/kchmviewer/kchmviewer-5.2.ebuild +++ b/app-text/kchmviewer/kchmviewer-5.2.ebuild @@ -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/kchmviewer/kchmviewer-5.2.ebuild,v 1.1 2010/05/17 10:25:45 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-5.2.ebuild,v 1.2 2010/05/17 15:40:51 pva Exp $ EAPI="2" KDE_REQUIRED="never" @@ -26,11 +26,14 @@ DEPEND="${RDEPEND} S=${WORKDIR}/build-${PV} +PATCHES=( "${FILESDIR}/${P}-kde-build.patch" ) + pkg_setup() { use kde && kde4-base_pkg_setup } src_prepare() { + base_src_prepare sed -e "s:KDE4_SERVICES_INSTALL_DIR:SERVICES_INSTALL_DIR:" \ -i lib/kio-msits/CMakeLists.txt sed -e "s:KDE4_ICON_INSTALL_DIR:ICON_INSTALL_DIR:" \ |