Mon Jan 12 13:16:33 2015 UTC ()
Fix patch offsets.


(jperkin)
diff -r1.22 -r1.23 pkgsrc/x11/py-gnome2/distinfo
diff -r1.6 -r1.7 pkgsrc/x11/py-gnome2/patches/patch-aa
cvs diff -r1.22 -r1.23 pkgsrc/x11/py-gnome2/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/py-gnome2/distinfo 2010/04/13 17:46:03 1.22
+++ pkgsrc/x11/py-gnome2/distinfo 2015/01/12 13:16:33 1.23
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.22 2010/04/13 17:46:03 drochner Exp $ 1$NetBSD: distinfo,v 1.23 2015/01/12 13:16:33 jperkin Exp $
2 2
3SHA1 (gnome-python-2.28.1.tar.bz2) = de7e66aff141c4c64bc25cdb85193fab0899b983 3SHA1 (gnome-python-2.28.1.tar.bz2) = de7e66aff141c4c64bc25cdb85193fab0899b983
4RMD160 (gnome-python-2.28.1.tar.bz2) = 92d6536ed28ae760ea1519fea68565d29249dd33 4RMD160 (gnome-python-2.28.1.tar.bz2) = 92d6536ed28ae760ea1519fea68565d29249dd33
5Size (gnome-python-2.28.1.tar.bz2) = 562220 bytes 5Size (gnome-python-2.28.1.tar.bz2) = 562220 bytes
6SHA1 (patch-aa) = 242a2636b7c7515d96af2713a7536fd0cebba12e 6SHA1 (patch-aa) = b4ed184f15c1391ceccbcc681a0ec5d608f834f5
7SHA1 (patch-ab) = d547a4ac92364aed1f5d7f8041616760339aefd3 7SHA1 (patch-ab) = d547a4ac92364aed1f5d7f8041616760339aefd3
8SHA1 (patch-ac) = 0f05e017831cd15d5728359dc15ba454c9c8bd19 8SHA1 (patch-ac) = 0f05e017831cd15d5728359dc15ba454c9c8bd19
cvs diff -r1.6 -r1.7 pkgsrc/x11/py-gnome2/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/py-gnome2/patches/patch-aa 2009/04/17 18:19:28 1.6
+++ pkgsrc/x11/py-gnome2/patches/patch-aa 2015/01/12 13:16:33 1.7
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-aa,v 1.6 2009/04/17 18:19:28 drochner Exp $ 1$NetBSD: patch-aa,v 1.7 2015/01/12 13:16:33 jperkin Exp $
2 2
3--- configure.orig 2009-03-14 15:01:50.000000000 -0400 3--- configure.orig 2010-03-30 23:34:08.000000000 +0000
4+++ configure 4+++ configure
5@@ -20402,7 +20402,7 @@ $as_echo_n "checking for python librarie 5@@ -12161,7 +12161,7 @@ $as_echo_n "checking for python librarie
6  6
7 link_pymodules_libpython=false; 7 link_pymodules_libpython=false;
8 py_enable_shared=`$PYTHON -c "from distutils.sysconfig import get_config_var; print repr(get_config_var('Py_ENABLE_SHARED'))"` 8 py_enable_shared=`$PYTHON -c "from distutils.sysconfig import get_config_var; print repr(get_config_var('Py_ENABLE_SHARED'))"`
9-if test $py_enable_shared == 1 ; then 9-if test $py_enable_shared == 1 ; then
10+if test $py_enable_shared = 1 ; then 10+if test $py_enable_shared = 1 ; then
11 if test x`uname -s` != xDarwin; then 11 if test x`uname -s` != xDarwin; then
12 PYTHON_LDFLAGS="-no-undefined" 12 PYTHON_LDFLAGS="-no-undefined"
13 link_pymodules_libpython=true; 13 link_pymodules_libpython=true;
14@@ -20417,7 +20417,7 @@ PYTHON_LIBPL=`$PYTHON -c "from distutils 14@@ -12176,7 +12176,7 @@ PYTHON_LIBPL=`$PYTHON -c "from distutils
15 save_CC="$CC" 15 save_CC="$CC"
16 save_LIBS="$LIBS" 16 save_LIBS="$LIBS"
17  17
18-PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}" 18-PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
19+PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" 19+PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
20  20
21 CC="$PYTHON_CC" 21 CC="$PYTHON_CC"
22 LIBS="$LIBS $PYTHON_EMBED_LIBS" 22 LIBS="$LIBS $PYTHON_EMBED_LIBS"