[SCM] lilv/master: Refresh patches.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Mon Oct 12 19:14:06 UTC 2015
The following commit has been merged in the master branch:
commit fb8652de2e378372615c5bee314a19f83f79288e
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Mon Oct 12 21:13:59 2015 +0200
Refresh patches.
diff --git a/debian/patches/1001-dont_run_ldconfig.patch b/debian/patches/1001-dont_run_ldconfig.patch
index c9c36ba..0568feb 100644
--- a/debian/patches/1001-dont_run_ldconfig.patch
+++ b/debian/patches/1001-dont_run_ldconfig.patch
@@ -8,9 +8,9 @@ Forwarded: not-needed
Index: lilv/wscript
===================================================================
---- lilv.orig/wscript 2014-02-22 14:27:33.070322137 +0100
-+++ lilv/wscript 2014-02-22 14:27:33.066322114 +0100
-@@ -382,7 +382,6 @@
+--- lilv.orig/wscript
++++ lilv/wscript
+@@ -405,7 +405,6 @@ def build(bld):
bld.install_files('${PYTHONDIR}', 'bindings/lilv.py')
diff --git a/debian/patches/1002-fix_gnu_kfreebsd_build.patch b/debian/patches/1002-fix_gnu_kfreebsd_build.patch
index cdc5d7d..f4fb19e 100644
--- a/debian/patches/1002-fix_gnu_kfreebsd_build.patch
+++ b/debian/patches/1002-fix_gnu_kfreebsd_build.patch
@@ -11,23 +11,23 @@ Subject: Fix build on GNU/kFreeBSD
Index: lilv/wscript
===================================================================
---- lilv.orig/wscript 2014-02-22 14:27:52.586416193 +0100
-+++ lilv/wscript 2014-02-22 14:27:52.582416170 +0100
-@@ -221,7 +221,7 @@
+--- lilv.orig/wscript
++++ lilv/wscript
+@@ -221,7 +221,7 @@ def build(bld):
if bld.env.MSVC_COMPILER:
libflags = []
defines = ['snprintf=_snprintf']
-- elif sys.platform.find('bsd') > 0:
-+ elif sys.platform.find('bsd') > 0 and sys.platform.find('gnu') < 0:
+- elif bld.env.DEST_OS.find('bsd') > 0:
++ elif bld.env.DEST_OS.find('bsd') > 0 and sys.platform.find('gnu') < 0:
lib = []
- # Shared Library
-@@ -376,7 +376,7 @@
+ # Pkgconfig file
+@@ -398,7 +398,7 @@ def build(bld):
source = 'bindings/lilv.i',
target = 'bindings/_lilv',
includes = ['..'],
-- swig_flags = '-c++ -python -Wall -I.. -llilv -features autodoc=1',
-+ swig_flags = '-c++ -python -Wall -I.. -features autodoc=1',
+- swig_flags = '-c++ -python %s -Wall -I.. -llilv -features autodoc=1' %
++ swig_flags = '-c++ -python %s -Wall -I.. -features autodoc=1' %
+ ("-py3" if sys.version_info >= (3,0,0) else ""),
use = 'liblilv')
autowaf.use_lib(bld, obj, 'LILV')
-
--
lilv packaging
More information about the pkg-multimedia-commits
mailing list