From 4a18a0deafd74d4bd3290d5b3934b6328bd37fae Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Wed, 8 Jun 2011 15:40:19 +0000 Subject: Remove obsolete patch, this will unbreak the build. Add a patch from the PR that was forgotten. No bump because it didn't build after the update. PR: ports/155956 Submitted by: Maxim Samsonov --- x11-fm/py-nautilus/files/patch-configure | 16 ---------------- x11-fm/py-nautilus/files/patch-src_nautilus-python.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 x11-fm/py-nautilus/files/patch-configure create mode 100644 x11-fm/py-nautilus/files/patch-src_nautilus-python.c (limited to 'x11-fm') diff --git a/x11-fm/py-nautilus/files/patch-configure b/x11-fm/py-nautilus/files/patch-configure deleted file mode 100644 index 191015be10d1..000000000000 --- a/x11-fm/py-nautilus/files/patch-configure +++ /dev/null @@ -1,16 +0,0 @@ ---- configure.orig 2010-01-18 02:10:37.000000000 -0500 -+++ configure 2010-01-18 02:10:56.000000000 -0500 -@@ -10479,11 +10479,11 @@ py_exec_prefix=`$PYTHON -c "import sys; - - - --if test "x$PYTHON_LIBS" == x; then -+if test "x$PYTHON_LIBS" = x; then - PYTHON_LIBS="-L${py_prefix}/lib${libdirsuffix} -lpython${PYTHON_VERSION}" - fi - --if test "x$PYTHON_LIB_LOC" == x; then -+if test "x$PYTHON_LIB_LOC" = x; then - PYTHON_LIB_LOC="${py_prefix}/lib${libdirsuffix}" - fi - diff --git a/x11-fm/py-nautilus/files/patch-src_nautilus-python.c b/x11-fm/py-nautilus/files/patch-src_nautilus-python.c new file mode 100644 index 000000000000..46b28664e2da --- /dev/null +++ b/x11-fm/py-nautilus/files/patch-src_nautilus-python.c @@ -0,0 +1,13 @@ +--- src/nautilus-python.c.orig 2011-06-08 17:41:34.000000000 +0200 ++++ src/nautilus-python.c 2011-06-08 17:42:25.000000000 +0200 +@@ -217,8 +217,8 @@ nautilus_python_init_python (void) + if (Py_IsInitialized()) + return TRUE; + +- debug("g_module_open " PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX ".1.0"); +- libpython = g_module_open(PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX ".1.0", 0); ++ debug("g_module_open " PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX ".1"); ++ libpython = g_module_open(PY_LIB_LOC "/libpython" PYTHON_VERSION "." G_MODULE_SUFFIX ".1", 0); + if (!libpython) + g_warning("g_module_open libpython failed: %s", g_module_error()); + -- cgit v1.2.3