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 | 12aef94dbd2eb85e63f5d026bf5890a28e59e2ae (patch) | |
| tree | b2fea1226e21f33e68123e4859fb91fe8b126e29 /app-text/kchmviewer | |
| parent | Fix USE flags descriptions (diff) | |
| download | gentoo-2-12aef94dbd2eb85e63f5d026bf5890a28e59e2ae.tar.gz gentoo-2-12aef94dbd2eb85e63f5d026bf5890a28e59e2ae.tar.bz2 gentoo-2-12aef94dbd2eb85e63f5d026bf5890a28e59e2ae.zip | |
Fix build issue with USE=kde, bug #320191, thank Leonid Podolny and Vasileios P. Lourdas for report.
(Portage version: 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/files/kchmviewer-5.2-kde-build.patch | 21 | ||||
| -rw-r--r-- | app-text/kchmviewer/kchmviewer-5.2.ebuild | 5 |
3 files changed, 31 insertions, 2 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/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:" \ |