diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-02-04 21:10:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-02-04 21:10:47 +0000 |
| commit | 1fec57015133da0d7a0c68445b69036d50578b70 (patch) | |
| tree | ae20b839d1def6a2c36f3f77e3987a384f06ded0 /main/xfce4-settings | |
| parent | b1261f774a9243737947789aaccfdb1932e9bb57 (diff) | |
| download | aports-1fec57015133da0d7a0c68445b69036d50578b70.tar.bz2 aports-1fec57015133da0d7a0c68445b69036d50578b70.tar.xz | |
main/xfce4-settings: fix gtk3 theme detection
Diffstat (limited to 'main/xfce4-settings')
| -rw-r--r-- | main/xfce4-settings/APKBUILD | 6 | ||||
| -rw-r--r-- | main/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch | 22 | ||||
| -rw-r--r-- | main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch | 27 |
3 files changed, 26 insertions, 29 deletions
diff --git a/main/xfce4-settings/APKBUILD b/main/xfce4-settings/APKBUILD index 0502ab3c8d..1764d54b27 100644 --- a/main/xfce4-settings/APKBUILD +++ b/main/xfce4-settings/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-settings pkgver=4.10.0 -pkgrel=0 +pkgrel=1 pkgdesc="Settings manager for xfce" url="http://www.xfce.org/" arch="all" @@ -11,6 +11,7 @@ subpackages="$pkgname-lang" makedepends="libxfce4ui-dev exo-dev libxi-dev libxrandr-dev libxklavier-dev libnotify-dev libxcursor-dev garcon-dev" source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -45,4 +46,5 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="cc4dd9179ead9046c056431f01a12000 xfce4-settings-4.10.0.tar.bz2" +md5sums="cc4dd9179ead9046c056431f01a12000 xfce4-settings-4.10.0.tar.bz2 +c9af179917919c7387ccab425610658f xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch" diff --git a/main/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch b/main/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch new file mode 100644 index 0000000000..ebd270bd91 --- /dev/null +++ b/main/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch @@ -0,0 +1,22 @@ +From 8032dd77047329a93edd4c4a8b686ffc36d2f7a7 Mon Sep 17 00:00:00 2001 +From: Lionel Le Folgoc <lionel@lefolgoc.net> +Date: Sun, 09 Sep 2012 09:41:18 +0000 +Subject: Appearance: Fix gtk3 theme detection in install script (bug #9272). + +(cherry picked from commit e3c6db6f57e72cdbdf0e293bba7d6ca650d7521b) +--- +diff --git a/dialogs/appearance-settings/appearance-install-theme b/dialogs/appearance-settings/appearance-install-theme +index 13f61ae..6dc1e17 100755 +--- a/dialogs/appearance-settings/appearance-install-theme ++++ b/dialogs/appearance-settings/appearance-install-theme +@@ -140,7 +140,7 @@ if test "$retval" -eq 0; then + detectthemes "gtk-2.0/gtkrc" + + # install gtk-3.0 themes +- detectthemes "gtk-3.0/gtkrc" ++ detectthemes "gtk-3.0/gtk.css" + + # install xfwm4 themes + detectthemes "xfwm4/themerc" +-- +cgit v0.9.0.3 diff --git a/main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch b/main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch deleted file mode 100644 index 142932c894..0000000000 --- a/main/xfce4-settings/xfce4-settings-4.7.1-libxklavier.patch +++ /dev/null @@ -1,27 +0,0 @@ -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)); |