[arch-commits] Commit in scim-pinyin/trunk (4 files)

Gaetan Bisson bisson at archlinux.org
Sun Feb 5 17:18:37 UTC 2012


    Date: Sunday, February 5, 2012 @ 12:18:36
  Author: bisson
Revision: 149096

signed rebuild for free

Added:
  scim-pinyin/trunk/gcc43.patch
    (from rev 149067, scim-pinyin/trunk/scim-pinyin-0.5.91-gcc43.patch)
Modified:
  scim-pinyin/trunk/PKGBUILD
Deleted:
  scim-pinyin/trunk/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7
  scim-pinyin/trunk/scim-pinyin-0.5.91-gcc43.patch

----------------------------------------------------+
 PKGBUILD                                           |   42 +++++++++---------
 gcc43.patch                                        |   44 +++++++++++++++++++
 scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7 |    3 -
 scim-pinyin-0.5.91-gcc43.patch                     |   44 -------------------
 4 files changed, 66 insertions(+), 67 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-05 17:09:35 UTC (rev 149095)
+++ PKGBUILD	2012-02-05 17:18:36 UTC (rev 149096)
@@ -1,33 +1,35 @@
 # $Id$
-# Maintainer: 
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
 # Contributer: Gan Lu <rhythm.gan at gmail.com>
 
 pkgname=scim-pinyin
 pkgver=0.5.91
-pkgrel=5
-pkgdesc="Chinese 拼音 (PinYin) input for SCIM"
+pkgrel=6
+pkgdesc='Chinese pinyin input for SCIM'
+url='http://www.scim-im.org/'
 arch=('i686' 'x86_64')
-url="http://www.scim-im.org/"
-license=GPL
-depends=('scim>=1.4.7')
+license=('GPL')
+depends=('scim')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz
-        scim-pinyin-0.5.91-gcc43.patch)
-md5sums=('fb96d3545090d7681ea03edaced4eccb'
-         'ef84582d9bac7ac250d2d64cf260ad39')
+source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz"
+        'gcc43.patch')
+sha1sums=('58bea437a211b7af8420057541a38933a41841c7'
+          'b78ecec237ee0e04ec43604fcc344ff43ccfb7b3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/scim-pinyin-0.5.91-gcc43.patch
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --disable-static
-  make || return 1
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../gcc43.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-static \
+
+	make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
-
-

Copied: scim-pinyin/trunk/gcc43.patch (from rev 149067, scim-pinyin/trunk/scim-pinyin-0.5.91-gcc43.patch)
===================================================================
--- gcc43.patch	                        (rev 0)
+++ gcc43.patch	2012-02-05 17:18:36 UTC (rev 149096)
@@ -0,0 +1,44 @@
+diff -up scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_phrase.cpp
+--- scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43	2008-02-25 16:27:05.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_phrase.cpp	2008-02-25 16:26:41.000000000 +0800
+@@ -28,6 +28,7 @@
+ #define SCIM_PHRASE_MAX_RELATION 1000
+ 
+ #include <scim.h>
++#include <cstring>
+ #include "scim_pinyin_private.h"
+ #include "scim_phrase.h"
+ 
+diff -up scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 scim-pinyin-0.5.91/src/scim_special_table.cpp
+--- scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43	2008-02-25 16:27:55.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_special_table.cpp	2008-02-25 16:28:08.000000000 +0800
+@@ -22,6 +22,7 @@
+ 
+ #include <time.h>
+ #include <scim.h>
++#include <cstring>
+ #include "scim_pinyin_private.h"
+ #include "scim_special_table.h"
+ 
+diff -up scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin.cpp
+--- scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43	2008-02-25 16:26:10.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin.cpp	2008-02-25 16:26:26.000000000 +0800
+@@ -29,6 +29,7 @@
+ #define Uses_SCIM_LOOKUP_TABLE
+ 
+ #include <scim.h>
++#include <cstring>
+ #include "scim_pinyin.h"
+ 
+ // Internal functions
+diff -up scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
+--- scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43	2008-02-25 16:27:15.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp	2008-02-25 16:27:28.000000000 +0800
+@@ -27,6 +27,7 @@
+ #define Uses_SCIM_LOOKUP_TABLE
+ 
+ #include <scim.h>
++#include <cstring>
+ #include "scim_pinyin_private.h"
+ #include "scim_phrase.h"
+ #include "scim_pinyin.h"

Deleted: scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7
===================================================================
--- scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7	2012-02-05 17:09:35 UTC (rev 149095)
+++ scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7	2012-02-05 17:18:36 UTC (rev 149096)
@@ -1,3 +0,0 @@
-if /bin/sh ../libtool --silent --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I../src -I/opt/kde/include -I/opt/qt/include -I.  -I/opt/kde/include/skim -I/usr/include/scim-1.0     -DQT_THREAD_SUPPORT  -D_REENTRANT  -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -march=i686 -mtune=generic -O2 -pipe -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common  -MT smartpinyinui.lo -MD -MP -MF ".deps/smartpinyinui.Tpo" -c -o smartpinyinui.lo smartpinyinui.cpp; \
-        then mv -f ".deps/smartpinyinui.Tpo" ".deps/smartpinyinui.Plo"; else rm -f ".deps/smartpinyinui.Tpo"; exit 1; fi
-smartpinyinui.cpp:26:36: error: skimeditshortcutbutton.h: No such file or directory

Deleted: scim-pinyin-0.5.91-gcc43.patch
===================================================================
--- scim-pinyin-0.5.91-gcc43.patch	2012-02-05 17:09:35 UTC (rev 149095)
+++ scim-pinyin-0.5.91-gcc43.patch	2012-02-05 17:18:36 UTC (rev 149096)
@@ -1,44 +0,0 @@
-diff -up scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_phrase.cpp
---- scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43	2008-02-25 16:27:05.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_phrase.cpp	2008-02-25 16:26:41.000000000 +0800
-@@ -28,6 +28,7 @@
- #define SCIM_PHRASE_MAX_RELATION 1000
- 
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
- 
-diff -up scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 scim-pinyin-0.5.91/src/scim_special_table.cpp
---- scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43	2008-02-25 16:27:55.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_special_table.cpp	2008-02-25 16:28:08.000000000 +0800
-@@ -22,6 +22,7 @@
- 
- #include <time.h>
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin_private.h"
- #include "scim_special_table.h"
- 
-diff -up scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin.cpp
---- scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43	2008-02-25 16:26:10.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp	2008-02-25 16:26:26.000000000 +0800
-@@ -29,6 +29,7 @@
- #define Uses_SCIM_LOOKUP_TABLE
- 
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin.h"
- 
- // Internal functions
-diff -up scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
---- scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43	2008-02-25 16:27:15.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp	2008-02-25 16:27:28.000000000 +0800
-@@ -27,6 +27,7 @@
- #define Uses_SCIM_LOOKUP_TABLE
- 
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
- #include "scim_pinyin.h"




More information about the arch-commits mailing list