From faaf10cea476ff86d20feb106a84517350b63a02 Mon Sep 17 00:00:00 2001
From: Weng <wengxt@gmail.com>
Date: Thu, 19 Jul 2012 15:17:15 +0000
Subject: [PATCH] update fcitx and add goldendict

---
 fcitx-anthy/PKGBUILD             | 35 ++++++++++++++++++++++++
 fcitx-cloudpinyin/PKGBUILD       |  6 ++---
 fcitx-sunpinyin/PKGBUILD         |  4 +--
 fcitx-table-extra/PKGBUILD       |  4 +--
 fcitx/PKGBUILD                   | 10 +++----
 goldendict/PKGBUILD              | 46 ++++++++++++++++++++++++++++++++
 goldendict/fix-compile.patch     | 21 +++++++++++++++
 goldendict/goldendict-paths.diff | 10 +++++++
 goldendict/goldendict.changelog  |  8 ++++++
 kcm-fcitx/PKGBUILD               |  6 ++---
 10 files changed, 135 insertions(+), 15 deletions(-)
 create mode 100644 fcitx-anthy/PKGBUILD
 create mode 100644 goldendict/PKGBUILD
 create mode 100644 goldendict/fix-compile.patch
 create mode 100644 goldendict/goldendict-paths.diff
 create mode 100644 goldendict/goldendict.changelog

diff --git a/fcitx-anthy/PKGBUILD b/fcitx-anthy/PKGBUILD
new file mode 100644
index 000000000..37d0cc50b
--- /dev/null
+++ b/fcitx-anthy/PKGBUILD
@@ -0,0 +1,35 @@
+#
+# Apps Packages for Chakra, part of chakra-project.org
+#
+# Maintainer: Weng Xuetian <wengxt@gmail.com>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+pkgname=fcitx-anthy
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Japanese Input support (Anthy) for fcitx."
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/fcitx"
+license=('GPL')
+depends=('fcitx>=4.2.5' 'anthy')
+makedepends=('cmake' 'intltool')
+source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz)
+md5sums=('794b9a3e9d9de214fafa6d55c3cdb09d')
+
+build(){
+    cd "$srcdir/${pkgname}-${pkgver}"
+    rm -rf build
+    mkdir build
+    cd build
+    
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+    make
+}
+
+package ()
+{
+    cd "$srcdir/${pkgname}-${pkgver}/build"
+    make DESTDIR=${pkgdir} install
+}
diff --git a/fcitx-cloudpinyin/PKGBUILD b/fcitx-cloudpinyin/PKGBUILD
index 350ce73a2..8e824fdc2 100644
--- a/fcitx-cloudpinyin/PKGBUILD
+++ b/fcitx-cloudpinyin/PKGBUILD
@@ -8,16 +8,16 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=fcitx-cloudpinyin
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=1
 pkgdesc="This is a standalone module for fcitx, it can use pinyin API on the internet to input."
 arch=('i686' 'x86_64')
 url="https://github.com/csslayer/fcitx-cloudpinyin"
 license=('GPL')
-depends=('fcitx>=4.2.4')
+depends=('fcitx>=4.2.5')
 makedepends=('cmake' 'intltool')
 source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz)
-md5sums=('f3fd994e924174f6be98cafe619b2eda')
+md5sums=('6d9028d3fabf68c5cd2671d0ba2b7247')
 
 build(){
     cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/fcitx-sunpinyin/PKGBUILD b/fcitx-sunpinyin/PKGBUILD
index e1d0b3185..442e53724 100644
--- a/fcitx-sunpinyin/PKGBUILD
+++ b/fcitx-sunpinyin/PKGBUILD
@@ -8,7 +8,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=fcitx-sunpinyin
-pkgver=0.3.7
+pkgver=0.3.8
 pkgrel=1
 pkgdesc="Fcitx Wrapper for sunpinyin."
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ license=('GPL')
 depends=('fcitx>=4.2.1' 'sunpinyin-git>=20120603')
 makedepends=('cmake' 'intltool')
 source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz)
