diff options
| author |   Brad House <brad_mssw@gentoo.org> | 2003-10-07 14:55:50 +0000 |
|---|---|---|
| committer | Brad House <brad_mssw@gentoo.org> | 2003-10-07 14:55:50 +0000 |
| commit | b598fb27766b930b0599eec979039836e4b21d94 (patch) | |
| tree | 5816219faa1ff003eb10321b5983080d30967542 /kde-base | |
| parent | Fixed build failure problem with brand-new install (diff) | |
| download | gentoo-2-b598fb27766b930b0599eec979039836e4b21d94.tar.gz gentoo-2-b598fb27766b930b0599eec979039836e4b21d94.tar.bz2 gentoo-2-b598fb27766b930b0599eec979039836e4b21d94.zip | |
access violation fix for amd64
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdebase/Manifest | 5 | ||||
| -rw-r--r-- | kde-base/kdebase/files/kdebase-3.1.4-amd64-accessviol.patch | 21 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.1.4.ebuild | 3 |
4 files changed, 32 insertions, 4 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index e31f2aef3d11..40093669dbb2 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.93 2003/10/04 23:46:36 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.94 2003/10/07 14:55:47 brad_mssw Exp $ + + 07 Oct 2003; Brad House <brad_mssw@gentoo.org> kdebase-3.1.4.ebuild, + files/kdebase-3.1.4-amd64-accessviol.patch: + patch to get rid of access violation during install + on amd64. Based on patch from Andrew Johnson <ajohnson@lastaccess.com> 04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdebase-3.1.4.ebuild: add ~amd64 flag diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest index 3b7137012ff7..cbb6e5fe071e 100644 --- a/kde-base/kdebase/Manifest +++ b/kde-base/kdebase/Manifest @@ -1,8 +1,8 @@ -MD5 da8d039e90b15011430643c84ed51bdf ChangeLog 16353 +MD5 aca15ea63333659a155310fd3efffa40 ChangeLog 16598 MD5 4c5f1af579421648a9bc8f7bc0b3e5f8 kdebase-3.0.4-r3.ebuild 4486 MD5 46d2f98f4ec0ac0a50357b3ab351b8dc kdebase-3.0.5b.ebuild 7925 MD5 84d91eead31fcf756ae37c745232e88d kdebase-3.1.2.ebuild 3791 -MD5 509fb697367dba373201b0ca7431d123 kdebase-3.1.4.ebuild 4012 +MD5 d56c5cf621ae1398718376c8532125bc kdebase-3.1.4.ebuild 4082 MD5 c5e47769d4235122e0d731ae7639cd64 kdebase-3.2.0_alpha2.ebuild 3236 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68 @@ -14,6 +14,7 @@ MD5 f6156166c554420f1684f00d488f674a files/focus-patch.diff 542 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405 MD5 a9b5cb78455790de6a267f7d9ec46b63 files/konq-crash-patch.diff 1106 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79 +MD5 51c5cbe3e55c1154f6a596ddac4a8d5f files/kdebase-3.1.4-amd64-accessviol.patch 1091 MD5 41d954f907dd2ba220ebca498e7f1735 files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff 611 MD5 b0dd1d862909571ddd17ea58bf3925d4 files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733 MD5 54c424a5920645360378aa5f494d35b2 files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129 diff --git a/kde-base/kdebase/files/kdebase-3.1.4-amd64-accessviol.patch b/kde-base/kdebase/files/kdebase-3.1.4-amd64-accessviol.patch new file mode 100644 index 000000000000..1aa072cdce14 --- /dev/null +++ b/kde-base/kdebase/files/kdebase-3.1.4-amd64-accessviol.patch @@ -0,0 +1,21 @@ +diff -ruN kdebase-3.1.4.old/kcontrol/input/Makefile.am kdebase-3.1.4/kcontrol/input/Makefile.am +--- kdebase-3.1.4.old/kcontrol/input/Makefile.am 2003-07-13 19:23:29.000000000 +0000 ++++ kdebase-3.1.4/kcontrol/input/Makefile.am 2003-10-07 14:50:52.259457944 +0000 +@@ -23,4 +23,4 @@ + + install-data-hook: + $(mkinstalldirs) $(DESTDIR)$(prefix)/share/fonts/override +- -mkfontdir $(DESTDIR)$(prefix)/share/fonts/override ++# -mkfontdir $(DESTDIR)$(prefix)/share/fonts/override +diff -ruN kdebase-3.1.4.old/kcontrol/input/Makefile.in kdebase-3.1.4/kcontrol/input/Makefile.in +--- kdebase-3.1.4.old/kcontrol/input/Makefile.in 2003-09-10 14:59:11.000000000 +0000 ++++ kdebase-3.1.4/kcontrol/input/Makefile.in 2003-10-07 14:50:35.119063680 +0000 +@@ -923,7 +923,7 @@ + + install-data-hook: + $(mkinstalldirs) $(DESTDIR)$(prefix)/share/fonts/override +- -mkfontdir $(DESTDIR)$(prefix)/share/fonts/override ++# -mkfontdir $(DESTDIR)$(prefix)/share/fonts/override + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/kde-base/kdebase/kdebase-3.1.4.ebuild b/kde-base/kdebase/kdebase-3.1.4.ebuild index 6a4cc4572c4f..d2730cd1055e 100644 --- a/kde-base/kdebase/kdebase-3.1.4.ebuild +++ b/kde-base/kdebase/kdebase-3.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.4.ebuild,v 1.7 2003/10/04 23:46:36 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.4.ebuild,v 1.8 2003/10/07 14:55:47 brad_mssw Exp $ inherit kde-dist eutils IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java" @@ -44,6 +44,7 @@ src_unpack() { kde_src_unpack epatch ${FILESDIR}/focus-patch.diff epatch ${FILESDIR}/konq-crash-patch.diff + use amd64 && epatch ${FILESDIR}/kdebase-3.1.4-amd64-accessviol.patch #cd ${S} && aclocal } |