[jhbuild] [3.0] Update to libproxy-0.4.3 (GNOME bug 621199)
- From: Craig Keogh <cskeogh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] [3.0] Update to libproxy-0.4.3 (GNOME bug 621199)
- Date: Sat, 12 Jun 2010 00:50:38 +0000 (UTC)
commit 104ae3717ed78435620c1c3275b85729e23b0dd2
Author: Craig Keogh <cskeogh adam com au>
Date: Sat Jun 12 10:11:52 2010 +0930
[3.0] Update to libproxy-0.4.3 (GNOME bug 621199)
modulesets/gnome-external-deps-3.0.modules | 7 ++--
patches/libproxy-0.4-ldflags.patch | 12 -------
patches/libproxy-0.4-python-libdir.patch | 45 ++++++++++++++++++---------
3 files changed, 33 insertions(+), 31 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index d9deeb4..2823187 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -779,10 +779,9 @@
<cmake id="libproxy">
<branch repo="libproxy.googlecode.com"
- module="libproxy-0.4.0.tar.gz" version="0.4.0"
- hash="sha256:17cb515cc6b3bc37f1e5d268068f5220fb1b4398044d9e23cc11e8b36cad470c"
- md5sum="b22c95df70a40949e99add5171fc3084" size="64610">
- <patch file="libproxy-0.4-ldflags.patch" strip="1"/>
+ module="libproxy-0.4.3.tar.gz" version="0.4.3"
+ hash="sha1:d770dcc63bc5e361948c6d3dcc74c5db81e2200c"
+ size="71967">
<patch file="libproxy-0.4-python-libdir.patch" strip="1"/>
</branch>
diff --git a/patches/libproxy-0.4-python-libdir.patch b/patches/libproxy-0.4-python-libdir.patch
index 1b5f28a..955e610 100644
--- a/patches/libproxy-0.4-python-libdir.patch
+++ b/patches/libproxy-0.4-python-libdir.patch
@@ -1,17 +1,32 @@
-diff -upr libproxy-0.4.0.old/bindings/CMakeLists.txt libproxy-0.4.0/bindings/CMakeLists.txt
---- libproxy-0.4.0.old/bindings/CMakeLists.txt 2010-02-26 06:59:54.000000000 +1030
-+++ libproxy-0.4.0/bindings/CMakeLists.txt 2010-06-10 21:10:42.797521284 +0930
-@@ -3,10 +3,10 @@ find_package(PythonInterp)
- if(PYTHONINTERP_FOUND)
- execute_process(COMMAND
- ${PYTHON_EXECUTABLE}
-- -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_lib(plat_specific=1)"
-- OUTPUT_VARIABLE pysitepkgdir
-+ -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_version()"
-+ OUTPUT_VARIABLE pyversion
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-- install(FILES libproxy.py DESTINATION ${pysitepkgdir})
-+ install(FILES libproxy.py DESTINATION ${libdir}/python${pyversion}/site-packages)
+diff -ur libproxy-0.4.3.orig/bindings/CMakeLists.txt libproxy-0.4.3/bindings/CMakeLists.txt
+--- libproxy-0.4.3.orig/bindings/CMakeLists.txt 2010-06-08 01:27:23.000000000 +0930
++++ libproxy-0.4.3/bindings/CMakeLists.txt 2010-06-10 22:27:04.147396632 +0930
+@@ -5,10 +5,10 @@
+ if(PYTHONINTERP_FOUND)
+ execute_process(COMMAND
+ ${PYTHON_EXECUTABLE}
+- -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_lib(plat_specific=0)"
+- OUTPUT_VARIABLE pysitepkgdir
++ -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_version()"
++ OUTPUT_VARIABLE pyversion
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+- install(FILES libproxy.py DESTINATION ${pysitepkgdir})
++ install(FILES libproxy.py DESTINATION ${libdir}/python${pyversion}/site-packages)
+ endif()
endif()
- #TODO c-sharp bindings
+diff -ur libproxy-0.4.3.orig/bindings/perl/CMakeLists.txt libproxy-0.4.3/bindings/perl/CMakeLists.txt
+--- libproxy-0.4.3.orig/bindings/perl/CMakeLists.txt 2010-06-08 01:27:23.000000000 +0930
++++ libproxy-0.4.3/bindings/perl/CMakeLists.txt 2010-06-10 22:27:04.147396632 +0930
+@@ -11,8 +11,9 @@
+ else()
+ # PERL_SITEARCH is actually not defined in latest FindPerlLibs.cmake macros, thus
+ # we have to find the correct path on our own.
+- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitearch}"
+- OUTPUT_VARIABLE PX_PERL_ARCH)
++ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{PERL_REVISION}"
++ OUTPUT_VARIABLE PX_PERL_REVISION)
++ set (PX_PERL_ARCH ${libdir}/perl${PX_PERL_REVISION})
+ set (PX_PERL_LIB ${PERL_SITELIB})
+ endif()
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]