[arch-commits] Commit in nemo/trunk (PKGBUILD)

[Balló György]

    Date: Friday, September 27, 2013 @ 19:10:16
  Author: bgyorgy
Revision: 97696

upgpkg: nemo 1.8.5-2

Rebuild for gnome-desktop 3.10

Modified:
  nemo/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-27 16:20:36 UTC (rev 97695)
+++ PKGBUILD	2013-09-27 17:10:16 UTC (rev 97696)
@@ -4,7 +4,7 @@
 
 pkgname=nemo
 pkgver=1.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/nemo"
@@ -22,7 +22,7 @@
             '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626'
             '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5')
 
-build() {
+prepare() {
   cd linuxmint-nemo-*
 
   # Python2 fix
@@ -34,6 +34,16 @@
   # https://github.com/linuxmint/nemo/pull/263
   patch -Np1 -i ../remove-desktop-background.patch
 
+  # Fix build
+  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
+
+  # Rename 'Files' app name to avoid having the same as nautilus
+  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
+}
+
+build() {
+  cd linuxmint-nemo-*
+
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/nemo \
@@ -49,9 +59,6 @@
 
   make DESTDIR="$pkgdir/" install
 
-  # Rename 'Files' app name to avoid having the same as nautilus
-  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' "$pkgdir/usr/share/applications/nemo.desktop"
-
   # Autostart only in Cinnamon to avoid conflict with GNOME Classic session
   cp "$pkgdir/etc/xdg/autostart/nemo-autostart.desktop" \
     "$pkgdir/etc/xdg/autostart/nemo-autostart2d.desktop"