Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 239891 Details for
Bug 329535
[kde overlay] korganizer merge fails when kdgantt library has file conflicts
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to fix korganizer merge
korganizer-dont-install-kdgantt.patch (text/plain), 2.00 KB, created by
Kyle Milz
on 2010-07-23 07:14:29 UTC
(
hide
)
Description:
patch to fix korganizer merge
Filename:
MIME Type:
Creator:
Kyle Milz
Created:
2010-07-23 07:14:29 UTC
Size:
2.00 KB
patch
obsolete
>diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest >index 067d78f..496ef97 100644 >--- a/kde-base/korganizer/Manifest >+++ b/kde-base/korganizer/Manifest >@@ -2,5 +2,5 @@ AUX kdepim-r1133220-fix-holidayregion.patch 556 RMD160 4e404726efe1c899abe0f4705 > AUX korganizer-4.4.75_missing_header.patch 383 RMD160 93dc7b6ab8362682917264785a7dfe358149ccff SHA1 b01f22b42c5fcb31a7a77cf474e52e5093caa67d SHA256 c49a3849686f456302372d7614508e1094c21b3e2977acaabaf25a38f34c16ab > EBUILD korganizer-4.4.9999.ebuild 952 RMD160 5d6f74dba9ae0165a95ac3a4c85f83c288edf921 SHA1 9350c5ef2f17423946f19e01e1604a885780c471 SHA256 def63f4d70d5d393344d55bd2a252ffc990d37174c7802433a865ff121c2c21e > EBUILD korganizer-4.5.9999.ebuild 1087 RMD160 d405ec4ce0fdaa28d164e8d2ad9bab3bd815b922 SHA1 82559a474a2c69e29e1c35f1cfd514ee3e8127ca SHA256 20f3d507a971d269cf4cec038fd7f857dfe1636b8a230f5ec77eed8e18dc4b42 >-EBUILD korganizer-9999.ebuild 1091 RMD160 41987be5025b0487d208adf0963f09761d8a134a SHA1 54d033d8ae4dcec9c00633d6118b0b6005f1b518 SHA256 b6361da52bfacaf4c53516bff73302aeb575753b5577a895be36db68e94386c1 >+EBUILD korganizer-9999.ebuild 1079 RMD160 ceaadfc68e5d1fe4a1f34cbc558317710c59cf6b SHA1 7427dba12034c7e466b62a93c3c3181fc0243a93 SHA256 9cd4dd8bc7a10536d6726b79370e47e1e1582f90545fdae8952c0d2c53f65159 > MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a >diff --git a/kde-base/korganizer/korganizer-9999.ebuild b/kde-base/korganizer/korganizer-9999.ebuild >index aeddcc4..c287c47 100644 >--- a/kde-base/korganizer/korganizer-9999.ebuild >+++ b/kde-base/korganizer/korganizer-9999.ebuild >@@ -22,14 +22,12 @@ RDEPEND="${DEPEND}" > add_blocker kontact-specialdates > > KMLOADLIBS="kdepim-common-libs" >-KMEXTRA=" >- kdgantt2/ >-" > > # xml targets from kmail are being uncommented by kde4-meta.eclass > KMEXTRACTONLY=" > akonadi/ > incidenceeditors/ >+ kdgantt2/ > kmail/ > knode/org.kde.knode.xml > libkdepimdbusinterfaces/
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 329535
: 239891