diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-04-04 10:47:42 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-04-04 10:47:42 +0000 |
| commit | b9458750cc49aec6e5c6b53630ed15d307ec8f76 (patch) | |
| tree | 984361718307a8b045eb75661fda6637a03c8bd4 /main/xfce4-settings | |
| parent | e95180ba46174d61b8a5c96417b4418c7986ac30 (diff) | |
| download | aports-b9458750cc49aec6e5c6b53630ed15d307ec8f76.tar.bz2 aports-b9458750cc49aec6e5c6b53630ed15d307ec8f76.tar.xz | |
main/xfce4-setting: rebuild against libxklavier-5
Diffstat (limited to 'main/xfce4-settings')
| -rw-r--r-- | main/xfce4-settings/APKBUILD | 33 | ||||
| -rw-r--r-- | main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch | 27 |
2 files changed, 53 insertions, 7 deletions
diff --git a/main/xfce4-settings/APKBUILD b/main/xfce4-settings/APKBUILD index 2d048cface..ffc6ec035a 100644 --- a/main/xfce4-settings/APKBUILD +++ b/main/xfce4-settings/APKBUILD @@ -1,21 +1,39 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-settings pkgver=4.6.4 -pkgrel=0 +pkgrel=1 pkgdesc="Settings manager for xfce" url="http://www.xfce.org/" license="GPL-2" depends= makedepends="exo-dev libnotify-dev libxfcegui4-dev libxklavier-dev libwnck-dev libglade-dev pkgconfig intltool gettext-dev libiconv-dev expat-dev - libxi-dev libsm-dev e2fsprogs-dev libxkbfile-dev libxrandr-dev" -source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" + libxi-dev libsm-dev e2fsprogs-dev libxkbfile-dev libxrandr-dev + autoconf automake libtool" +source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + xfce4-settings-4.7.1-libxklavier.patch + " -build() { - cd "$srcdir"/$pkgname-$pkgver +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + for i in "$srcdir"/*.patch; do + [ -f "$i" ] || continue + msg "Applying ${i##*/}" + patch -p1 -i "$i" || return 1 + done + + # use tango as default icon set sed -i -e 's/Rodent/Tango/g' xfsettingsd/xsettings.xml \ - dialogs/appearance-settings/main.c + dialogs/appearance-settings/main.c || return 1 + msg "Regenerating configure script" + autoheader && autoconf || return 1 +} + +build() { + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -31,4 +49,5 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="04985407e8e5b916c44780314a177e96 xfce4-settings-4.6.4.tar.bz2" +md5sums="04985407e8e5b916c44780314a177e96 xfce4-settings-4.6.4.tar.bz2 +9a03696ed6200801d296c8adf6816a06 xfce4-settings-4.7.1-libxklavier.patch" diff --git a/main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch b/main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch new file mode 100644 index 0000000000..142932c894 --- /dev/null +++ b/main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch @@ -0,0 +1,27 @@ +diff -ur xfce4-settings-4.7.1.orig/configure.ac xfce4-settings-4.7.1/configure.ac +--- xfce4-settings-4.7.1.orig/configure.ac 2010-01-23 13:48:05.000000000 +0200 ++++ xfce4-settings-4.7.1/configure.ac 2010-02-15 14:20:55.000000000 +0200 +@@ -142,6 +142,8 @@ + [libxklavier], [Keyboard layout selection]) + XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0], + [libxklavier], [Keyboard layout selection]) ++XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0], ++ [libxklavier], [Keyboard layout selection]) + + dnl ************************************ + dnl *** Xsettings daemon is optional *** +diff -ur xfce4-settings-4.7.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.7.1/dialogs/keyboard-settings/xfce-keyboard-settings.c +--- xfce4-settings-4.7.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c 2010-01-23 13:48:05.000000000 +0200 ++++ xfce4-settings-4.7.1/dialogs/keyboard-settings/xfce-keyboard-settings.c 2010-02-15 14:23:24.000000000 +0200 +@@ -395,7 +395,11 @@ + + #ifdef HAVE_LIBXKLAVIER + /* Stop xklavier engine */ ++#ifdef HAVE_LIBXKLAVIER5 ++ xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE); ++#else + xkl_engine_stop_listen (settings->priv->xkl_engine); ++#endif /* HAVE_LIBXKLAVIER5 */ + #endif /* HAVE_LIBXKLAVIER */ + + g_object_unref (G_OBJECT (settings->priv->provider)); |