diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
commit | d59c722c306fa39fcecf011b411b77faffca5cbd (patch) | |
tree | d6a3582523245b624d1a905d4b46d8344429e617 /extra/xfce4-settings | |
parent | 939541abc901bd03328b55aaed0fb1862f803c05 (diff) | |
parent | 5894dd675f4bd3ba296d262fae99b3b87a0f87fd (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gri/PKGBUILD
community/multiget/PKGBUILD
core/bash/PKGBUILD
core/grep/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/vlc/PKGBUILD
extra/xfce4-screenshooter/PKGBUILD
extra/xfce4-settings/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/dib0700-fix.patch
libre/linux-libre/i915-fix-ghost-tv-output.patch
libre/linux-libre/i915-fix-incorrect-error-message.patch
libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch
libre/linux-libre/linux-libre.install
libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch
Diffstat (limited to 'extra/xfce4-settings')
-rw-r--r-- | extra/xfce4-settings/PKGBUILD | 55 | ||||
-rw-r--r-- | extra/xfce4-settings/xfce4-settings-4.6.0.patch | 2 |
2 files changed, 30 insertions, 27 deletions
diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD index bcbb88d46..4e0ac21a4 100644 --- a/extra/xfce4-settings/PKGBUILD +++ b/extra/xfce4-settings/PKGBUILD @@ -1,46 +1,49 @@ -# $Id: PKGBUILD 138683 2011-09-27 15:54:14Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 143211 2011-11-23 12:04: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.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="Settings manager for xfce" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') -depends=('exo>=0.6.0' 'libxfce4ui' 'libnotify>=0.7.1' 'libxklavier' 'tango-icon-theme' 'gnome-icon-theme' 'gtk-engines' 'gtk-xfce-engine') +depends=('exo' 'libxfce4ui' 'libnotify' 'libxklavier' 'gnome-icon-theme' + 'gtk-engines' 'gtk-xfce-engine') makedepends=('intltool') optdepends=('libcanberra: for sound control') source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 - xfce4-settings-4.6.0.patch) -md5sums=('4669298cc8a4abf0e5a410016b575030' - '3046732e5d73c9939e7674602eadb1e2') -sha1sums=('98431633ba3ec2a4a10182bc7266904d9256949b' - '18f5eaf1fd86b957bae2e41fbdd83edef5437b3c') + xfce4-settings-4.6.0.patch) +sha256sums=('d878cc474e1e677e9607279b9a1007cb90ed35ff078de180259a8b2b8d06bc2e' + 'c91d246cc678014a7fa8af37f2a24640bcc8823e41e064361130da7ae3809ed5') build() { - cd ${srcdir}/${pkgname}-${pkgver} - # enable Tango icon theme, clearlooks theme and font hinting by default(taken from Fedora) - patch -Np1 -i ${srcdir}/xfce4-settings-4.6.0.patch || return 1 - + cd "$srcdir/$pkgname-$pkgver" + + # enable gnome icon theme, clearlooks theme and font hinting by default + # (taken from Fedora) + patch -Np1 -i "$srcdir/xfce4-settings-4.6.0.patch" + ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-xrandr \ - --enable-xcursor \ - --enable-libnotify \ - --enable-libxklavier \ - --enable-pluggable-dialogs \ - --enable-sound-settings \ - --disable-debug + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --enable-xrandr \ + --enable-xcursor \ + --enable-libnotify \ + --enable-libxklavier \ + --enable-pluggable-dialogs \ + --enable-sound-settings \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-settings/xfce4-settings-4.6.0.patch b/extra/xfce4-settings/xfce4-settings-4.6.0.patch index 08cd80421..559e2f9e5 100644 --- a/extra/xfce4-settings/xfce4-settings-4.6.0.patch +++ b/extra/xfce4-settings/xfce4-settings-4.6.0.patch @@ -8,7 +8,7 @@ diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.6 - <property name="ThemeName" type="string" value="Xfce"/> - <property name="IconThemeName" type="string" value="Rodent"/> + <property name="ThemeName" type="string" value="Clearlooks"/> -+ <property name="IconThemeName" type="string" value="Tango"/> ++ <property name="IconThemeName" type="string" value="gnome"/> </property> <property name="Xft" type="empty"> <property name="DPI" type="int" value="-1"/> |