[arch-commits] Commit in nautilus-python/trunk (2 files)

Balló György bgyorgy at archlinux.org
Thu Jan 11 11:22:52 UTC 2018


    Date: Thursday, January 11, 2018 @ 11:22:51
  Author: bgyorgy
Revision: 281316

upgpkg: nautilus-python 1.2.1-3

Fix extensions loading twice (FS#57045)

Added:
  nautilus-python/trunk/0001-Fix-string-comparison.patch
Modified:
  nautilus-python/trunk/PKGBUILD

----------------------------------+
 0001-Fix-string-comparison.patch |   25 +++++++++++++++++++++++++
 PKGBUILD                         |   11 ++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

Added: 0001-Fix-string-comparison.patch
===================================================================
--- 0001-Fix-string-comparison.patch	                        (rev 0)
+++ 0001-Fix-string-comparison.patch	2018-01-11 11:22:51 UTC (rev 281316)
@@ -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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-11 11:20:46 UTC (rev 281315)
+++ PKGBUILD	2018-01-11 11:22:51 UTC (rev 281316)
@@ -5,7 +5,7 @@
 pkgbase=nautilus-python
 pkgname=('python-nautilus' 'python2-nautilus')
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for the Nautilus Extension API"
 arch=('x86_64')
 url="https://wiki.gnome.org/Projects/NautilusPython"
@@ -12,11 +12,14 @@
 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')
+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
 }
 
@@ -26,6 +29,7 @@
   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"
@@ -34,6 +38,7 @@
   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
 }
 



More information about the arch-commits mailing list