summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2004-09-09 19:18:12 +0000
committerCaleb Tennis <caleb@gentoo.org>2004-09-09 19:18:12 +0000
commit7d4c4b7216d7bdaaec30ad9d25ab09a1f65644f3 (patch)
treeee9e1a052aa2bc21ecb548289559ec8f64e60e8d
parentadded VIM_PLUGIN_HELPURI (diff)
downloadhistorical-7d4c4b7216d7bdaaec30ad9d25ab09a1f65644f3.tar.gz
historical-7d4c4b7216d7bdaaec30ad9d25ab09a1f65644f3.tar.bz2
historical-7d4c4b7216d7bdaaec30ad9d25ab09a1f65644f3.zip
Add a crash fix patch
-rw-r--r--kde-base/kde-env/Manifest4
-rw-r--r--kde-base/kdepim/Manifest3
-rw-r--r--kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch11
-rw-r--r--kde-base/kdepim/kdepim-3.3.0.ebuild9
4 files changed, 22 insertions, 5 deletions
diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index 3d80d2e9053b..b9305c3ce05e 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,8 +1,8 @@
-MD5 29a89e9312029f79f20fb137043fe2f0 ChangeLog 2070
+MD5 0760cf97488b424b3a4759c051b0c397 ChangeLog 2166
MD5 e35b37dce94da69fefa2c280651ee487 kde-env-3-r1.ebuild 481
MD5 170a9d26f3746bb9fbfb2a968a896dc3 kde-env-3-r2.ebuild 663
MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 0251be58bdbf1f59fb4eaebf7c4755a2 kde-env-3-r3.ebuild 700
+MD5 80988df18a5c953b1f387ad42f108a9f kde-env-3-r3.ebuild 701
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-env-3-r1 0
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-env-3-r2 0
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-env-3-r3 0
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index eaf7a9583e6f..a8e0f9041a4b 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -2,7 +2,7 @@ MD5 b94e9822234ab9cd1985465fc2c3cde0 kdepim-3.2.0-r2.ebuild 817
MD5 20ad9e465bdba8ac154491af0bfce253 kdepim-3.1.5.ebuild 788
MD5 2bd08076067fdbc1cda3cddffb65faee kdepim-3.2.3.ebuild 753
MD5 9b804c502e4f3943f9321f8e1455675d kdepim-3.2.2.ebuild 763
-MD5 a669d6824eaa6ef0991344db4296500d kdepim-3.3.0.ebuild 605
+MD5 dfc869b0fce3a68f0378581c3eafacc1 kdepim-3.3.0.ebuild 696
MD5 8db7a0fc825b84db4ff586a3128f9f5d kdepim-3.3.0-r1.ebuild 560
MD5 8f94535677176d4aa34edd840a5a5a23 ChangeLog 13733
MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
@@ -12,6 +12,7 @@ MD5 037cd03c8e7281aec672e6e44c15e7e6 files/digest-kdepim-3.2.2 66
MD5 318e6b50444a5837fed2a5ea9ecc57e9 files/digest-kdepim-3.2.3 66
MD5 b23510fd22323447768b483104d208b0 files/digest-kdepim-3.3.0 66
MD5 bf481282b9583a3e4095dcdef1aee22c files/KMail-inboxEater-BRANCH.diff 1619
+MD5 a177687427f7274f5370733d2f4ff16a files/kdepim-3.3.0-korganizer.patch 469
MD5 6f3f2b21eacb5869a9cbb821ffcf48a6 files/kpilot-parallel-make-fix.patch 737
MD5 bafdafa3d2488fa1168ccbb4a981dd87 files/digest-kdepim-3.2.0-r2 66
MD5 b23510fd22323447768b483104d208b0 files/digest-kdepim-3.3.0-r1 66
diff --git a/kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch b/kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch
new file mode 100644
index 000000000000..fa7df50f8d84
--- /dev/null
+++ b/kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch
@@ -0,0 +1,11 @@
+--- korganizer/plugins/holidays/holidays.cpp.orig 2004-09-09 14:13:05.321243736 -0500
++++ korganizer/plugins/holidays/holidays.cpp 2004-09-09 14:13:31.521260728 -0500
+@@ -91,7 +91,7 @@
+ //static int lastYear = 0;
+ int lastYear = 0;
+
+- if (mHolidayFile.isEmpty()) return QString::null;
++ if (mHolidayFile.isEmpty() || qd.isNull()) return QString::null;
+
+ //if ((lastYear == 0) || (qd.year() != lastYear)) {
+ if ((yearLast == 0) || (qd.year() != yearLast)) {
diff --git a/kde-base/kdepim/kdepim-3.3.0.ebuild b/kde-base/kdepim/kdepim-3.3.0.ebuild
index 151361229093..bd67083fc040 100644
--- a/kde-base/kdepim/kdepim-3.3.0.ebuild
+++ b/kde-base/kdepim/kdepim-3.3.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0.ebuild,v 1.5 2004/09/09 16:11:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0.ebuild,v 1.6 2004/09/09 19:18:12 caleb Exp $
-inherit kde-dist
+inherit kde-dist eutils
DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
@@ -13,6 +13,11 @@ DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal )
crypt? ( >=app-crypt/gpgme-0.4.0 )"
# crypt? ( >=app-crypt/gpgme-0.4.5 )"
+src_unpack() {
+ kde_src_unpack
+ epatch ${FILESDIR}/kdepim-3.3.0-korganizer.patch
+}
+
src_compile() {
use crypt && export GPGME_CONFIG="/usr/bin/gpgme4-config"
kde_src_compile