-md5sums=('bc41d72941370a2b66fc6081dc2ea54b')
+md5sums=('aefb43370520d00e1c6cf331c2d1a251')
 
 build(){
     cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/fcitx-table-extra/PKGBUILD b/fcitx-table-extra/PKGBUILD
index 61ba7df0f..7131b3611 100644
--- a/fcitx-table-extra/PKGBUILD
+++ b/fcitx-table-extra/PKGBUILD
@@ -7,7 +7,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=fcitx-table-extra
-pkgver=0.3.1
+pkgver=0.3.2
 pkgrel=1
 pkgdesc="Extra table data for fcitx, including Zhengma, Cangjie, Boshiamy"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ license=('GPL')
 depends=('fcitx>=4.2.4')
 makedepends=('cmake' 'intltool')
 source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz)
-md5sums=('651f2d14b3a6eefbfed057f575ef0aa6')
+md5sums=('8bddeade93365f3497dbd3e8e3073e38')
 
 build(){
     cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/fcitx/PKGBUILD b/fcitx/PKGBUILD
index 760a707d1..8bc7ad64e 100644
--- a/fcitx/PKGBUILD
+++ b/fcitx/PKGBUILD
@@ -9,15 +9,15 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-qt' 'fcitx-gtk2' 'fcitx-gtk3')
-pkgver=4.2.4.1
+pkgver=4.2.5
 pkgrel=1
 pkgdesc="A Flexible Input Method Framework"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://code.google.com/p/fcitx"
-makedepends=('intltool' 'cmake' 'pango' 'qt' 'icu' 'dbus-core' 'wget' 'gtk2' 'gtk3' 'opencc' 'lua' 'iso-codes')
+makedepends=('intltool' 'cmake' 'pango' 'qt' 'icu' 'dbus-core' 'wget' 'gtk2' 'gtk3' 'opencc' 'lua' 'iso-codes' 'enchant')
 source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
-md5sums=('554b9498e56556cac3d0b1869e909a71')
+md5sums=('4301375f3abfec374d3899ffdc9c7e28')
 
 build() {
   cd $srcdir/
@@ -39,7 +39,7 @@ build() {
 }
 
 package_fcitx(){
-    depends=('pango' 'dbus-core' 'opencc' 'lua')
+    depends=('pango' 'dbus-core' 'opencc' 'lua' 'iso-codes' 'enchant' 'icu')
     conflicts=('fcitx-utf8-svn' 'fcitx-svn' 'fcitx-hg' 'fcitx-keyboard')
     replaces=('fcitx-keyboard')
     cd $srcdir/build
@@ -60,7 +60,7 @@ package_fcitx-qt()
 package_fcitx-gtk2()
 {
     pkgdesc='GTK2 IM Module for fcitx'
-    depends=('gtk2' 'icu' 'fcitx')
+    depends=('gtk2' 'fcitx')
     install=fcitx-gtk2.install
     cd $srcdir/build/src/frontend/gtk2
     make DESTDIR=$pkgdir install
diff --git a/goldendict/PKGBUILD b/goldendict/PKGBUILD
new file mode 100644
index 000000000..2f314c9c8
--- /dev/null
+++ b/goldendict/PKGBUILD
@@ -0,0 +1,46 @@
+#
+# Apps Packages for Chakra, part of chakra-project.org
+#
+# Maintainer: Neo Kolokotronis <tetris4@gmail.com>
+# Contributor: csslayer <wengxt AT gmail com>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+pkgname=goldendict
+pkgver=1.0.1
+pkgrel=5
+pkgdesc="Feature-rich dictionary lookup program"
+arch=('i686' 'x86_64')
+url="http://goldendict.berlios.de/"
+license=('GPL3')
+depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'phonon')
+provides=('stardict')
+changelog=$pkgname.changelog
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2
+        $pkgname-paths.diff
+	fix-compile.patch)
+sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
+            '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589'
+            '6d695b870fdd2411c72cf3202375c3aad68224e8b62163e72943c39275a18590')
+
+build(){
+  cd ${srcdir}
+
+  patch -Np0 -i ${srcdir}/$pkgname-paths.diff
+  patch -Np0 -i ${srcdir}/fix-compile.patch
+
+  qmake
+  make
+  qmake
+}
+
+package() {
+  cd ${srcdir}
+
+  make INSTALL_ROOT=${pkgdir} install
+
+  #removing unneeded
+  rm -rf ${pkgdir}/usr/share/app-install
+}
+
diff --git a/goldendict/fix-compile.patch b/goldendict/fix-compile.patch
new file mode 100644
index 000000000..d12a36289
--- /dev/null
+++ b/goldendict/fix-compile.patch
@@ -0,0 +1,21 @@
+--- qtsingleapplication/src/qtlocalpeer.cpp.orig	2012-07-19 15:01:51.610446745 +0000
++++ qtsingleapplication/src/qtlocalpeer.cpp	2012-07-19 15:01:10.499880379 +0000
+@@ -49,6 +49,7 @@
+ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
++#include <unistd.h>
+ #include <time.h>
+ #endif
+ 
+--- processwrapper.cc.orig	2012-07-19 14:59:46.495424725 +0000
++++ processwrapper.cc	2012-07-19 15:00:07.155695828 +0000
+@@ -94,6 +94,8 @@
+ 
+ #else
+ 
++#include <unistd.h>
++
+ unsigned int ProcessWrapper::currentProcessId()
+ {
+     return getpid();
diff --git a/goldendict/goldendict-paths.diff b/goldendict/goldendict-paths.diff
new file mode 100644
index 000000000..812dfdb97
--- /dev/null
+++ b/goldendict/goldendict-paths.diff
@@ -0,0 +1,10 @@
+--- goldendict.pro~	2010-12-27 22:52:21.000000000 +0100
++++ goldendict.pro	2010-12-27 22:52:21.000000000 +0100
+@@ -63,2 +63,2 @@
+-    isEmpty( PREFIX ):PREFIX = /usr/local
+-    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
++    isEmpty( PREFIX ):PREFIX = /usr
++    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
+@@ -66 +66 @@
+-    locale.path = $$PREFIX/share/apps/goldendict/locale/
++    locale.path = $$PREFIX/share/goldendict/locale/
diff --git a/goldendict/goldendict.changelog b/goldendict/goldendict.changelog
new file mode 100644
index 000000000..8ec311fe1
--- /dev/null
+++ b/goldendict/goldendict.changelog
@@ -0,0 +1,8 @@
+2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 1.0.1
+
+2010-02-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* FS#18350 fixed in 0.9.0-5
+
+2009-06-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Package moved to [community] in v0.9.0
diff --git a/kcm-fcitx/PKGBUILD b/kcm-fcitx/PKGBUILD
index 388175d12..7e17acdf4 100644
--- a/kcm-fcitx/PKGBUILD
+++ b/kcm-fcitx/PKGBUILD
@@ -8,16 +8,16 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=kcm-fcitx
-pkgver=0.3.4
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="KDE Config Module for Fcitx"
 arch=('i686' 'x86_64')
 url="https://github.com/fcitx/kcm-fcitx"
 license=('GPL')
-depends=('fcitx>=4.2.4' 'kdebase-runtime')
+depends=('fcitx>=4.2.5' 'kdebase-runtime')
 makedepends=('cmake' 'intltool' 'automoc4')
 source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz)
-md5sums=('7af49109937f11c21b208ac2bf6c562d')
+md5sums=('c54eb7ed04ecaf64e06b55acee3f30f6')
 
 build(){
     cd "$srcdir/${pkgname}-${pkgver}"