Date: Friday, December 11, 2015 @ 04:54:21
Author: bisson
Revision: 255781
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
scim/repos/extra-i686/PKGBUILD
(from rev 255780, scim/trunk/PKGBUILD)
scim/repos/extra-i686/install
(from rev 255780, scim/trunk/install)
scim/repos/extra-i686/undefined-gdk_x11_drawable_get_xdisplay.patch
(from rev 255780, scim/trunk/undefined-gdk_x11_drawable_get_xdisplay.patch)
scim/repos/extra-x86_64/PKGBUILD
(from rev 255780, scim/trunk/PKGBUILD)
scim/repos/extra-x86_64/install
(from rev 255780, scim/trunk/install)
scim/repos/extra-x86_64/undefined-gdk_x11_drawable_get_xdisplay.patch
(from rev 255780, scim/trunk/undefined-gdk_x11_drawable_get_xdisplay.patch)
Deleted:
scim/repos/extra-i686/PKGBUILD
scim/repos/extra-i686/install
scim/repos/extra-x86_64/PKGBUILD
scim/repos/extra-x86_64/install
------------------------------------------------------------+
/PKGBUILD | 92 +++++++++++
/install | 26 +++
extra-i686/PKGBUILD | 39 ----
extra-i686/install | 13 -
extra-i686/undefined-gdk_x11_drawable_get_xdisplay.patch | 19 ++
extra-x86_64/PKGBUILD | 39 ----
extra-x86_64/install | 13 -
extra-x86_64/undefined-gdk_x11_drawable_get_xdisplay.patch | 19 ++
8 files changed, 156 insertions(+), 104 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-12-11 03:53:40 UTC (rev 255780)
+++ extra-i686/PKGBUILD 2015-12-11 03:54:21 UTC (rev 255781)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: damir <da...@archlinux.org>
-# Contributor: Gan Lu <rhythm....@gmail.com>
-
-pkgname=scim
-pkgver=1.4.15
-pkgrel=2
-pkgdesc='Input method user interface and development platform'
-url='http://sourceforge.net/projects/scim/'
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('libltdl' 'gtk2')
-optdepends=('qt4: qt4 immodule'
- 'gtk3: gtk3 immodule')
-makedepends=('intltool' 'qt4' 'gtk3' 'optipng')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
-sha1sums=('771d81b5c81164840f7d45c39165c2990cc809bd')
-
-backup=('etc/scim/config' 'etc/scim/global')
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- find -name '*.png' -exec optipng -quiet -force -fix {} +
- ./bootstrap
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --with-qt4-moc=/usr/bin/moc-qt4 \
- --with-gtk-version=2 # no gtk3 support in scim-anthy
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: scim/repos/extra-i686/PKGBUILD (from rev 255780, scim/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-12-11 03:54:21 UTC (rev 255781)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: damir <da...@archlinux.org>
+# Contributor: Gan Lu <rhythm....@gmail.com>
+
+pkgname=scim
+pkgver=1.4.15
+pkgrel=3
+pkgdesc='Input method user interface and development platform'
+url='http://sourceforge.net/projects/scim/'
+license=('LGPL')
+arch=('i686' 'x86_64')
+depends=('libltdl' 'gtk2')
+optdepends=('qt4: qt4 immodule'
+ 'gtk3: gtk3 immodule')
+makedepends=('intltool' 'qt4' 'gtk3' 'optipng')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";
+ 'undefined-gdk_x11_drawable_get_xdisplay.patch')
+sha1sums=('771d81b5c81164840f7d45c39165c2990cc809bd'
+ 'd6f9b832533eff199ee5cb5ae8f94f57f7677aac')
+
+backup=('etc/scim/config' 'etc/scim/global')
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../undefined-gdk_x11_drawable_get_xdisplay.patch
+ find -name '*.png' -exec optipng -quiet -force -fix {} +
+ ./bootstrap
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-qt4-moc=/usr/bin/moc-qt4 \
+ --with-gtk-version=2 # no gtk3 support in scim-anthy
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/install
===================================================================
--- extra-i686/install 2015-12-11 03:53:40 UTC (rev 255780)
+++ extra-i686/install 2015-12-11 03:54:21 UTC (rev 255781)
@@ -1,13 +0,0 @@
-post_install() {
- [[ -x usr/bin/gtk-query-immodules-2.0 ]] && gtk-query-immodules-2.0
--update-cache
- [[ -x usr/bin/gtk-query-immodules-3.0 ]] && gtk-query-immodules-3.0
--update-cache
- true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: scim/repos/extra-i686/install (from rev 255780, scim/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2015-12-11 03:54:21 UTC (rev 255781)
@@ -0,0 +1,13 @@
+post_install() {
+ [[ -x usr/bin/gtk-query-immodules-2.0 ]] && gtk-query-immodules-2.0
--update-cache
+ [[ -x usr/bin/gtk-query-immodules-3.0 ]] && gtk-query-immodules-3.0
--update-cache
+ true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: scim/repos/extra-i686/undefined-gdk_x11_drawable_get_xdisplay.patch
(from rev 255780, scim/trunk/undefined-gdk_x11_drawable_get_xdisplay.patch)
===================================================================
--- extra-i686/undefined-gdk_x11_drawable_get_xdisplay.patch
(rev 0)
+++ extra-i686/undefined-gdk_x11_drawable_get_xdisplay.patch 2015-12-11
03:54:21 UTC (rev 255781)
@@ -0,0 +1,19 @@
+commit 88fbabed7dc236642021f8263f1b25bf67c6806e
+Author: Tz-Huan Huang <tzh...@gmail.com>
+Date: Fri Oct 24 13:12:32 2014 +0800
+
+ Disable subdir-objects
+
+diff --git a/configure.ac b/configure.ac
+index 3d89eb1..f3901ba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,7 +78,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The
gettext domain])
+ ###########################################################
+
+ # Init automake stuff
+-AM_INIT_AUTOMAKE([subdir-objects])
++AM_INIT_AUTOMAKE([])
+ AM_CONFIG_HEADER([config.h])
+
+ # Init libtool
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-12-11 03:53:40 UTC (rev 255780)
+++ extra-x86_64/PKGBUILD 2015-12-11 03:54:21 UTC (rev 255781)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: damir <da...@archlinux.org>
-# Contributor: Gan Lu <rhythm....@gmail.com>
-
-pkgname=scim
-pkgver=1.4.15
-pkgrel=2
-pkgdesc='Input method user interface and development platform'
-url='http://sourceforge.net/projects/scim/'
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('libltdl' 'gtk2')
-optdepends=('qt4: qt4 immodule'
- 'gtk3: gtk3 immodule')
-makedepends=('intltool' 'qt4' 'gtk3' 'optipng')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
-sha1sums=('771d81b5c81164840f7d45c39165c2990cc809bd')
-
-backup=('etc/scim/config' 'etc/scim/global')
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- find -name '*.png' -exec optipng -quiet -force -fix {} +
- ./bootstrap
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --with-qt4-moc=/usr/bin/moc-qt4 \
- --with-gtk-version=2 # no gtk3 support in scim-anthy
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: scim/repos/extra-x86_64/PKGBUILD (from rev 255780, scim/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-12-11 03:54:21 UTC (rev 255781)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: damir <da...@archlinux.org>
+# Contributor: Gan Lu <rhythm....@gmail.com>
+
+pkgname=scim
+pkgver=1.4.15
+pkgrel=3
+pkgdesc='Input method user interface and development platform'
+url='http://sourceforge.net/projects/scim/'
+license=('LGPL')
+arch=('i686' 'x86_64')
+depends=('libltdl' 'gtk2')
+optdepends=('qt4: qt4 immodule'
+ 'gtk3: gtk3 immodule')
+makedepends=('intltool' 'qt4' 'gtk3' 'optipng')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";
+ 'undefined-gdk_x11_drawable_get_xdisplay.patch')
+sha1sums=('771d81b5c81164840f7d45c39165c2990cc809bd'
+ 'd6f9b832533eff199ee5cb5ae8f94f57f7677aac')
+
+backup=('etc/scim/config' 'etc/scim/global')
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../undefined-gdk_x11_drawable_get_xdisplay.patch
+ find -name '*.png' -exec optipng -quiet -force -fix {} +
+ ./bootstrap
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-qt4-moc=/usr/bin/moc-qt4 \
+ --with-gtk-version=2 # no gtk3 support in scim-anthy
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install 2015-12-11 03:53:40 UTC (rev 255780)
+++ extra-x86_64/install 2015-12-11 03:54:21 UTC (rev 255781)
@@ -1,13 +0,0 @@
-post_install() {
- [[ -x usr/bin/gtk-query-immodules-2.0 ]] && gtk-query-immodules-2.0
--update-cache
- [[ -x usr/bin/gtk-query-immodules-3.0 ]] && gtk-query-immodules-3.0
--update-cache
- true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: scim/repos/extra-x86_64/install (from rev 255780, scim/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2015-12-11 03:54:21 UTC (rev 255781)
@@ -0,0 +1,13 @@
+post_install() {
+ [[ -x usr/bin/gtk-query-immodules-2.0 ]] && gtk-query-immodules-2.0
--update-cache
+ [[ -x usr/bin/gtk-query-immodules-3.0 ]] && gtk-query-immodules-3.0
--update-cache
+ true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: scim/repos/extra-x86_64/undefined-gdk_x11_drawable_get_xdisplay.patch
(from rev 255780, scim/trunk/undefined-gdk_x11_drawable_get_xdisplay.patch)
===================================================================
--- extra-x86_64/undefined-gdk_x11_drawable_get_xdisplay.patch
(rev 0)
+++ extra-x86_64/undefined-gdk_x11_drawable_get_xdisplay.patch 2015-12-11
03:54:21 UTC (rev 255781)
@@ -0,0 +1,19 @@
+commit 88fbabed7dc236642021f8263f1b25bf67c6806e
+Author: Tz-Huan Huang <tzh...@gmail.com>
+Date: Fri Oct 24 13:12:32 2014 +0800
+
+ Disable subdir-objects
+
+diff --git a/configure.ac b/configure.ac
+index 3d89eb1..f3901ba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,7 +78,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The
gettext domain])
+ ###########################################################
+
+ # Init automake stuff
+-AM_INIT_AUTOMAKE([subdir-objects])
++AM_INIT_AUTOMAKE([])
+ AM_CONFIG_HEADER([config.h])
+
+ # Init libtool
