diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-04 18:05:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-04 18:05:18 +0200 |
| commit | 28755f91b7986fbd36ec21705a5f941479b6d8f4 (patch) | |
| tree | 760750f64418a6907afcccd916de4a769ed2bc3f /extra/xfce4-settings | |
| parent | 7298ba8d13324c20278060c1ff5f63467cef9684 (diff) | |
| parent | 0a24fb835cac4007388213ad0afb15257b035b14 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lazarus/PKGBUILD
extra/msmtp/PKGBUILD
multilib/jack2-multilib/PKGBUILD
testing/glib2/PKGBUILD
testing/lvm2/PKGBUILD
testing/mdadm/PKGBUILD
testing/mdadm/mdadm
testing/mdadm/mdadm_hook
testing/mdadm/mdadm_udev_install
testing/systemd/PKGBUILD
testing/systemd/systemd.install
Diffstat (limited to 'extra/xfce4-settings')
| -rw-r--r-- | extra/xfce4-settings/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD index f239c0ca1..2009f3d83 100644 --- a/extra/xfce4-settings/PKGBUILD +++ b/extra/xfce4-settings/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 157887 2012-04-30 04:21:22Z foutrelis $ +# $Id: PKGBUILD 158103 2012-05-02 23:12:45Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=xfce4-settings pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Settings manager for xfce" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" license=('GPL2') groups=('xfce4') depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier' - 'gnome-icon-theme' 'gtk-engines' 'gtk2-xfce-engine') + 'gnome-icon-theme' 'gtk-engines') makedepends=('intltool') optdepends=('libcanberra: for sound control') source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 xfce4-settings-xml-4.10.0.patch) sha256sums=('0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e' - '544d4409bac1cba1c0897317838cf2e24345f6ed4e3bf497a89b38d2643925c1') + '78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196aaaa') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,7 +27,8 @@ build() { # (taken from Fedora) patch -Np1 -i "$srcdir/xfce4-settings-xml-4.10.0.patch" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-static \ diff --git a/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch b/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch index cb3a4a0d3..c8b6204fc 100644 --- a/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch +++ b/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch @@ -7,8 +7,8 @@ diff -Nur xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.9 <property name="Net" type="empty"> - <property name="ThemeName" type="empty"/> - <property name="IconThemeName" type="empty"/> -+ <property name="ThemeName" type="Clearlooks"/> -+ <property name="IconThemeName" type="gnome"/> ++ <property name="ThemeName" type="string" value="Clearlooks"/> ++ <property name="IconThemeName" type="string" value="gnome"/> <property name="DoubleClickTime" type="int" value="250"/> <property name="DoubleClickDistance" type="int" value="5"/> <property name="DndDragThreshold" type="int" value="8"/> |