diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-07 17:31:10 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-07 17:31:10 +0100 |
| commit | 0e48701e4ef754a7d5aab1e8fa1ef6ba8ff3c441 (patch) | |
| tree | a01dc4371165970aa77e40aaaf74ba1eae8daf47 /community/nemo/PKGBUILD | |
| parent | 1ac5165814a8df7108dae57ebb527efd21873461 (diff) | |
| parent | d8d675cb1e75787b0db061756e4cbebe3c5a03fa (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/busybox/PKGBUILD
community/glpng/PKGBUILD
community/hercules/PKGBUILD
community/libnetfilter_acct/PKGBUILD
community/libvirt/PKGBUILD
extra/crypto++/PKGBUILD
extra/hexedit/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/ntfs-3g_ntfsprogs/PKGBUILD
extra/opencv/PKGBUILD
extra/qemu-kvm/PKGBUILD
extra/xf86-input-wacom/PKGBUILD
extra/xfce4-eyes-plugin/PKGBUILD
extra/xfdesktop/PKGBUILD
Diffstat (limited to 'community/nemo/PKGBUILD')
| -rw-r--r-- | community/nemo/PKGBUILD | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index b89dda95c..01df50a53 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84548 2013-02-19 20:34:47Z faidoc $ +# $Id: PKGBUILD 85617 2013-03-04 04:34:16Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Ner0 pkgname=nemo pkgver=1.7.1 -pkgrel=1 -pkgdesc="Cinnamon file manager (Nautilus fork), stable version" +pkgrel=2 +pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" license=('GPL') @@ -19,18 +19,17 @@ conflicts=('nemo-fm') options=('!emptydirs' '!libtool') install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" - "gnome-autogen.sh") + "gnome-autogen.sh" + "use-terminal-config.patch") md5sums=('b348b6e340e055bef3163555b99621bb' - 'a925691c9b57a6a884dcf07da057fd1f') + 'a925691c9b57a6a884dcf07da057fd1f' + '6cca080cc8fe3df7e725c0f8cd5fa485') build() { cd linuxmint-nemo-* - # Get default terminal value - _terminal=$(gsettings get org.gnome.desktop.default-applications.terminal exec | tr -d "'") - - # Set "Open in Terminal" to default terminal (Arch doesn't use x-terminal-emulator) - sed -i "s/x-terminal-emulator/$_terminal/" src/nemo-view.c + # Read the default terminal app from GSettings + patch -Np1 -i ../use-terminal-config.patch cp ${srcdir}/gnome-autogen.sh . sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am @@ -40,7 +39,6 @@ build() { ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/nemo \ - --disable-nst-extension \ --disable-update-mimedb \ --disable-packagekit \ --disable-gtk-doc-html \ |