[packages/kdelibs/dev-trinity] drop outdated patches
glen
glen at pld-linux.org
Wed May 28 15:27:09 CEST 2014
commit f911b8b72feff6371ce8855a1f23220691b42d4f
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed May 28 12:26:57 2014 +0300
drop outdated patches
ac264.patch | 24 ---
kde-ac260-lt.patch | 12 --
kde-am.patch | 137 ------------
kdelibs-3.5.10-gcc_4.4-2.patch | 461 -----------------------------------------
kdelibs-3.5.10-ossl-1.x.patch | 180 ----------------
kdelibs.spec | 11 -
6 files changed, 825 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 21bfc51..cbb1804 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -56,18 +56,12 @@ Patch3: %{name}-use_system_sgml.patch
Patch4: %{name}-fileshareset.patch
Patch5: %{name}-appicon_themable.patch
Patch7: %{name}-xgl.patch
-Patch8: kde-ac260-lt.patch
Patch9: %{name}-lib_loader.patch
# http://kate-editor.org/downloads/syntax_highlighting?kateversion=2.5
Patch10: %{name}-kate-syntax.patch
Patch12: %{name}-konqueror-agent.patch
-Patch13: kde-am.patch
-Patch14: ac264.patch
Patch15: dcopobject-destruct-crash.patch
-Patch16: %{name}-3.5.10-gcc_4.4-2.patch
Patch17: %{name}-3.5.10-LDFLAG_fix-1.patch
-# http://www.thel.ro/kde3-fedora/SOURCES/kdelibs-3.5.10-ossl-1.x.patch
-Patch18: %{name}-3.5.10-ossl-1.x.patch
Patch19: %{name}-gcc4.patch
Patch21: %{name}-cups16.patch
URL: http://www.kde.org/
@@ -373,16 +367,11 @@ strony innych użytkowników lokalnych.
%patch4 -p1
%patch5 -p1
%patch7 -p1
-#%patch8 -p1 # assume it's outdated ed5e85d7833180d4cb5a21a77758f95f50a2087c in admin repo
%patch9 -p1
#%patch10 -p1 does not apply, drop
%patch12 -p1
-#%patch13 -p1 assume outdated
-#%patch14 -p1 assume outdated
%patch15 -p1
-#%patch16 -p1 assume outdated
%patch17 -p1
-#%patch18 -p1 assume outdated
%patch19 -p1
#%patch21 -p1 seems outdated
diff --git a/ac264.patch b/ac264.patch
deleted file mode 100644
index 284545f..0000000
--- a/ac264.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- kdelibs-3.5.10/admin/configure.in.min~ 2008-08-19 22:28:39.000000000 +0200
-+++ kdelibs-3.5.10/admin/configure.in.min 2009-08-17 19:13:01.823156420 +0200
-@@ -44,6 +44,9 @@
- AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-
- dnl Checks for programs.
-+AC_PROG_CC
-+AC_PROG_CXX
-+
- AC_CHECK_COMPILERS
- AC_ENABLE_SHARED(yes)
- AC_ENABLE_STATIC(no)
---- kdelibs-3.5.10/configure.in.in~ 2006-05-22 20:14:23.000000000 +0200
-+++ kdelibs-3.5.10/configure.in.in 2009-08-17 19:16:04.549804009 +0200
-@@ -25,6 +25,9 @@
- AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-
- dnl Checks for programs.
-+AC_PROG_CC
-+AC_PROG_CXX
-+
- AC_CHECK_COMPILERS
- AC_LIBLTDL_CONVENIENCE
-
diff --git a/kde-ac260-lt.patch b/kde-ac260-lt.patch
deleted file mode 100644
index acbbc6c..0000000
--- a/kde-ac260-lt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN arts-1.5.4.org/admin/libtool.m4.in arts-1.5.4/admin/libtool.m4.in
---- arts-1.5.4.org/admin/libtool.m4.in 2006-07-24 09:06:24.000000000 +0200
-+++ arts-1.5.4/admin/libtool.m4.in 2006-09-09 12:45:13.172062500 +0200
-@@ -3542,7 +3542,7 @@
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
-- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
diff --git a/kde-am.patch b/kde-am.patch
deleted file mode 100644
index 36a4520..0000000
--- a/kde-am.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- kdelibs-3.5.10/admin/cvs.sh~ 2008-08-19 23:28:39.000000000 +0300
-+++ kdelibs-3.5.10/admin/cvs.sh 2009-05-19 13:34:47.966210297 +0300
-@@ -68,7 +68,7 @@
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
-- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13* | automake*1.14* )
- echo "*** $AUTOMAKE_STRING found."
- UNSERMAKE=no
- ;;
---- kdelibs-3.5.10/admin/configure.in.min~ 2013-04-04 21:57:22.468489671 +0200
-+++ kdelibs-3.5.10/admin/configure.in.min 2013-04-04 22:02:56.099614223 +0200
-@@ -41,7 +41,7 @@
- KDE_SET_PREFIX
-
- dnl generate the config header
--AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-+AC_CONFIG_HEADERS(config.h) dnl at the distribution this done
-
- dnl Checks for programs.
- AC_PROG_CC
---- kdelibs-3.5.10/admin/cvs.sh~ 2013-04-04 21:57:22.465156305 +0200
-+++ kdelibs-3.5.10/admin/cvs.sh 2013-04-04 22:03:44.983443327 +0200
-@@ -128,7 +128,7 @@
- echo "*** Creating configure"
- call_and_fix_autoconf
-
--if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-+if egrep "^AC_CONFIG_HEADERS" configure.in >/dev/null 2>&1; then
- echo "*** Creating config.h template"
- $AUTOHEADER || exit 1
- touch config.h.in
-@@ -184,7 +184,7 @@
- fi
- fi
- $ACLOCAL $ACLOCALFLAGS
--if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-+if egrep "^AC_CONFIG_HEADERS" configure.in >/dev/null 2>&1; then
- echo "*** Creating config.h template"
- $AUTOHEADER || exit 1
- touch config.h.in
---- kdelibs-3.5.10/kio/kssl/configure.in.in~ 2005-09-10 10:26:49.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/configure.in.in 2013-04-04 22:04:18.503783179 +0200
-@@ -4,4 +4,4 @@
- AC_DEFINE(KSSL_HAVE_SSL, 1, [Define if we shall use KSSL])
- fi
-
--AM_CONFIG_HEADER([kio/kssl/ksslconfig.h])
-+AC_CONFIG_HEADERS([kio/kssl/ksslconfig.h])
---- kdelibs-3.5.10/configure.in~ 2008-08-20 18:05:03.000000000 +0200
-+++ kdelibs-3.5.10/configure.in 2013-04-04 22:04:57.840848814 +0200
-@@ -26,7 +26,7 @@
- AC_PROG_INSTALL
-
- dnl generate the config header
--AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-+AC_CONFIG_HEADERS(config.h) dnl at the distribution this done
-
- dnl Checks for programs.
- AC_CHECK_COMPILERS
-@@ -500,7 +500,7 @@
- fi
-
- AC_DEFINE_UNQUOTED(DCOP_PATH, ["${dcop_prefix}/bin"], [Define where your dcop binary is])
--AM_CONFIG_HEADER([dcop/dcop-path.h])
-+AC_CONFIG_HEADERS([dcop/dcop-path.h])
-
- AC_PATH_PROGS(MD5SUM, [md5sum gmd5sum], [md5sum])
- dnl =======================================================
-@@ -813,7 +813,7 @@
-
- dnl AC_OUTPUT(kdecore/kde-config.cpp)
-
--AM_CONFIG_HEADER(kdecore/kdemacros.h)
-+AC_CONFIG_HEADERS(kdecore/kdemacros.h)
-
- SVGICONS=
-
-@@ -1735,7 +1735,7 @@
- AC_DEFINE(KSSL_HAVE_SSL, 1, [Define if we shall use KSSL])
- fi
-
--AM_CONFIG_HEADER([kio/kssl/ksslconfig.h])
-+AC_CONFIG_HEADERS([kio/kssl/ksslconfig.h])
- dnl =======================================================
- dnl FILE: ./kio/misc/kpac/configure.in.in
- dnl =======================================================
-@@ -2000,7 +2000,7 @@
- AC_SUBST(LIBPCRE)
- AC_SUBST(PCRECFLAGS)
-
--AM_CONFIG_HEADER([kjs/global.h])
-+AC_CONFIG_HEADERS([kjs/global.h])
- dnl =======================================================
- dnl FILE: ./kspell2/plugins/configure.in.in
- dnl =======================================================
---- kdelibs-3.5.10/configure.in.in~ 2013-04-04 21:57:22.468489671 +0200
-+++ kdelibs-3.5.10/configure.in.in 2013-04-04 22:05:57.668122592 +0200
-@@ -22,7 +22,7 @@
- AC_PROG_INSTALL
-
- dnl generate the config header
--AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-+AC_CONFIG_HEADERS(config.h) dnl at the distribution this done
-
- dnl Checks for programs.
- AC_PROG_CC
---- kdelibs-3.5.10/kjs/configure.in.in~ 2007-10-08 11:52:09.000000000 +0200
-+++ kdelibs-3.5.10/kjs/configure.in.in 2013-04-04 22:06:19.065006325 +0200
-@@ -90,4 +90,4 @@
- AC_SUBST(LIBPCRE)
- AC_SUBST(PCRECFLAGS)
-
--AM_CONFIG_HEADER([kjs/global.h])
-+AC_CONFIG_HEADERS([kjs/global.h])
---- kdelibs-3.5.10/dcop/configure.in.in~ 2005-09-10 10:27:23.000000000 +0200
-+++ kdelibs-3.5.10/dcop/configure.in.in 2013-04-04 22:06:33.691821354 +0200
-@@ -4,6 +4,6 @@
- fi
-
- AC_DEFINE_UNQUOTED(DCOP_PATH, ["${dcop_prefix}/bin"], [Define where your dcop binary is])
--AM_CONFIG_HEADER([dcop/dcop-path.h])
-+AC_CONFIG_HEADERS([dcop/dcop-path.h])
-
- AC_PATH_PROGS(MD5SUM, [md5sum gmd5sum], [md5sum])
---- kdelibs-3.5.10/kdecore/configure.in.in~ 2007-05-14 09:52:39.000000000 +0200
-+++ kdelibs-3.5.10/kdecore/configure.in.in 2013-04-04 22:07:00.152089704 +0200
-@@ -169,7 +169,7 @@
-
- dnl AC_OUTPUT(kdecore/kde-config.cpp)
-
--AM_CONFIG_HEADER(kdecore/kdemacros.h)
-+AC_CONFIG_HEADERS(kdecore/kdemacros.h)
-
- SVGICONS=
-
diff --git a/kdelibs-3.5.10-gcc_4.4-2.patch b/kdelibs-3.5.10-gcc_4.4-2.patch
deleted file mode 100644
index 1ca3e49..0000000
--- a/kdelibs-3.5.10-gcc_4.4-2.patch
+++ /dev/null
@@ -1,461 +0,0 @@
-Submitted By: Michael (rabenkind at selfservix dot org)
-Date: 2009-07-15
-Initial Package Version: 3.5.10
-Origin: http://de-mirror.org/distro/frugalware/frugalware-current/source/kde/kdelibs/
-Upstream Status: Unknown
-Description: Fix compilation with gcc-4.4
-
---- kdelibs-3.5.10/kjs/dtoa.cpp.orig 2009-05-26 17:20:54.673539511 +0200
-+++ kdelibs-3.5.10/kjs/dtoa.cpp 2009-05-26 17:24:20.117023777 +0200
-@@ -207,11 +207,7 @@ typedef unsigned Long ULong;
- #endif
-
- #ifdef MALLOC
--#ifdef KR_headers
--extern char *MALLOC();
--#else
- extern void *MALLOC(size_t);
--#endif
- #else
- #define MALLOC malloc
- #endif
-@@ -273,12 +269,8 @@ extern "C" {
- #endif
-
- #ifndef CONST
--#ifdef KR_headers
--#define CONST /* blank */
--#else
- #define CONST const
- #endif
--#endif
-
- #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
- Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
-@@ -286,37 +278,19 @@ Exactly one of IEEE_8087, IEEE_MC68k, VA
-
- typedef union { double d; ULong L[2]; } U;
-
--#ifdef YES_ALIAS
--#define dval(x) x
-+#define dval(x) (x).d
- #ifdef IEEE_8087
--#define word0(x) ((ULong *)&x)[1]
--#define word1(x) ((ULong *)&x)[0]
-+#define word0(x) (x).L[1]
-+#define word1(x) (x).L[0]
- #else
--#define word0(x) ((ULong *)&x)[0]
--#define word1(x) ((ULong *)&x)[1]
--#endif
--#else
--#ifdef IEEE_8087
--#define word0(x) ((U*)&x)->L[1]
--#define word1(x) ((U*)&x)->L[0]
--#else
--#define word0(x) ((U*)&x)->L[0]
--#define word1(x) ((U*)&x)->L[1]
--#endif
--#define dval(x) ((U*)&x)->d
-+#define word0(x) (x).L[0]
-+#define word1(x) (x).L[1]
- #endif
-
- /* The following definition of Storeinc is appropriate for MIPS processors.
- * An alternative that might be better on some machines is
-- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
- */
--#if defined(IEEE_8087) + defined(VAX)
--#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
--((unsigned short *)a)[0] = (unsigned short)c, a++)
--#else
--#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
--((unsigned short *)a)[1] = (unsigned short)c, a++)
--#endif
-+#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
-
- /* #define P DBL_MANT_DIG */
- /* Ten_pmax = floor(P*log(2)/log(5)) */
-@@ -440,11 +414,7 @@ typedef union { double d; ULong L[2]; }
- #ifdef RND_PRODQUOT
- #define rounded_product(a,b) a = rnd_prod(a, b)
- #define rounded_quotient(a,b) a = rnd_quot(a, b)
--#ifdef KR_headers
--extern double rnd_prod(), rnd_quot();
--#else
- extern double rnd_prod(double, double), rnd_quot(double, double);
--#endif
- #else
- #define rounded_product(a,b) a *= b
- #define rounded_quotient(a,b) a /= b
-@@ -457,11 +427,7 @@ extern double rnd_prod(double, double),
- #define Pack_32
- #endif
-
--#ifdef KR_headers
--#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
--#else
- #define FFFFFFFF 0xffffffffUL
--#endif
-
- #ifdef NO_LONG_LONG
- #undef ULLong
-@@ -502,11 +468,7 @@ Bigint {
-
- static Bigint *
- Balloc
--#ifdef KR_headers
-- (k) int k;
--#else
- (int k)
--#endif
- {
- int x;
- Bigint *rv;
-@@ -542,11 +504,7 @@ Balloc
-
- static void
- Bfree
--#ifdef KR_headers
-- (v) Bigint *v;
--#else
- (Bigint *v)
--#endif
- {
- if (v) {
- ACQUIRE_DTOA_LOCK(0);
-@@ -561,11 +519,7 @@ y->wds*sizeof(Long) + 2*sizeof(int))
-
- static Bigint *
- multadd
--#ifdef KR_headers
-- (b, m, a) Bigint *b; int m, a;
--#else
- (Bigint *b, int m, int a) /* multiply by m and add a */
--#endif
- {
- int i, wds;
- #ifdef ULLong
-@@ -618,11 +572,7 @@ multadd
-
- static Bigint *
- s2b
--#ifdef KR_headers
-- (s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
--#else
- (CONST char *s, int nd0, int nd, ULong y9)
--#endif
- {
- Bigint *b;
- int i, k;
-@@ -656,11 +606,7 @@ s2b
-
- static int
- hi0bits
--#ifdef KR_headers
-- (x) register ULong x;
--#else
- (register ULong x)
--#endif
- {
- register int k = 0;
-
-@@ -690,11 +636,7 @@ hi0bits
-
- static int
- lo0bits
--#ifdef KR_headers
-- (y) ULong *y;
--#else
- (ULong *y)
--#endif
- {
- register int k;
- register ULong x = *y;
-@@ -738,11 +680,7 @@ lo0bits
-
- static Bigint *
- i2b
--#ifdef KR_headers
-- (i) int i;
--#else
- (int i)
--#endif
- {
- Bigint *b;
-
-@@ -754,11 +692,7 @@ i2b
-
- static Bigint *
- mult
--#ifdef KR_headers
-- (a, b) Bigint *a, *b;
--#else
- (Bigint *a, Bigint *b)
--#endif
- {
- Bigint *c;
- int k, wa, wb, wc;
-@@ -866,11 +800,7 @@ mult
-
- static Bigint *
- pow5mult
--#ifdef KR_headers
-- (b, k) Bigint *b; int k;
--#else
- (Bigint *b, int k)
--#endif
- {
- Bigint *b1, *p5, *p51;
- int i;
-@@ -923,11 +853,7 @@ pow5mult
-
- static Bigint *
- lshift
--#ifdef KR_headers
-- (b, k) Bigint *b; int k;
--#else
- (Bigint *b, int k)
--#endif
- {
- int i, k1, n, n1;
- Bigint *b1;
-@@ -983,11 +909,7 @@ lshift
-
- static int
- cmp
--#ifdef KR_headers
-- (a, b) Bigint *a, *b;
--#else
- (Bigint *a, Bigint *b)
--#endif
- {
- ULong *xa, *xa0, *xb, *xb0;
- int i, j;
-@@ -1017,11 +939,7 @@ cmp
-
- static Bigint *
- diff
--#ifdef KR_headers
-- (a, b) Bigint *a, *b;
--#else
- (Bigint *a, Bigint *b)
--#endif
- {
- Bigint *c;
- int i, wa, wb;
-@@ -1111,15 +1029,12 @@ diff
-
- static double
- ulp
--#ifdef KR_headers
-- (x) double x;
--#else
-- (double x)
--#endif
-+ (double dx)
- {
- register Long L;
-- double a;
-+ U x, a;
-
-+ dval(x) = dx;
- L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
- #ifndef Avoid_Underflow
- #ifndef Sudden_Underflow
-@@ -1153,15 +1068,11 @@ ulp
-
- static double
- b2d
--#ifdef KR_headers
-- (a, e) Bigint *a; int *e;
--#else
- (Bigint *a, int *e)
--#endif
- {
- ULong *xa, *xa0, w, y, z;
- int k;
-- double d;
-+ U d;
- #ifdef VAX
- ULong d0, d1;
- #else
-@@ -1223,12 +1134,9 @@ b2d
-
- static Bigint *
- d2b
--#ifdef KR_headers
-- (d, e, bits) double d; int *e, *bits;
--#else
-- (double d, int *e, int *bits)
--#endif
-+ (double dd, int *e, int *bits)
- {
-+ U d;
- Bigint *b;
- int de, k;
- ULong *x, y, z;
-@@ -1237,6 +1145,9 @@ d2b
- #endif
- #ifdef VAX
- ULong d0, d1;
-+#endif
-+ dval(d) = dd;
-+#ifdef VAX
- d0 = word0(d) >> 16 | word0(d) << 16;
- d1 = word1(d) >> 16 | word1(d) << 16;
- #else
-@@ -1361,13 +1272,9 @@ d2b
-
- static double
- ratio
--#ifdef KR_headers
-- (a, b) Bigint *a, *b;
--#else
- (Bigint *a, Bigint *b)
--#endif
- {
-- double da, db;
-+ U da, db;
- int k, ka, kb;
-
- dval(da) = b2d(a, &ka);
-@@ -1453,11 +1360,7 @@ static CONST double tinytens[] = { 1e-16
-
- static int
- match
--#ifdef KR_headers
-- (sp, t) char **sp, *t;
--#else
- (CONST char **sp, CONST char *t)
--#endif
- {
- int c, d;
- CONST char *s = *sp;
-@@ -1475,11 +1378,7 @@ match
- #ifndef No_Hex_NaN
- static void
- hexnan
--#ifdef KR_headers
-- (rvp, sp) double *rvp; CONST char **sp;
--#else
-- (double *rvp, CONST char **sp)
--#endif
-+ (U *rvp, CONST char **sp)
- {
- ULong c, x[2];
- CONST char *s;
-@@ -1529,11 +1428,7 @@ hexnan
-
- double
- kjs_strtod
--#ifdef KR_headers
-- (s00, se) CONST char *s00; char **se;
--#else
- (CONST char *s00, char **se)
--#endif
- {
- #ifdef Avoid_Underflow
- int scale;
-@@ -1541,7 +1436,8 @@ kjs_strtod
- int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
- e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
- CONST char *s, *s0, *s1;
-- double aadj, aadj1, adj, rv, rv0;
-+ double aadj, aadj1, adj;
-+ U aadj2, rv, rv0;
- Long L;
- ULong y, z;
- Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;
-@@ -2302,7 +2198,9 @@ kjs_strtod
- aadj = z;
- aadj1 = dsign ? aadj : -aadj;
- }
-- word0(aadj1) += (2*P+1)*Exp_msk1 - y;
-+ dval(aadj2) = aadj1;
-+ word0(aadj2) += (2*P+1)*Exp_msk1 - y;
-+ aadj1 = dval(aadj2);
- }
- adj = aadj1 * ulp(dval(rv));
- dval(rv) += adj;
-@@ -2419,11 +2317,7 @@ kjs_strtod
-
- static int
- quorem
--#ifdef KR_headers
-- (b, S) Bigint *b, *S;
--#else
- (Bigint *b, Bigint *S)
--#endif
- {
- int n;
- ULong *bx, *bxe, q, *sx, *sxe;
-@@ -2540,11 +2434,7 @@ quorem
- #endif
-
- static char *
--#ifdef KR_headers
--rv_alloc(i) int i;
--#else
- rv_alloc(int i)
--#endif
- {
- int j, k, *r;
-
-@@ -2563,11 +2453,7 @@ rv_alloc(int i)
- }
-
- static char *
--#ifdef KR_headers
--nrv_alloc(s, rve, n) char *s, **rve; int n;
--#else
- nrv_alloc(CONST char *s, char **rve, int n)
--#endif
- {
- char *rv, *t;
-
-@@ -2585,11 +2471,7 @@ nrv_alloc(CONST char *s, char **rve, int
- */
-
- void
--#ifdef KR_headers
--kjs_freedtoa(s) char *s;
--#else
- kjs_freedtoa(char *s)
--#endif
- {
- Bigint *b = (Bigint *)((int *)s - 1);
- b->maxwds = 1 << (b->k = *(int*)b);
-@@ -2636,12 +2518,7 @@ kjs_freedtoa(char *s)
-
- char *
- kjs_dtoa
--#ifdef KR_headers
-- (d, mode, ndigits, decpt, sign, rve)
-- double d; int mode, ndigits, *decpt, *sign; char **rve;
--#else
-- (double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
--#endif
-+ (double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
- {
- /* Arguments ndigits, decpt, sign are similar to those
- of ecvt and fcvt; trailing zeros are suppressed from
-@@ -2686,7 +2563,8 @@ kjs_dtoa
- ULong x;
- #endif
- Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
-- double d2, ds, eps;
-+ U d, d2, eps;
-+ double ds;
- char *s, *s0;
- #ifdef Honor_FLT_ROUNDS
- int rounding;
-@@ -2702,6 +2580,7 @@ kjs_dtoa
- }
- #endif
-
-+ dval(d) = dd;
- if (word0(d) & Sign_bit) {
- /* set sign for everything, including 0's and NaNs */
- *sign = 1;
-
diff --git a/kdelibs-3.5.10-ossl-1.x.patch b/kdelibs-3.5.10-ossl-1.x.patch
deleted file mode 100644
index a948b88..0000000
--- a/kdelibs-3.5.10-ossl-1.x.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x 2009-09-04 23:10:53.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-09-04 23:10:53.000000000 +0200
-@@ -96,9 +96,14 @@ static int (*K_BIO_write) (BIO *b, cons
- static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
- const EVP_CIPHER *,unsigned char *,int ,
- pem_password_cb *, void *) = 0L;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
-+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
-+#else
- static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
- static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
- static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
-+#endif
- static int (*K_X509_print_fp) (FILE *, X509*) = 0L;
- static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L;
- static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L;
-@@ -430,9 +435,14 @@ KConfig *cfg;
- K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
- K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
- K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
-+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
-+#else
- K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
- K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
- K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
-+#endif
- K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
- K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
- K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
-@@ -594,7 +604,7 @@ KConfig *cfg;
- K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
- K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
- K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
-- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
-+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
- #endif
-
-
-@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
- else return -1;
- }
-
--
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
-+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
-+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
-+ else return -1;
-+}
-+#else
- ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
- if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
- else return 0L;
-@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
- return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
- else return -1;
- }
--
-+#endif
-
- int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
- if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
---- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x 2006-07-22 10:16:39.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.h 2009-09-04 23:10:53.000000000 +0200
-@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
- #include <openssl/stack.h>
- #include <openssl/bn.h>
- #undef crypt
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define STACK _STACK
-+#endif
- #endif
-
- #include <kstaticdeleter.h>
-@@ -446,12 +449,12 @@ public:
- */
- int PEM_write_bio_X509(BIO *bp, X509 *x);
-
--
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L
- /*
- * X509_asn1_meth - used for netscape output
- */
- ASN1_METHOD *X509_asn1_meth();
--
-+#endif
-
- /*
- * ASN1_i2d_fp - used for netscape output
-@@ -531,6 +534,9 @@ public:
- */
- void sk_free(STACK *s);
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
-+#endif
-
- /*
- * Number of elements in the stack
-@@ -543,6 +549,9 @@ public:
- */
- char *sk_value(STACK *s, int n);
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
-+#endif
-
- /*
- * Create a new stack
-@@ -555,6 +564,9 @@ public:
- */
- int sk_push(STACK *s, char *d);
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
-+#endif
-
- /*
- * Duplicate the stack
-diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
---- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x 2005-10-10 17:05:44.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc 2009-09-04 23:10:53.000000000 +0200
-@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
-
-
- STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
-- STACK_OF(X509) *x509 = sk_new(NULL);
-+ STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
- KSSLCertificate *cert = certs.first();
- while(cert) {
- sk_X509_push(x509, cert->getCert());
-diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
---- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x 2006-01-19 18:06:12.000000000 +0100
-+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc 2009-09-04 23:10:53.000000000 +0200
-@@ -1003,17 +1003,31 @@ return qba;
- QByteArray KSSLCertificate::toNetscape() {
- QByteArray qba;
- #ifdef KSSL_HAVE_SSL
--ASN1_HEADER ah;
--ASN1_OCTET_STRING os;
--KTempFile ktf;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ NETSCAPE_X509 nx;
-+ ASN1_OCTET_STRING hdr;
-+#else
-+ ASN1_HEADER ah;
-+ ASN1_OCTET_STRING os;
-+#endif
-+ KTempFile ktf;
-
-- os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-- os.length = strlen(NETSCAPE_CERT_HDR);
-- ah.header = &os;
-- ah.data = (char *)getCert();
-- ah.meth = d->kossl->X509_asn1_meth();
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+ hdr.length = strlen(NETSCAPE_CERT_HDR);
-+ nx.header = &hdr;
-+ nx.cert = getCert();
-+
-+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
-+#else
-+ os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+ os.length = strlen(NETSCAPE_CERT_HDR);
-+ ah.header = &os;
-+ ah.data = (char *)getCert();
-+ ah.meth = d->kossl->X509_asn1_meth();
-
-- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+#endif
-
- ktf.close();
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdelibs.git/commitdiff/bebbf7283de02f6dfb8c1326b800d88c4e807c11
More information about the pld-cvs-commit
mailing list