[arch-commits] Commit in nautilus/trunk (PKGBUILD translation-de.patch)

[Jan de Groot]

    Date: Monday, June 13, 2016 @ 15:18:36
  Author: jgc
Revision: 269443

upgpkg: nautilus 3.20.1+gf84d431-1

Update to git snapshot. Use make install/uninstall targets to split libnautilus-extension

Modified:
  nautilus/trunk/PKGBUILD
Deleted:
  nautilus/trunk/translation-de.patch

----------------------+
 PKGBUILD             |   33 ++++++++++++++-------------------
 translation-de.patch |   11 -----------
 2 files changed, 14 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-13 12:44:43 UTC (rev 269442)
+++ PKGBUILD	2016-06-13 13:18:36 UTC (rev 269443)
@@ -3,7 +3,7 @@
 
 pkgbase=nautilus
 pkgname=(nautilus libnautilus-extension)
-pkgver=3.20.1
+pkgver=3.20.1+gf84d431
 pkgrel=1
 pkgdesc="GNOME file manager"
 arch=(i686 x86_64)
@@ -10,27 +10,25 @@
 license=(GPL)
 depends=(libexif gnome-desktop exempi gvfs desktop-file-utils dconf 
          libtracker-sparql nautilus-sendto)
-makedepends=(intltool gobject-introspection python packagekit python2)
+makedepends=(intltool gobject-introspection python packagekit python2 gnome-common git gtk-doc)
 url="http://www.gnome.org"
 options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz
-        translation-de.patch)
-sha256sums=('f2a907b994026412a7ed7c8145d4ab4f886ac87e780353b967473305a35e81e8'
-            '564799623f8910208cef1e0ed583cfd049e98f9c71e15c56924f6c8452ab192b')
+source=('git://git.gnome.org/nautilus#commit=f84d4319dcd5fcfa460a37dfdb78c93d188e2703')
+sha256sums=('SKIP')
 
 prepare() {
-  cd $pkgname-$pkgver
-  patch -Np0 -i ../translation-de.patch
+  cd $pkgbase
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/nautilus \
       --disable-update-mimedb \
       --disable-schemas-compile \
-      --disable-selinux
+      --disable-selinux --enable-gtk-doc
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
@@ -39,16 +37,11 @@
   depends+=(libnautilus-extension)
   groups=(gnome)
 
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C libnautilus-extension uninstall
+  make DESTDIR="$pkgdir" -C docs/reference/libnautilus-extension uninstall
 
-### Split libnautilus-extension
-  cd ..
-  mkdir -p n-e/usr/{lib,share}
-  mv "$pkgdir"/usr/include n-e/usr
-  mv "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} n-e/usr/lib
-  mv "$pkgdir"/usr/lib/libnautilus-extension.so* n-e/usr/lib
-  mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} n-e/usr/share
 }
 
 package_libnautilus-extension() {
@@ -55,5 +48,7 @@
   pkgdesc="Library for extending the $pkgdesc"
   depends=(gtk3)
 
-  mv n-e/* "$pkgdir"
+  cd $pkgbase
+  make DESTDIR="$pkgdir" -C libnautilus-extension install
+  make DESTDIR="$pkgdir" -C docs/reference/libnautilus-extension install
 }

Deleted: translation-de.patch
===================================================================
--- translation-de.patch	2016-06-13 12:44:43 UTC (rev 269442)
+++ translation-de.patch	2016-06-13 13:18:36 UTC (rev 269443)
@@ -1,11 +0,0 @@
---- po/de.po.orig	2016-04-28 01:53:12.598068329 +0200
-+++ po/de.po	2016-04-28 01:55:06.128650077 +0200
-@@ -647,7 +647,7 @@
- #: ../data/org.gnome.nautilus.gschema.xml.h:78
- msgctxt "home-icon-name"
- msgid "'Home'"
--msgstr "Persönlicher Ordner"
-+msgstr "'Persönlicher Ordner'"
- 
- #: ../data/org.gnome.nautilus.gschema.xml.h:79
- msgid "Desktop home icon name"