Added patches to fix type mismatch. See bug #83474. Thanks to Federico Zenith <zenith@chemeng.ntnu.no>.

Package-Manager: portage-2.0.51.19

5 files changed, 45 insertions, 5 deletions

diff --git a/app-i18n/skim/ChangeLog b/app-i18n/skim/ChangeLog
index 88002e801729..3b4a1f6aeb46 100644
--- a/app-i18n/skim/ChangeLog
+++ b/app-i18n/skim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/skim
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.19 2005/03/05 13:36:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.20 2005/03/05 13:58:21 usata Exp $
+
+  05 Mar 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/skim-1.0.2-types.patch, +files/skim-1.1.0-types.patch,
+  skim-1.1.0.ebuild:
+  Added patches to fix type mismatch. See bug #83474.
+  Thanks to Federico Zenith <zenith@chemeng.ntnu.no>.
 
 *skim-1.2.0 (05 Mar 2005)
 
diff --git a/app-i18n/skim/Manifest b/app-i18n/skim/Manifest
index 685919492843..24dfd040b08e 100644
--- a/app-i18n/skim/Manifest
+++ b/app-i18n/skim/Manifest
@@ -1,8 +1,10 @@
-MD5 caf1bd96d3c5bf50bbd4c6c2617387d2 skim-1.1.0.ebuild 1136
+MD5 8c98f2966263f6d395479ca60f1bc3ce skim-1.1.0.ebuild 1220
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 a08240ca67df7096c77ca26059a65c6c ChangeLog 2657
+MD5 ff65202ad7e07776f6dbfbe08fa95442 ChangeLog 2900
 MD5 db363b4fe9d7423ffcdbc4e73d979552 skim-1.2.0.ebuild 1143
 MD5 80954fcb8c10e97bd7b1ec9ba6251b46 skim-1.0.2.ebuild 1358
 MD5 fa742392c9a1a2b5b3bb0dda9dd0e70e files/digest-skim-1.1.0 64
 MD5 b920ff794a0679e89f678af0d08cdf63 files/digest-skim-1.2.0 64
+MD5 8af9846719437446280e497fd80e4212 files/skim-1.1.0-types.patch 838
 MD5 23841544293c91ccf1a672546f0d91f7 files/digest-skim-1.0.2 64
+MD5 1d5af0e9f04b0051301aa8ecbbe9048f files/skim-1.0.2-types.patch 739
diff --git a/app-i18n/skim/files/skim-1.0.2-types.patch b/app-i18n/skim/files/skim-1.0.2-types.patch
new file mode 100644
index 000000000000..53b41015c1b8
--- /dev/null
+++ b/app-i18n/skim/files/skim-1.0.2-types.patch
@@ -0,0 +1,12 @@
+diff -pur skim-1.0.2/src/socketserverthread.h skim-1.0.2.patched/src/socketserverthread.h
+--- skim-1.0.2/src/socketserverthread.h	2004-10-10 16:34:03.000000000 +0200
++++ skim-1.0.2.patched/src/socketserverthread.h	2005-02-27 19:59:46.745519480 +0100
+@@ -120,7 +120,7 @@ signals:
+     void updatePreeditStringReq(const QString &, const scim::AttributeList &);
+     void updateLookupTableReq( const QStringList &, const QStringList &, 
+         QValueList<scim::AttributeList > &, int cursor,
+-        unsigned page_start, unsigned candidates, unsigned & exact_item_num );
++        int page_start, uint32 candidates, size_t & exact_item_num );
+     void showAuxStringReq();
+     void showPreeditStringReq();
+     void showStatusStringReq();
diff --git a/app-i18n/skim/files/skim-1.1.0-types.patch b/app-i18n/skim/files/skim-1.1.0-types.patch
new file mode 100644
index 000000000000..3907c7af0c3c
--- /dev/null
+++ b/app-i18n/skim/files/skim-1.1.0-types.patch
@@ -0,0 +1,14 @@
+diff -pur skim-1.1.0/src/socketserverthread.h skim-1.1.0.patched/src/socketserverthread.h
+--- skim-1.1.0/src/socketserverthread.h	2005-02-04 13:10:24.000000000 +0100
++++ skim-1.1.0.patched/src/socketserverthread.h	2005-02-27 21:02:07.079902224 +0100
+@@ -67,8 +67,8 @@ signals:
+     void updateSpotLocationReq( int, int );
+     void updatePreeditStringReq(const QString &, const scim::AttributeList &);
+     void updateLookupTableReq( const QStringList &, const QStringList &, 
+-        QValueList<scim::AttributeList > &, int cursor,
+-        unsigned page_start, unsigned candidates, unsigned & exact_item_num );
++        QValueList<scim::AttributeList> &, int cursor,
++        int page_start, uint32 candidates, size_t & exact_item_num );
+     void showAuxStringReq();
+     void showPreeditStringReq();
+     void showStatusStringReq();
diff --git a/app-i18n/skim/skim-1.1.0.ebuild b/app-i18n/skim/skim-1.1.0.ebuild
index 50d452ebd7c7..cab6197726ae 100644
--- a/app-i18n/skim/skim-1.1.0.ebuild
+++ b/app-i18n/skim/skim-1.1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.1.0.ebuild,v 1.3 2005/03/05 13:36:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.1.0.ebuild,v 1.4 2005/03/05 13:58:21 usata Exp $
 
-inherit kde-base
+inherit kde-base eutils
 
 DESCRIPTION="Smart Common Input Method (SCIM) optimized for KDE"
 HOMEPAGE="http://www.scim-im.org/"
@@ -18,6 +18,12 @@ DEPEND="|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )"
 
 need-kde 3
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-types.patch
+}
+
 src_install() {
 	kde_src_install