Merge pull request #87 from AppImage/remove-workaround

Remove workaround for hidden dependencies

.travis.yml

@@ -16,15 +16,14 @@ matrix:
             - libbsd-dev
             - libcairo-dev
             - rpm
+            - librsvg2-dev
     - env: ARCH=i386
       addons:
         apt:
-          update: true
           packages:
             - gcc-multilib
             - g++-multilib
             - libfuse2:i386
-            - librsvg2-bin:i386
             - libfuse-dev:i386
             - desktop-file-utils
             - ccache
@@ -33,10 +32,17 @@ matrix:
             - liblzma-dev:i386
             - libgtest-dev
             - libcairo2-dev:i386
-            - libpng-dev:i386
+            - librsvg2-bin:i386
+            - librsvg2-dev:i386
             - libfreetype6-dev:i386
             - libfontconfig1-dev:i386
             - rpm
+            - gir1.2-rsvg-2.0:i386
+            - libgdk-pixbuf2.0-dev:i386
+            - gir1.2-freedesktop:i386
+            - gir1.2-gdkpixbuf-2.0:i386
+            - gir1.2-glib-2.0:i386
+            - libgirepository-1.0-1:i386
 
 script:
   - ( mkdir -p ./lib ; cd ./lib/ ; git clone --recursive https://github.com/AppImage/libappimage )

travis/travis-build.sh

@@ -64,29 +64,6 @@ cpack -V -G RPM
 mkdir -p appdir
 make install DESTDIR=appdir
 
-# Add "hidden" dependencies; https://github.com/AppImage/libappimage/issues/104
-# We need a newer patchelf with '--add-needed'
-git clone -o e1e39f3 https://github.com/NixOS/patchelf
-cd patchelf
-bash ./bootstrap.sh
-./configure --prefix=/usr
-make -j$(nproc)
-sudo make install
-cd -
-patchelf --add-needed librsvg-2.so.2 --add-needed libcairo.so.2 --add-needed libgobject-2.0.so ./appdir/usr/bin/appimaged
-
-# Workaround for:
-# undefined symbol: g_type_check_instance_is_fundamentally_a
-# Function g_type_check_instance_is_fundamentally_a was introduced in glib2-2.41.1
-# Bundle libglib-2.0.so.0 - TODO: find a better solution, e.g., downgrade libglib-2.0 at compile time
-mkdir -p ./appdir/usr/lib/
-cp $(ldconfig -p | grep libglib-2.0.so.0 | head -n 1 | cut -d ">" -f 2 | xargs) ./appdir/usr/lib/
-# The following come with glib2 and probably need to be treated together:
-cp $(ldconfig -p | grep libgio-2.0.so.0 | head -n 1 | cut -d ">" -f 2 | xargs) ./appdir/usr/lib/
-cp $(ldconfig -p | grep libgmodule-2.0.so.0 | head -n 1 | cut -d ">" -f 2 | xargs) ./appdir/usr/lib/
-cp $(ldconfig -p | grep libgobject-2.0.so.0 | head -n 1 | cut -d ">" -f 2 | xargs) ./appdir/usr/lib/
-cp $(ldconfig -p | grep libgthread-2.0.so.0 | head -n 1 | cut -d ">" -f 2 | xargs) ./appdir/usr/lib/
-
 wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-"$ARCH".AppImage
 chmod +x linuxdeploy-"$ARCH".AppImage
 ./linuxdeploy-"$ARCH".AppImage --appimage-extract