summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-12-23 13:38:54 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-12-23 13:38:54 +0900
commit3082bbc3ce8b5fefcc2a460b4d8ad43f8170fe78 (patch)
treee2f689023ab09e6d183cc898cff635b9789f21d8
parenta30d82c8f9e36526fb814b171374cb6a559759e6 (diff)
pkgbuild - enable scim by default for input methods and sdl is pointless
-rw-r--r--pkgbuild/PKGBUILD7
-rwxr-xr-xsrc/scripts/eina/eina-bench-cmp2
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD
index 4da6503c89..cb8fdd6713 100644
--- a/pkgbuild/PKGBUILD
+++ b/pkgbuild/PKGBUILD
@@ -1,7 +1,7 @@
1# Maintainer: Enlightenment Developers <enlightenment-devel@enlightenment.org> 1# Maintainer: Enlightenment Developers <enlightenment-devel@enlightenment.org>
2pkgname=('efl-git' 'efl_doc-git') 2pkgname=('efl-git' 'efl_doc-git')
3_pkgname=${pkgname%-*} 3_pkgname=${pkgname%-*}
4pkgver=1.8.99.24004.0b86e51 4pkgver=1.8.99.24060.a30d82c
5pkgrel=1 5pkgrel=1
6pkgdesc="Enlightenment Foundation Libraries - GIT development snapshot (Ecore, Eldbus, Edje, Eet, Eeze, Efreet, Eina, Eio, Embryo, Emotion, Eo, Ephysics, Ethumb, & Evas)" 6pkgdesc="Enlightenment Foundation Libraries - GIT development snapshot (Ecore, Eldbus, Edje, Eet, Eeze, Efreet, Eina, Eio, Embryo, Emotion, Eo, Ephysics, Ethumb, & Evas)"
7arch=('i686' 'x86_64' 'arm') 7arch=('i686' 'x86_64' 'arm')
@@ -17,7 +17,7 @@ depends=('bullet' 'libpng' 'libjpeg-turbo'
17 'libxdamage' 'libxdmcp' 'libxext' 'libxfixes' 'libxinerama' 17 'libxdamage' 'libxdmcp' 'libxext' 'libxfixes' 'libxinerama'
18 'libxi' 'libxrandr' 'libxrender' 'libxss' 'libxtst' 18 'libxi' 'libxrandr' 'libxrender' 'libxss' 'libxtst'
19 'libxcursor' 'libxp' 'libgl' 'giflib' 'libwebp' 'harfbuzz' 19 'libxcursor' 'libxp' 'libgl' 'giflib' 'libwebp' 'harfbuzz'
20 'wayland' 'sdl' 'avahi') 20 'wayland' 'avahi' 'scim')
21[[ ! $(pacman -T "openjpeg") ]] && depends+=('openjpeg') #jpeg2k loader is autodetected at build time 21[[ ! $(pacman -T "openjpeg") ]] && depends+=('openjpeg') #jpeg2k loader is autodetected at build time
22makedepends=('git') 22makedepends=('git')
23provides=("ecore=$pkgver" "eldbus=$pkgver" "edje=$pkgver" 23provides=("ecore=$pkgver" "eldbus=$pkgver" "edje=$pkgver"
@@ -51,7 +51,8 @@ build() {
51 --disable-static --disable-tslib --enable-fb \ 51 --disable-static --disable-tslib --enable-fb \
52 --enable-xinput22 --enable-multisense --enable-systemd \ 52 --enable-xinput22 --enable-multisense --enable-systemd \
53 --enable-image-loader-webp --enable-harfbuzz \ 53 --enable-image-loader-webp --enable-harfbuzz \
54 --enable-wayland --enable-drm --enable-sdl 54 --enable-wayland --enable-drm \
55 --enable-scim
55 make 56 make
56 make -j1 doc 57 make -j1 doc
57} 58}
diff --git a/src/scripts/eina/eina-bench-cmp b/src/scripts/eina/eina-bench-cmp
index 6ff2b508ac..63926c27ae 100755
--- a/src/scripts/eina/eina-bench-cmp
+++ b/src/scripts/eina/eina-bench-cmp
@@ -1,4 +1,4 @@
1#!/usr/bin/env python 1#!/usr/bin/env python2
2 2
3import sys 3import sys
4import os 4import os