diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2006-05-10 13:23:43 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2006-05-10 13:23:43 +0000 |
| commit | a31f2c8a043a5dd8bf4a366369474cf8fe3104b6 (patch) | |
| tree | 283799763e0976a36fbe9cfd44b92e96287611f9 /kde-base | |
| parent | Add a patch I put in kde upstream that fixes a parallel make error (#122059) (diff) | |
| download | gentoo-2-a31f2c8a043a5dd8bf4a366369474cf8fe3104b6.tar.gz gentoo-2-a31f2c8a043a5dd8bf4a366369474cf8fe3104b6.tar.bz2 gentoo-2-a31f2c8a043a5dd8bf4a366369474cf8fe3104b6.zip | |
Add a patch that fixes a parallel make error from bug #132158
(Portage version: 2.1_pre10-r5)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.5.2-r1 | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/files/kwin-3.5.2-parallel-make.diff | 17 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.5.2-r1.ebuild | 5 |
4 files changed, 31 insertions, 3 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index e979a734923a..37259e1ae855 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.272 2006/05/06 10:40:02 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.273 2006/05/10 13:23:43 caleb Exp $ + + 10 May 2006; Caleb Tennis <caleb@gentoo.org> + +files/kwin-3.5.2-parallel-make.diff, kdebase-3.5.2-r1.ebuild: + Add a patch that fixes a parallel make error from bug #132158 06 May 2006; Carsten Lohrke <carlo@gentoo.org> kdebase-3.5.2-r1.ebuild: Correct Xorg dependency. diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.2-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.2-r1 index 410d7a1ee1fa..2e79e20e48d7 100644 --- a/kde-base/kdebase/files/digest-kdebase-3.5.2-r1 +++ b/kde-base/kdebase/files/digest-kdebase-3.5.2-r1 @@ -1,3 +1,9 @@ MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654 +RMD160 c7e8356d2f46d2fd3a0e7e25f661843f09ff1296 kdebase-3.5.0-patches-1.tar.bz2 4654 +SHA256 599e92f2c488fef6fcd6f337b952e6ce72b27576df37dcb4b86f0961eb26e617 kdebase-3.5.0-patches-1.tar.bz2 4654 MD5 9cf154e31d27902925386a9e0b5ef2ea kdebase-3.5.2-patchset.tar.bz2 5578 +RMD160 85656629b35a7aff41e96b1ffa464a38a377c281 kdebase-3.5.2-patchset.tar.bz2 5578 +SHA256 47db65bda783c05d8ede7ba1d598f0fcf92ab365ae2ba44475352eec5c3ba701 kdebase-3.5.2-patchset.tar.bz2 5578 MD5 c5685e1be34e033286aa1f37002a0552 kdebase-3.5.2.tar.bz2 23590820 +RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 kdebase-3.5.2.tar.bz2 23590820 +SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 kdebase-3.5.2.tar.bz2 23590820 diff --git a/kde-base/kdebase/files/kwin-3.5.2-parallel-make.diff b/kde-base/kdebase/files/kwin-3.5.2-parallel-make.diff new file mode 100644 index 000000000000..c98f1eaf3237 --- /dev/null +++ b/kde-base/kdebase/files/kwin-3.5.2-parallel-make.diff @@ -0,0 +1,17 @@ +--- kdebase/kwin/kcmkwin/kwinrules/Makefile.am.orig 2006-05-10 09:14:29.000000000 -0400 ++++ kdebase/kwin/kcmkwin/kwinrules/Makefile.am 2006-05-10 09:14:55.000000000 -0400 +@@ -16,12 +16,12 @@ + 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 ruleswidgetbase.h ++kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.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 ruleswidgetbase.h ++kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot diff --git a/kde-base/kdebase/kdebase-3.5.2-r1.ebuild b/kde-base/kdebase/kdebase-3.5.2-r1.ebuild index be1f430d2043..5999a5c29555 100644 --- a/kde-base/kdebase/kdebase-3.5.2-r1.ebuild +++ b/kde-base/kdebase/kdebase-3.5.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2-r1.ebuild,v 1.2 2006/05/06 10:40:03 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2-r1.ebuild,v 1.3 2006/05/10 13:23:43 caleb Exp $ inherit kde-dist eutils flag-o-matic @@ -77,7 +77,8 @@ DEPEND="${DEPEND} dev-util/pkgconfig" PATCHES="${FILESDIR}/konsole-3.5.1-detach-send2all.patch - ${WORKDIR}/kdebase-3.5.2-patchset.diff" + ${WORKDIR}/kdebase-3.5.2-patchset.diff + ${FILESDIR}/kwin-3.5.2-parallel-make.diff" src_unpack() { kde_src_unpack |