[GTK] Add an optional moduleset with hard to get packages (including libsecret)

https://bugs.webkit.org/show_bug.cgi?id=109195

Patch by Martin Robinson <mrobinson@igalia.com> on 2013-02-12
Reviewed by Philippe Normand.

Add an optional moduleset that includes libsecret. This moduleset will
be used to install some annoyingly hard to obtain dependencies on older
distributions.

* gtk/jhbuild-optional.modules: Added.
* gtk/jhbuild.modules: Add a reference to the new moduleset file.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142620 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f0f02207309e2befa69e670c169f6d44e9143e54..48927212297cbffc9954f6a5c263d9d30367167c 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-12  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Add an optional moduleset with hard to get packages (including libsecret)
+        https://bugs.webkit.org/show_bug.cgi?id=109195
+
+        Reviewed by Philippe Normand.
+
+        Add an optional moduleset that includes libsecret. This moduleset will
+        be used to install some annoyingly hard to obtain dependencies on older
+        distributions.
+
+        * gtk/jhbuild-optional.modules: Added.
+        * gtk/jhbuild.modules: Add a reference to the new moduleset file.
+
 2013-02-12  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Web Inspector: Native Memory Instrumentation: reportLeaf method doesn't report the leaf node properly.

diff --git a/Tools/gtk/jhbuild-optional.modules b/Tools/gtk/jhbuild-optional.modules
new file mode 100644 (file)
index 0000000..015a3d9
--- /dev/null
+++ b/Tools/gtk/jhbuild-optional.modules
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+
+  <!-- This file contains a set of modules that are hard to get on
+       certain distributions. Feel free to add more here, within reason,
+       as long as they are not built by default. -->
+
+  <repository type="tarball" name="ftp.gnome.org"
+      href="http://ftp.gnome.org/mirror/gnome.org/"/>
+
+  <autotools id="libsecret" autogen-sh="configure">
+    <branch repo="ftp.gnome.org"
+            module="core/3.6/3.6.2/sources/libsecret-0.11.tar.xz" version="0.11"
+            size="474716" md5sum="8e8b72fdbdafbb54381b7a0085be9b0c"/>
+  </autotools>
+
+</moduleset>

diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
index 22e43a8fd54e0a524fa5bd4bad6cfdd76b2687c9..5959c0b764b559f704b48618f66301ae784e8277 100644 (file)
--- a/Tools/gtk/jhbuild.modules
+++ b/Tools/gtk/jhbuild.modules
@@ -29,6 +29,8 @@
     </dependencies>
   </metamodule>
 
+  <include href="jhbuild-optional.modules"/>
+
   <repository type="tarball" name="ftp.gnu.org"
       href="ftp://ftp.gnu.org/gnu/"/>
   <repository type="git" name="github.com"