diff options
| author | sibelle <lesibel@free.fr> | 2010-02-24 23:49:07 +0100 |
|---|---|---|
| committer | sibelle <lesibel@free.fr> | 2010-02-24 23:49:07 +0100 |
| commit | 5e3245e46d998ecd5004d1358f449b5df5987987 (patch) | |
| tree | 257cc84982b7dd06abb5c03343855c2caea43529 /xfce | |
| parent | 1df3238f9210e8f4dbb4c670e3fbdba65ed92910 (diff) | |
| parent | e7ae426196644b630f21e88b36ea4ea931d113ae (diff) | |
| download | nutyx-pakxe-5e3245e46d998ecd5004d1358f449b5df5987987.tar.gz nutyx-pakxe-5e3245e46d998ecd5004d1358f449b5df5987987.tar.bz2 nutyx-pakxe-5e3245e46d998ecd5004d1358f449b5df5987987.tar.xz nutyx-pakxe-5e3245e46d998ecd5004d1358f449b5df5987987.zip | |
Merge remote branch 'nutyx-2009/master'
Diffstat (limited to 'xfce')
| -rw-r--r-- | xfce/xfce4-settings/.md5sum | 3 | ||||
| -rwxr-xr-x | xfce/xfce4-settings/Pkgfile | 11 | ||||
| -rw-r--r-- | xfce/xfce4-settings/xfce4-settings-4.6.1-libklavier-4.0.patch | 11 |
3 files changed, 5 insertions, 20 deletions
diff --git a/xfce/xfce4-settings/.md5sum b/xfce/xfce4-settings/.md5sum index 9d74c8bdf..59b34e41c 100644 --- a/xfce/xfce4-settings/.md5sum +++ b/xfce/xfce4-settings/.md5sum @@ -1,2 +1 @@ -0bd901a7146c951987a4ddddc4cf68cb xfce4-settings-4.6.1-libklavier-4.0.patch -dc1c8704471c5b0104fa10c30eb60cb6 xfce4-settings-4.6.1.tar.bz2 +04985407e8e5b916c44780314a177e96 xfce4-settings-4.6.4.tar.bz2 diff --git a/xfce/xfce4-settings/Pkgfile b/xfce/xfce4-settings/Pkgfile index ffb8f05f0..9cc1063ac 100755 --- a/xfce/xfce4-settings/Pkgfile +++ b/xfce/xfce4-settings/Pkgfile @@ -2,16 +2,14 @@ # URL: http://wiki.xfce.org/releng/4.6/general-info # Maintainer: NuTyX core team # Packager: fred.galusik at gmail dot com -# Depends on: dbus-glib, exo, libglade, libnotify, libxfce4util, libxfcegui4, xfconf +# Depends on: dbus-glib, exo, libglade, libnotify, libxfce4util, libxfcegui4, xfconf, libwnck name=xfce4-settings -version=4.6.1 -release=2 -source=(http://www.xfce.org/archive/xfce-$version/src/$name-$version.tar.bz2\ - xfce4-settings-4.6.1-libklavier-4.0.patch) +version=4.6.4 +release=1 +source=(http://archive.xfce.org/src/xfce/xfce4-settings/4.6/$name-$version.tar.bz2) build() { cd $name-$version - patch -Np1 -i ../xfce4-settings-4.6.1-libklavier-4.0.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ @@ -20,4 +18,3 @@ cd $name-$version make make DESTDIR=$PKG install } - diff --git a/xfce/xfce4-settings/xfce4-settings-4.6.1-libklavier-4.0.patch b/xfce/xfce4-settings/xfce4-settings-4.6.1-libklavier-4.0.patch deleted file mode 100644 index ff98b8d7d..000000000 --- a/xfce/xfce4-settings/xfce4-settings-4.6.1-libklavier-4.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c.orig 2009-10-20 07:01:05.000000000 +0000 -+++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-10-20 06:58:30.000000000 +0000 -@@ -378,7 +378,7 @@ - xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine); - - settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine); -- xkl_config_registry_load (settings->priv->xkl_registry); -+ xkl_config_registry_load (settings->priv->xkl_registry,FALSE); - - /* Tab */ - xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox"); |