Merge branch 'master' of gitorious.org:chakra-packages/apps

calibre/PKGBUILD

@@ -7,7 +7,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=calibre
-pkgver=0.8.40
+pkgver=0.8.41
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
@@ -22,7 +22,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz
         desktop_integration.patch)
-md5sums=('257ee03ab199ac5ec493c7650c7a5f35'
+md5sums=('732db88fb0a131218bf5de1331ffc6f3'
          'f4b80e3b34e34bce68b3f052ff52dee8')
 
 build() {

dosbox/PKGBUILD

@@ -6,33 +6,39 @@
 
 pkgname=dosbox
 pkgver=0.74
-pkgrel=2
+pkgrel=3
 pkgdesc="An emulator with builtin DOS for running DOS Games"
 arch=('i686' 'x86_64')
 url="http://dosbox.sourceforge.net/"
 license=('GPL')
-depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
+depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs' 'directfb' 'zlib')
 makedepends=('mesa')
 source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
-	'dosbox.png' 'dosbox.desktop')
+	'dosbox.png' 'dosbox.desktop' 'gcc46.patch')
 md5sums=('b9b240fa87104421962d14eee71351e8'
          '2aac25fc06979e375953fcc36824dc5e'
-         '85169ca599028bee8e29e0b3b7b34dd8')
+         '85169ca599028bee8e29e0b3b7b34dd8'
+         '3fba2e3c7c43290319b2928f40ed30e5')
 
 build(){
   cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i 's/png_check_sig/png_sig_cmp/' configure || return 1
+  patch -Np1 -i "$srcdir/gcc46.patch"
+  sed -i 's/png_check_sig/png_sig_cmp/' configure 
   ./configure --prefix=/usr \
-    --sysconfdir=/etc/dosbox || return 1
-  make || return 1
+    --sysconfdir=/etc/dosbox 
+  make 
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install 
+
+  # install docs, make does not install them
+  install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
+  install -Dm644 docs/README.video "$pkgdir"/usr/share/doc/$pkgname/README.video
 
   install -Dm644 ${srcdir}/${pkgname}.png \
-    ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1
+    ${pkgdir}/usr/share/pixmaps/${pkgname}.png 
   install -Dm644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1
+    ${pkgdir}/usr/share/applications/${pkgname}.desktop 
 }

dosbox/gcc46.patch

@@ -0,0 +1,12 @@
+diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h
+--- dosbox-0.74/include/dos_inc.h	2010-05-10 17:43:54.000000000 +0000
++++ dosbox-0.74.new//include/dos_inc.h	2011-06-17 20:42:43.982548979 +0000
+@@ -28,6 +28,8 @@
+ #include "mem.h"
+ #endif
+ 
++#include <stddef.h> //for offsetof
++
+ #ifdef _MSC_VER
+ #pragma pack (1)
+ #endif

fcitx/PKGBUILD

@@ -8,14 +8,14 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgbase=fcitx
-pkgname=('fcitx' 'fcitx-qt')
+pkgname=('fcitx' 'fcitx-qt' 'fcitx-gtk2' 'fcitx-gtk3')
 pkgver=4.2.0
-pkgrel=1
-pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
+pkgrel=3
+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')
+makedepends=('intltool' 'cmake' 'pango' 'qt' 'icu' 'dbus-core' 'wget' 'gtk2' 'gtk3')
 conflicts=('fcitx-utf8-svn' 'fcitx-svn' 'fcitx-hg')
 source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('4ba77f769219460439f9e1e5c0c6c5f3')
@@ -31,8 +31,8 @@ build() {
   cd $srcdir/build
   cmake ../${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
       -DENABLE_QT_IM_MODULE=On \
-      -DENABLE_GTK2_IM_MODULE=Off \
-      -DENABLE_GTK3_IM_MODULE=Off \
+      -DENABLE_GTK2_IM_MODULE=On \
+      -DENABLE_GTK3_IM_MODULE=On \
       -DENABLE_OPENCC=Off
   make
 }
@@ -43,6 +43,7 @@ package_fcitx(){
     make DESTDIR=$pkgdir install
     rm -rf $pkgdir/usr/lib/qt/
     rm -rf $pkgdir/usr/lib/gtk-2.0/
+    rm -rf $pkgdir/usr/lib/gtk-3.0/
 }
 
 package_fcitx-qt()
@@ -52,3 +53,21 @@ package_fcitx-qt()
     cd $srcdir/build/src/frontend/qt
     make DESTDIR=$pkgdir install
 }
+
+package_fcitx-gtk2()
+{
+    pkgdesc='GTK2 IM Module for fcitx'
+    depends=('gtk2' 'icu' 'fcitx')
+    install=fcitx-gtk2.install
+    cd $srcdir/build/src/frontend/gtk2
+    make DESTDIR=$pkgdir install
+}
+
+package_fcitx-gtk3()
+{
+    pkgdesc='GTK3 IM Module for fcitx'
+    depends=('gtk3' 'fcitx')
+    install=fcitx-gtk3.install
+    cd $srcdir/build/src/frontend/gtk3
+    make DESTDIR=$pkgdir install
+}

fcitx/fcitx-gtk2.install

@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

fcitx/fcitx-gtk3.install

@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

wine/PKGBUILD

@@ -5,7 +5,7 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=wine
-pkgver=1.4rc4
+pkgver=1.4rc5
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
@@ -139,5 +139,5 @@ package() {
 }
 
 # vim:set ts=8 sts=2 sw=2 et:
-md5sums=('74d6ae855718b8fdc9c70fe95026941b')
+md5sums=('80b324aec2a07610e4ad07a56f429db3')
 

xine-ui/PKGBUILD

@@ -1,9 +1,12 @@
-# $Id: PKGBUILD 77076 2010-04-10 16:09:26Z andrea $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+#
+# Apps Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=xine-ui
 pkgver=0.99.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -23,19 +26,19 @@ md5sums=('d468b4e7fe39ff19888261e1da9be914'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" || return 1
-  patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" || return 1
-  patch -p1 < "${srcdir}/fix_lirc.diff" || return 1
-  autoconf || return 1
+  patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" 
+  patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" 
+  patch -p1 < "${srcdir}/fix_lirc.diff" 
+  autoconf 
 
   ./configure --prefix=/usr --mandir=/usr/share/man \
-    --with-x --enable-lirc --without-aalib --enable-debug || return 1
-  make || return 1
+    --with-x --enable-lirc --without-aalib --enable-debug 
+  make 
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install 
   install -d "${pkgdir}/usr/share/applications"
   mv "${pkgdir}/usr/share/xine/desktop/xine.desktop" "${pkgdir}/usr/share/applications"
 }