[jhbuild] 3.16: Move poppler to -sysdeps

[Javier Jardón <jjardon src gnome org>]

commit b16d18f645c4c1c0e9211ae7099f3f0c9c38d598
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Oct 22 22:27:11 2014 +0100

    3.16: Move poppler to -sysdeps

 modulesets/gnome-suites-core-deps-3.16.modules |   22 ----------------------
 modulesets/gnome-sysdeps-3.16.modules          |    6 ++++++
 2 files changed, 6 insertions(+), 22 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index 56cc1ee..92c4711 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -42,8 +42,6 @@
     href="http://icon-theme.freedesktop.org/releases/"/>
 <repository type="tarball" name="nice.freedesktop.org"
     href="http://nice.freedesktop.org/releases/"/>
-<repository type="tarball" name="poppler.freedesktop.org"
-    href="http://poppler.freedesktop.org/"/>
 <repository type="tarball" name="itstool.org"
     href="http://files.itstool.org/itstool/"/>
 <repository type="tarball" name="libpwquality"
@@ -1078,26 +1076,6 @@
     <branch/>
   </autotools>
 
-  <autotools id="poppler" autogenargs="--enable-xpdf-headers --enable-poppler-glib" 
makeargs="POPPLER_GLIB_DISABLE_DEPRECATED=">
-    <if condition-set="freebsd">
-      <autogenargs value="CXXFLAGS=-std=c++11"/>
-    </if>
-    <pkg-config>poppler-glib.pc</pkg-config>
-    <branch repo="poppler.freedesktop.org"
-            module="poppler-0.26.5.tar.xz"
-            version="0.26.5"
-            hash="sha256:de7de5fa337431e5d1f372e8577b3707322f1dbc1dc28a70f2927476f134d1ee"
-            size="1595232"/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="glib"/>
-    </dependencies>
-    <after>
-      <dep package="gtk+"/>
-      <dep package="gdk-pixbuf"/>
-    </after>
-  </autotools>
-
   <!-- Python 3 build of pygobject -->
   <autotools id="pygobject" autogenargs="--with-python=python3">
     <branch/>
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index 6cd2423..88f13ab 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -697,6 +697,12 @@
             version="0.30"/>
   </systemmodule>
 
+  <systemmodule id="poppler">
+    <pkg-config>poppler-glib.pc</pkg-config>
+    <branch repo="system"
+            version="0.26.5"/>
+  </systemmodule>
+
   <systemmodule id="ppp">
     <branch repo="system"/>
     <systemdependencies>