[arch-commits] Commit in nautilus-python/repos/community-x86_64 (3 files)

[Balló György]

    Date: Thursday, January 11, 2018 @ 11:22:57
  Author: bgyorgy
Revision: 281317

archrelease: copy trunk to community-x86_64

Added:
  nautilus-python/repos/community-x86_64/0001-Fix-string-comparison.patch
    (from rev 281316, nautilus-python/trunk/0001-Fix-string-comparison.patch)
  nautilus-python/repos/community-x86_64/PKGBUILD
    (from rev 281316, nautilus-python/trunk/PKGBUILD)
Deleted:
  nautilus-python/repos/community-x86_64/PKGBUILD

----------------------------------+
 0001-Fix-string-comparison.patch |   25 +++++++
 PKGBUILD                         |  117 +++++++++++++++++++------------------
 2 files changed, 86 insertions(+), 56 deletions(-)

Copied: nautilus-python/repos/community-x86_64/0001-Fix-string-comparison.patch (from rev 281316, nautilus-python/trunk/0001-Fix-string-comparison.patch)
===================================================================
--- 0001-Fix-string-comparison.patch	                        (rev 0)
+++ 0001-Fix-string-comparison.patch	2018-01-11 11:22:57 UTC (rev 281317)
@@ -0,0 +1,25 @@
+From c6781c4eae7f820c1d832177539bc90e1ec4e3e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Thu, 11 Jan 2018 11:12:22 +0100
+Subject: [PATCH] Fix string comparison
+
+---
+ src/nautilus-python.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nautilus-python.c b/src/nautilus-python.c
+index 694d555..bbffb97 100644
+--- a/src/nautilus-python.c
++++ b/src/nautilus-python.c
+@@ -248,7 +248,7 @@ nautilus_python_check_all_directories(GTypeModule *module) {
+     while (*temp != NULL) {
+         gchar *dir = g_build_filename(*temp,
+             "nautilus-python", "extensions", NULL);
+-        if (dir != prefix_extension_dir) {
++        if (g_strcmp0 (dir, prefix_extension_dir) != 0) {
+             dirs = g_list_append(dirs, dir);
+         }
+ 
+-- 
+2.15.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-11 11:22:51 UTC (rev 281316)
+++ PKGBUILD	2018-01-11 11:22:57 UTC (rev 281317)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Giorgio Gilestro <giorgio at gilest.ro>
-
-pkgbase=nautilus-python
-pkgname=('python-nautilus' 'python2-nautilus')
-pkgver=1.2.1
-pkgrel=2
-pkgdesc="Python bindings for the Nautilus Extension API"
-arch=('x86_64')
-url="https://wiki.gnome.org/Projects/NautilusPython"
-license=('GPL')
-depends=('nautilus' 'python-gobject' 'python2-gobject')
-makedepends=('gtk-doc')
-source=(https://download.gnome.org/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('36f98a8cc191b4ffcbcd7835eb80f99f39095b221c0ab65b4c84a859f9a9b10f')
-
-prepare() {
-  cd $pkgbase-$pkgver
-  autoreconf -fi
-}
-
-build() {
-  # Python 3 version
-  [ -d gtk3 ] || cp -r $pkgbase-$pkgver python3
-  cd python3
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-gtk-doc \
-              PYTHON=python3
-  make
-
-  cd "$srcdir"
-  # Python 2 version
-  [ -d gtk2 ] || cp -r $pkgbase-$pkgver python2
-  cd python2
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-gtk-doc \
-              PYTHON=python2
-  make
-}
-
-package_python-nautilus() {
-  pkgdesc="Python 3 bindings for the Nautilus Extension API"
-  depends=('nautilus' 'python-gobject')
-  conflicts=('python2-nautilus')
-
-  cd python3
-  make DESTDIR="$pkgdir" install
-}
-
-package_python2-nautilus() {
-  pkgdesc="Python 2 bindings for the Nautilus Extension API"
-  depends=('nautilus' 'python2-gobject')
-  conflicts=('python-nautilus')
-
-  cd python2
-  make DESTDIR="$pkgdir" install
-}

Copied: nautilus-python/repos/community-x86_64/PKGBUILD (from rev 281316, nautilus-python/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-11 11:22:57 UTC (rev 281317)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Giorgio Gilestro <giorgio at gilest.ro>
+
+pkgbase=nautilus-python
+pkgname=('python-nautilus' 'python2-nautilus')
+pkgver=1.2.1
+pkgrel=3
+pkgdesc="Python bindings for the Nautilus Extension API"
+arch=('x86_64')
+url="https://wiki.gnome.org/Projects/NautilusPython"
+license=('GPL')
+depends=('nautilus' 'python-gobject' 'python2-gobject')
+makedepends=('gtk-doc')
+source=(https://download.gnome.org/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
+        0001-Fix-string-comparison.patch)
+sha256sums=('36f98a8cc191b4ffcbcd7835eb80f99f39095b221c0ab65b4c84a859f9a9b10f'
+            'acad9ef3bbf1093a83c3a61f1789985c78d6e6ef3e06070fb1eda6176cd181bd')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../0001-Fix-string-comparison.patch
+  autoreconf -fi
+}
+
+build() {
+  # Python 3 version
+  [ -d gtk3 ] || cp -r $pkgbase-$pkgver python3
+  cd python3
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-gtk-doc \
+              PYTHON=python3
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+
+  cd "$srcdir"
+  # Python 2 version
+  [ -d gtk2 ] || cp -r $pkgbase-$pkgver python2
+  cd python2
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-gtk-doc \
+              PYTHON=python2
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package_python-nautilus() {
+  pkgdesc="Python 3 bindings for the Nautilus Extension API"
+  depends=('nautilus' 'python-gobject')
+  conflicts=('python2-nautilus')
+
+  cd python3
+  make DESTDIR="$pkgdir" install
+}
+
+package_python2-nautilus() {
+  pkgdesc="Python 2 bindings for the Nautilus Extension API"
+  depends=('nautilus' 'python2-gobject')
+  conflicts=('python-nautilus')
+
+  cd python2
+  make DESTDIR="$pkgdir" install
+}