[Spice-devel] [spice-jhbuild 3/3] Add celt patch to git repository

Christophe Fergeau cfergeau at redhat.com
Wed Jul 8 02:55:37 PDT 2015


It's more convenient to handle if it's stored together with the jhbuild
moduleset rather than in a separate webspace.
---
 modulesets/spice.xml                               |  2 +-
 patches/celt-0.5.1.3-dont-recurse-into-tests.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 patches/celt-0.5.1.3-dont-recurse-into-tests.patch

diff --git a/modulesets/spice.xml b/modulesets/spice.xml
index f1abf6e..52eb1b6 100644
--- a/modulesets/spice.xml
+++ b/modulesets/spice.xml
@@ -41,7 +41,7 @@
     <branch module="celt/celt-0.5.1.3.tar.gz" repo="xiph" version="0.5.1.3"
             hash="sha256:fc2e5b68382eb436a38c3104684a6c494df9bde133c139fbba3ddb5d7eaa6a2e"
             md5sum="67e7b5e45db57a6f1f0a6962f5ecb190" size="440772">
-      <patch file="http://people.freedesktop.org/~teuf/spice-gtk-osx/celt-0.5.1.3-dont-recurse-into-tests.patch" strip="1"/>
+      <patch file="http://cgit.freedesktop.org/spice/spice-jhbuild/plain/patches/celt-0.5.1.3-dont-recurse-into-tests.patch?h=osx" strip="1"/>
     </branch>
   </autotools>
 
diff --git a/patches/celt-0.5.1.3-dont-recurse-into-tests.patch b/patches/celt-0.5.1.3-dont-recurse-into-tests.patch
new file mode 100644
index 0000000..462b6b7
--- /dev/null
+++ b/patches/celt-0.5.1.3-dont-recurse-into-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 21d9092..21be0a8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -206,7 +206,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.6
+ 
+ #Fools KDevelop into including all files
+-SUBDIRS = libcelt tests @tools@
++SUBDIRS = libcelt @tools@
+ DIST_SUBDIRS = libcelt tests tools
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = celt at PACKAGE_APPEND@.pc 
-- 
2.4.3



More information about the Spice-devel mailing list