diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-08-26 15:48:31 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-08-26 15:48:31 +0000 |
| commit | 3e4a241fea73a7a444d85d39627a2ce77c800a7f (patch) | |
| tree | 6723d4ebcf5f6c55ee70d1988013decd258102bc /kde-base/kdebase | |
| parent | version bump and /usr/man -> /usr/share/man (Manifest recommit) (diff) | |
| download | gentoo-2-3e4a241fea73a7a444d85d39627a2ce77c800a7f.tar.gz gentoo-2-3e4a241fea73a7a444d85d39627a2ce77c800a7f.tar.bz2 gentoo-2-3e4a241fea73a7a444d85d39627a2ce77c800a7f.zip | |
Fix parallel make compilation error
Diffstat (limited to 'kde-base/kdebase')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/files/3.3.0-kwinrules-Makefile.am.diff | 17 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.3.0.ebuild | 4 |
3 files changed, 25 insertions, 2 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index ec33f438cbc3..50fb73052ba4 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.145 2004/08/23 16:08:35 psi29a Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.146 2004/08/26 15:48:31 caleb Exp $ + + 26 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.3.0.ebuild, + files/3.3.0-kwinrules-Makefile.am.diff: + Fix parallel make compilation error 23 Aug 2004; psi29a <psi29a@gentoo.org> kdebase-3.3.0.ebuild: Added to ~mips diff --git a/kde-base/kdebase/files/3.3.0-kwinrules-Makefile.am.diff b/kde-base/kdebase/files/3.3.0-kwinrules-Makefile.am.diff new file mode 100644 index 000000000000..567d14fb4946 --- /dev/null +++ b/kde-base/kdebase/files/3.3.0-kwinrules-Makefile.am.diff @@ -0,0 +1,17 @@ +--- kwin/kcmkwin/kwinrules/Makefile.am 2004/08/03 09:17:35 1.8 ++++ kwin/kcmkwin/kwinrules/Makefile.am 2004/08/25 21:25:58 1.9 +@@ -16,12 +16,12 @@ libkwinrules_la_LIBADD = $(LIB_KDEUI) + kcm_kwinrules_la_SOURCES = kcm.cpp + kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined + kcm_kwinrules_la_LIBADD = libkwinrules.la +-kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ++kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h + + kwin_rules_dialog_la_SOURCES = main.cpp + kwin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined + kwin_rules_dialog_la_LIBADD = libkwinrules.la +-kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ++kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot diff --git a/kde-base/kdebase/kdebase-3.3.0.ebuild b/kde-base/kdebase/kdebase-3.3.0.ebuild index 928b447bb8e2..0ac5e9659bfd 100644 --- a/kde-base/kdebase/kdebase-3.3.0.ebuild +++ b/kde-base/kdebase/kdebase-3.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.0.ebuild,v 1.4 2004/08/23 16:08:35 psi29a Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.0.ebuild,v 1.5 2004/08/26 15:48:31 caleb Exp $ inherit kde-dist eutils @@ -23,6 +23,8 @@ RDEPEND="${DEPEND} src_unpack() { kde_src_unpack epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff + epatch ${FILESDIR}/3.3.0-kwinrules-Makefile.am.diff + make -f admin/Makefile.common sed -ie "s:sasl.h:sasl/sasl.h:" ${S}/configure } |