Merge #899: Use gitian infrastructure to install librsvg2-2 (in lieu …

…of hard-coded wget)

d8af659 Use gitian infrastructure to install librsvg2-2 (in lieu of hard-coded wget) (Jeff Frontz)

Pull request description:

  This removes the hardcoded `wget` of libsrvg2-2 package from the internal gitian `script` and instead uses the `packages` capability (the `wget`-based implementation causes unintended dependencies on internet infrastructure; it is also brittle).

Tree-SHA512: 35fb6914e316f40a98e7ca20269a64bbb372423099df0d8faf91217c016d7ea2bcfa3854498141ae1f2c02ccac41b36a7e4f4fd02227e6e41a2eb5710796c37d

contrib/gitian-descriptors/gitian-linux.yml

@@ -25,6 +25,7 @@ packages:
 - "git"
 - "icnsutils"
 - "imagemagick"
+- "librsvg2-2"
 - "librsvg2-bin"
 - "pkg-config"
 - "autoconf"
@@ -62,10 +63,6 @@ script: |
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
   fi
 
-  ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
-  dpkg -x librsvg*.deb new-rsvg
-  export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
-
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}

contrib/gitian-descriptors/gitian-liquid-linux.yml

@@ -25,6 +25,7 @@ packages:
 - "git"
 - "icnsutils"
 - "imagemagick"
+- "librsvg2-2"
 - "librsvg2-bin"
 - "pkg-config"
 - "autoconf"
@@ -62,10 +63,6 @@ script: |
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
   fi
 
-  ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
-  dpkg -x librsvg*.deb new-rsvg
-  export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
-
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}

contrib/gitian-descriptors/gitian-liquid-osx.yml

@@ -13,6 +13,7 @@ packages:
 - "icnsutils"
 - "pkg-config"
 - "autoconf"
+- "librsvg2-2"
 - "librsvg2-bin"
 - "libtiff-tools"
 - "libtool"
@@ -55,10 +56,6 @@ script: |
 
   export ZERO_AR_DATE=1
 
-  ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
-  dpkg -x librsvg*.deb new-rsvg
-  export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
-
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}

contrib/gitian-descriptors/gitian-liquid-win.yml

@@ -11,6 +11,7 @@ packages:
 - "git"
 - "icnsutils"
 - "imagemagick"
+- "librsvg2-2"
 - "librsvg2-bin"
 - "pkg-config"
 - "autoconf"
@@ -51,10 +52,6 @@ script: |
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
   fi
 
-  ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
-  dpkg -x librsvg*.deb new-rsvg
-  export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
-
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}

contrib/gitian-descriptors/gitian-osx.yml

@@ -13,6 +13,7 @@ packages:
 - "icnsutils"
 - "pkg-config"
 - "autoconf"
+- "librsvg2-2"
 - "librsvg2-bin"
 - "libtiff-tools"
 - "libtool"
@@ -55,10 +56,6 @@ script: |
 
   export ZERO_AR_DATE=1
 
-  ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
-  dpkg -x librsvg*.deb new-rsvg
-  export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
-
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}

contrib/gitian-descriptors/gitian-win.yml

@@ -11,6 +11,7 @@ packages:
 - "git"
 - "icnsutils"
 - "imagemagick"
+- "librsvg2-2"
 - "librsvg2-bin"
 - "pkg-config"
 - "autoconf"
@@ -51,10 +52,6 @@ script: |
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
   fi
 
-  ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
-  dpkg -x librsvg*.deb new-rsvg
-  export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
-
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}