[arch-commits] Commit in scim/repos (3 files)

[Eric Bélanger]

    Date: Tuesday, March 10, 2009 @ 20:09:16
  Author: eric
Revision: 29660

Merged revisions 29656 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/scim/trunk

........
  r29656 | eric | 2009-03-10 19:53:20 -0400 (Tue, 10 Mar 2009) | 2 lines
  
  upgpkg: scim 1.4.8-3
      Removed java patch. Scim 1.4.8 doesn't need it apparently (see FS#12356)
........

Modified:
  scim/repos/testing-i686/	(properties)
  scim/repos/testing-i686/PKGBUILD
Deleted:
  scim/repos/testing-i686/scim-java.diff

----------------+
 PKGBUILD       |    7 +++----
 scim-java.diff |   13 -------------
 2 files changed, 3 insertions(+), 17 deletions(-)


Property changes on: scim/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /scim/trunk:1-29343
   + /scim/trunk:1-29659

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-03-10 23:58:13 UTC (rev 29659)
+++ testing-i686/PKGBUILD	2009-03-11 00:09:16 UTC (rev 29660)
@@ -4,7 +4,7 @@
 
 pkgname=scim
 pkgver=1.4.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A Input Method development platform"
 arch=("i686" "x86_64")
 url="http://www.scim-im.org/projects/scim"
@@ -13,12 +13,11 @@
 makedepends=('intltool')
 options=('!libtool')
 install=scim.install
-source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz scim-java.diff)
-md5sums=('c52da019d48df4ba44cbd01558203cc7' 'd4532c5493e6086edc0f170c3f490d81')
+source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz)
+md5sums=('c52da019d48df4ba44cbd01558203cc7')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -p1 < ../scim-java.diff || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-gnu-ld --with-x --disable-static || return 1
   make || return 1

Deleted: testing-i686/scim-java.diff
===================================================================
--- testing-i686/scim-java.diff	2009-03-10 23:58:13 UTC (rev 29659)
+++ testing-i686/scim-java.diff	2009-03-11 00:09:16 UTC (rev 29660)
@@ -1,13 +0,0 @@
-diff -urNad scim-1.4.7~/modules/FrontEnd/scim_x11_frontend.cpp scim-1.4.7/modules/FrontEnd/scim_x11_frontend.cpp
---- scim-1.4.7~/modules/FrontEnd/scim_x11_frontend.cpp	2007-06-26 14:31:52.000000000 +0000
-+++ scim-1.4.7/modules/FrontEnd/scim_x11_frontend.cpp	2008-03-15 06:36:15.000000000 +0000
-@@ -1086,7 +1086,8 @@
-     // If the ic is not focused, then return.
-     if (!is_focused_ic (ic)) {
-         SCIM_DEBUG_FRONTEND(1) << "IC " << call_data->icid << " is not focused, focus it first.\n";
--        ims_set_ic_focus_handler (ims, (IMChangeFocusStruct *) call_data);
-+        // ims_set_ic_focus_handler (ims, (IMChangeFocusStruct *) call_data);
-+        return 1;
-     }
- 
-     XKeyEvent *event = (XKeyEvent*) &(call_data->event);