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

Gaetan Bisson bisson at archlinux.org
Sun Apr 29 07:52:40 EDT 2012


    Date: Sunday, April 29, 2012 @ 07:52:40
  Author: bisson
Revision: 157786

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  scim/repos/extra-i686/PKGBUILD
    (from rev 157785, scim/trunk/PKGBUILD)
  scim/repos/extra-i686/install
    (from rev 157785, scim/trunk/install)
  scim/repos/extra-x86_64/PKGBUILD
    (from rev 157785, scim/trunk/PKGBUILD)
  scim/repos/extra-x86_64/install
    (from rev 157785, scim/trunk/install)
Deleted:
  scim/repos/extra-i686/PKGBUILD
  scim/repos/extra-i686/install
  scim/repos/extra-x86_64/PKGBUILD
  scim/repos/extra-x86_64/install

-----------------------+
 extra-i686/PKGBUILD   |   87 ++++++++++++++++++++++--------------------------
 extra-i686/install    |   24 +++++++------
 extra-x86_64/PKGBUILD |   87 ++++++++++++++++++++++--------------------------
 extra-x86_64/install  |   24 +++++++------
 4 files changed, 106 insertions(+), 116 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-04-29 11:52:21 UTC (rev 157785)
+++ extra-i686/PKGBUILD	2012-04-29 11:52:40 UTC (rev 157786)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Gan Lu <rhythm.gan at gmail.com>
-
-pkgname=scim
-pkgver=1.4.12
-pkgrel=1
-pkgdesc='Input method user interface and development platform'
-url='http://www.scim-im.org/projects/scim'
-license=('LGPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-makedepends=('intltool')
-depends=('libltdl' 'gtk2')
-backup=('etc/scim/config' 'etc/scim/global')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'ftp://ftp.archlinux.org/other/scim/scim-docs-20120420.tar.xz')
-sha1sums=('948180ec0af18e435a95edbdb840cf41f3b24d32'
-          'b2cccb43673e1760abf6825768bc4354a981a0ad')
-
-# Docs tarball temporarily generated with:
-# 	svn co https://scim.svn.sourceforge.net/svnroot/scim/scim/trunk/docs docs
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	mv ../docs .
-	./bootstrap
-	sed 's/\$nls_cv_use_gnu_gettext/yes/' -i configure
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-static \
-		--with-gtk-version=2 # still a couple issues with 3
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-}

Copied: scim/repos/extra-i686/PKGBUILD (from rev 157785, scim/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-04-29 11:52:40 UTC (rev 157786)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Gan Lu <rhythm.gan at gmail.com>
+
+pkgname=scim
+pkgver=1.4.13
+pkgrel=1
+pkgdesc='Input method user interface and development platform'
+url='http://www.scim-im.org/projects/scim'
+license=('LGPL')
+options=('!libtool')
+arch=('i686' 'x86_64')
+makedepends=('intltool')
+depends=('libltdl' 'gtk2')
+backup=('etc/scim/config' 'etc/scim/global')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('dafe08bbdd3faa0324800cb63e44926d71be2e47')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	export CXXFLAGS+=' -fpermissive' # so configure detects gettext with gcc-4.7
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-static \
+		--with-gtk-version=2 # still a couple issues with 3
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/install
===================================================================
--- extra-i686/install	2012-04-29 11:52:21 UTC (rev 157785)
+++ extra-i686/install	2012-04-29 11:52:40 UTC (rev 157786)
@@ -1,11 +0,0 @@
-post_install() {
-	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: scim/repos/extra-i686/install (from rev 157785, scim/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2012-04-29 11:52:40 UTC (rev 157786)
@@ -0,0 +1,13 @@
+post_install() {
+	[[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	[[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
+	true
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-04-29 11:52:21 UTC (rev 157785)
+++ extra-x86_64/PKGBUILD	2012-04-29 11:52:40 UTC (rev 157786)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Gan Lu <rhythm.gan at gmail.com>
-
-pkgname=scim
-pkgver=1.4.12
-pkgrel=1
-pkgdesc='Input method user interface and development platform'
-url='http://www.scim-im.org/projects/scim'
-license=('LGPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-makedepends=('intltool')
-depends=('libltdl' 'gtk2')
-backup=('etc/scim/config' 'etc/scim/global')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'ftp://ftp.archlinux.org/other/scim/scim-docs-20120420.tar.xz')
-sha1sums=('948180ec0af18e435a95edbdb840cf41f3b24d32'
-          'b2cccb43673e1760abf6825768bc4354a981a0ad')
-
-# Docs tarball temporarily generated with:
-# 	svn co https://scim.svn.sourceforge.net/svnroot/scim/scim/trunk/docs docs
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	mv ../docs .
-	./bootstrap
-	sed 's/\$nls_cv_use_gnu_gettext/yes/' -i configure
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-static \
-		--with-gtk-version=2 # still a couple issues with 3
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-}

Copied: scim/repos/extra-x86_64/PKGBUILD (from rev 157785, scim/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-04-29 11:52:40 UTC (rev 157786)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Gan Lu <rhythm.gan at gmail.com>
+
+pkgname=scim
+pkgver=1.4.13
+pkgrel=1
+pkgdesc='Input method user interface and development platform'
+url='http://www.scim-im.org/projects/scim'
+license=('LGPL')
+options=('!libtool')
+arch=('i686' 'x86_64')
+makedepends=('intltool')
+depends=('libltdl' 'gtk2')
+backup=('etc/scim/config' 'etc/scim/global')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('dafe08bbdd3faa0324800cb63e44926d71be2e47')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	export CXXFLAGS+=' -fpermissive' # so configure detects gettext with gcc-4.7
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-static \
+		--with-gtk-version=2 # still a couple issues with 3
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2012-04-29 11:52:21 UTC (rev 157785)
+++ extra-x86_64/install	2012-04-29 11:52:40 UTC (rev 157786)
@@ -1,11 +0,0 @@
-post_install() {
-	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: scim/repos/extra-x86_64/install (from rev 157785, scim/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2012-04-29 11:52:40 UTC (rev 157786)
@@ -0,0 +1,13 @@
+post_install() {
+	[[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	[[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
+	true
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}



More information about the arch-commits mailing list