diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-02 18:00:18 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-02 18:02:35 +0100 |
| commit | bae1d2619114abb36d636273329ed6d3ae157055 (patch) | |
| tree | 9a9c785204458547c0fc6b6b10357abd379a0fdd /extra/gcin | |
| parent | f3a6a3f3b315c15fe04bb44a40020c3842c8ef21 (diff) | |
| parent | 98aa0004e23472ee63753fded33cd55d8b942f36 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/canorus/PKGBUILD
community/celt-0.7/PKGBUILD
community/djview4/PKGBUILD
community/erlang-sdl/PKGBUILD
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/glitz/PKGBUILD
community/gmerlin/PKGBUILD
community/gmic/PKGBUILD
community/goldendict/PKGBUILD
community/google-gadgets/PKGBUILD
community/highlight/PKGBUILD
community/jack2/PKGBUILD
community/kvirc/PKGBUILD
community/launchy/PKGBUILD
community/mplayer2/PKGBUILD
community/mumble/PKGBUILD
community/mupdf/PKGBUILD
community/projectm/PKGBUILD
community/psimedia/PKGBUILD
community/pyqt3/PKGBUILD
community/qps/PKGBUILD
community/qstardict/PKGBUILD
community/qsynergy/PKGBUILD
community/synergy/PKGBUILD
community/units/PKGBUILD
community/yagf/PKGBUILD
extra/automoc4/PKGBUILD
extra/avahi/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cagibi/PKGBUILD
extra/cairo/PKGBUILD
extra/calligra/PKGBUILD
extra/cmake/PKGBUILD
extra/dssi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/glu/PKGBUILD
extra/graphviz/PKGBUILD
extra/hylafax/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libbluedevil/PKGBUILD
extra/liblastfm/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpng/PKGBUILD
extra/libqzeitgeist/PKGBUILD
extra/libx11/PKGBUILD
extra/mesa/PKGBUILD
extra/mpg123/PKGBUILD
extra/mtr/PKGBUILD
extra/mysql/PKGBUILD
extra/netpbm/PKGBUILD
extra/nspr/PKGBUILD
extra/polkit-qt/PKGBUILD
extra/poppler/PKGBUILD
extra/prison/PKGBUILD
extra/pyqt/PKGBUILD
extra/qimageblitz/PKGBUILD
extra/qscintilla/PKGBUILD
extra/qsynth/PKGBUILD
extra/qt-assistant-compat/PKGBUILD
extra/qt-gstreamer/PKGBUILD
extra/qt/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/qwt/PKGBUILD
extra/samba/PKGBUILD
extra/sane/PKGBUILD
extra/smplayer/PKGBUILD
extra/soprano/PKGBUILD
extra/texmacs/PKGBUILD
extra/tomcat-native/PKGBUILD
extra/transmission/PKGBUILD
extra/wpa_supplicant_gui/PKGBUILD
libre/lame-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
Diffstat (limited to 'extra/gcin')
| -rw-r--r-- | extra/gcin/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/gcin/qt4.patch | 10 |
2 files changed, 5 insertions, 15 deletions
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 698104c87..1bf0cec55 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 178091 2013-02-16 00:28:11Z bisson $ +# $Id: PKGBUILD 178956 2013-03-01 10:20:17Z andrea $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' license=('LGPL') arch=('i686' 'x86_64' 'mips64el') depends=('gtk2' 'libxtst') -makedepends=('qt' 'gtk3' 'anthy' 'libchewing') -optdepends=('qt: support for qt4 input method' +makedepends=('qt4' 'gtk3' 'anthy' 'libchewing') +optdepends=('qt4: support for qt4 input method' 'gtk3: support for gtk3 input method' 'anthy: support for anthy input method' 'libchewing: support for chewing input method') @@ -24,7 +24,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/QT=qt4/QT=qt/' -i qt4-im/Makefile + source /etc/profile.d/qt4.sh sed 's/lib64/lib/g' -i configure sed '/include suffixes-rule/a \ CFLAGS+='"${CFLAGS}"' \ diff --git a/extra/gcin/qt4.patch b/extra/gcin/qt4.patch deleted file mode 100644 index 0f3e7876f..000000000 --- a/extra/gcin/qt4.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -Naur old/qt4-im/Makefile new/qt4-im/Makefile ---- old/qt4-im/Makefile 2011-12-19 14:52:46.000000000 +1100 -+++ new/qt4-im/Makefile 2012-03-05 09:22:46.732614803 +1100 -@@ -1,5 +1,5 @@ - include ../config.mak --QT=qt4 -+QT=qt - QTIM=$(QT)/plugins/inputmethods - IMMODULES=$(libdir)/$(QTIM) - |