summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2009-11-07 11:45:08 +0300
committerAlexey Shvetsov <alexxy@gentoo.org>2009-11-07 11:45:28 +0300
commite8603903e8cd8f2d108f4d26bec28109594e4266 (patch)
tree6a2bc7f60d55c7f38a08b538d2b2ebe479dba035
parent5ed0fff97c12a660b572c40927f9d2a985017afa (diff)
downloadkde-e8603903e8cd8f2d108f4d26bec28109594e4266.tar.gz
kde-e8603903e8cd8f2d108f4d26bec28109594e4266.tar.bz2
kde-e8603903e8cd8f2d108f4d26bec28109594e4266.zip
Add patch to fix compilation wit new glibc
(Portage version: 2.2_rc48/git/Linux x86_64) (Signed Manifest commit)
-rw-r--r--kde-base/kdelibs/Manifest13
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.3.74-glibc2.11.patch163
-rw-r--r--kde-base/kdelibs/kdelibs-4.3.74.ebuild1
3 files changed, 176 insertions, 1 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 0dc7a3e1e84..763ba594c3b 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
+AUX kdelibs-4.3.74-glibc2.11.patch 2840 RMD160 65259da16778fa6e186f1ccdad395260a96913f8 SHA1 f776106822577fe75327b08cbeda34c8ae45cea6 SHA256 e41c182f629c0eed75401ea5f03f7c14d7f48ee71f493196b611870faf35c6a0
DIST kdelibs-4.3.74.tar.xz 10751380 RMD160 f6b23ac72d0fddb246e22aff6a936eb4e24e9a1c SHA1 ef23eb3e75ed8632f57238fb3f1f96959a373828 SHA256 6a83d88f182f495fb698ad465c4d4c12ede1f8190d2efb9fae753c48fdffc0a3
-EBUILD kdelibs-4.3.74.ebuild 6172 RMD160 b3ea5cb722c7ee0dc524480655d93a636959a513 SHA1 78db0369f47e821179e4ec2a80d6375396bc67c9 SHA256 8a3380e0865462351b21941968c0af375fcbb37eecdd6b0731d63a99ff960adf
+EBUILD kdelibs-4.3.74.ebuild 6208 RMD160 644894db7c4cfa1e805c97ff84a68cc2d97399cf SHA1 e39759481fc526482279647dbc993ccee1c244a4 SHA256 4385ef29613e98ace01c09c179f68c6f553ab56d6dcf5afa10cb9150a507e50b
EBUILD kdelibs-4.3.9999.ebuild 6155 RMD160 286c3cec8a85f55b46ed6bf41a85093d9a0fc066 SHA1 d788c0ddfbb7628e25a6fb910b7dcf72c8a5376d SHA256 a226bae54e5ec3f0e4010efc8fcb534ef8b2374c8e2ee09d0a64590bb0e7f714
EBUILD kdelibs-9999.ebuild 6130 RMD160 0853e037a29a12c5b88d87ceda508365ce42c8bc SHA1 ed94a5286221a762ebd661ca2070d60a917669c6 SHA256 5aaa74a95587621fb4147bdc7c194931281c8983f96ad6dc68f5bb98bfd33b13
MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkr1M5QACgkQ5BmOA85PVLhOLwCdHu7MbH67MBvR0oHgQntSROgU
+eUYAoJEAE3MjMN22aY8LDzJSX+Nf0G5D
+=GLTj
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.74-glibc2.11.patch b/kde-base/kdelibs/files/kdelibs-4.3.74-glibc2.11.patch
new file mode 100644
index 00000000000..280670bc947
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.3.74-glibc2.11.patch
@@ -0,0 +1,163 @@
+--- trunk/KDE/kdelibs/kdecore/fakes.c 2009/10/31 22:24:52 1043164
++++ trunk/KDE/kdelibs/kdecore/fakes.c 2009/11/06 19:59:40 1045794
+@@ -31,7 +31,7 @@
+
+
+ #define KDE_open open
+-#define KDE_mkdir mkdir
++#define KDE_mkdir mkdir
+
+
+ #ifndef HAVE_SETENV
+@@ -39,10 +39,15 @@
+ #ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
+ #endif
+-
++#ifdef HAVE_STRING_H
+ #include <string.h>
++#endif
++#ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
++#endif
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+
+ KDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) {
+ int i;
+@@ -67,11 +72,18 @@
+ #ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
+ #endif
+-
++#ifdef HAVE_STRING_H
+ #include <string.h>
++#endif
++#ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
++#endif
++#ifdef HAVE_ERRNO_H
+ #include <errno.h>
++#endif
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+
+ #ifndef environ
+ extern char ** environ;
+@@ -154,24 +166,32 @@
+ {
+ srand48(seed);
+ }
+-#endif
++#endif /* !HAVE_RANDOM */
+
+ #ifndef HAVE_SETEUID
+ int seteuid(uid_t euid)
+ {
+ return setreuid(-1, euid); /* Well, if you have neither you are in trouble :) */
+ }
+-#endif
++#endif /* !HAVE_SETEUID */
+
+ #ifndef HAVE_MKSTEMPS
++#ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
++#endif
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+ #include <fcntl.h>
++#ifdef HAVE_STRING_H
+ #include <string.h>
++#endif
++#ifdef HAVE_STRINGS_H
+ #include <strings.h>
++#endif
++#ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
++#endif
+
+ /* this is based on code taken from the GNU libc, distributed under the LGPL license */
+
+@@ -244,12 +264,14 @@
+ {
+ return mkstemps( _template, 0 );
+ }
+-#endif
++#endif /* !HAVE_MKSTEMP */
+
+ #ifndef HAVE_MKDTEMP
+
+ #ifndef HAVE_MKSTEMPS
++#ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
++#endif
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+@@ -306,13 +328,18 @@
+ value += 7777;
+
+ if (!KDE_mkdir(_template,0700))
+- return _template;
++ return _template;
+ }
+ return 0;
+ }
+ #endif /* !HAVE_MKDTEMP */
+
+ #ifndef HAVE_STRLCPY
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
+ {
+ unsigned long len, ret = strlen(s);
+@@ -325,12 +352,17 @@
+ }
+ } else
+ memcpy(d, s, ret + 1);
+-
++
+ return ret;
+ }
+-#endif
++#endif /* !HAVE_STRLCPY */
+
+ #ifndef HAVE_STRLCAT
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ KDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
+ {
+ char *cp;
+@@ -350,7 +382,7 @@
+
+ return ret;
+ }
+-#endif
++#endif /* !HAVE_STRLCAT */
+
+ #ifndef HAVE_STRCASESTR
+ /*
+@@ -450,7 +482,7 @@
+ ret0:
+ return 0;
+ }
+-#endif
++#endif /* !HAVE_STRCASESTR */
+
+ #ifndef HAVE_TRUNC
+
+@@ -467,4 +499,4 @@
+ {
+ return x < 0 ? -floor(-x) : floor(x);
+ }
+-#endif
++#endif /* !HAVE_TRUNC */
diff --git a/kde-base/kdelibs/kdelibs-4.3.74.ebuild b/kde-base/kdelibs/kdelibs-4.3.74.ebuild
index f1718f6eeee..c0c016052e1 100644
--- a/kde-base/kdelibs/kdelibs-4.3.74.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.74.ebuild
@@ -113,6 +113,7 @@ PATCHES=(
"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch"
"${FILESDIR}/dist/23_solid_no_double_build.patch"
+ "${FILESDIR}/${P}-glibc2.11.patch"
)
src_prepare() {