bundle GTK libraries

Author: blahgeek

local-run.sh

@@ -1,14 +1,19 @@
 #!/bin/bash -ex
 
 cd "$(dirname "$(readlink -f "${0}")")"
-rm -rf ./dist ./build
+rm -rf ./dist
 
-mkdir build
+mkdir -p build
 pushd build
-git clone -b emacs-30.1 --depth 1 https://github.com/emacs-mirror/emacs emacs-src
+if [ ! -d emacs-src ]; then
+    git clone -b emacs-30.1 --depth 1 https://github.com/emacs-mirror/emacs emacs-src
+fi
+pushd emacs-src
+git clean -dxf
+popd
 popd
 
 docker build .  # next step has no log, so build first
 IMAGE_ID=$(docker build -q .)
 
-./build.sh "$IMAGE_ID" ./build/emacs-src BUILD_GUI=lucid BUILD_NATIVE_COMP=no
+./build.sh "$IMAGE_ID" ./build/emacs-src BUILD_GUI=gtk3 BUILD_NATIVE_COMP=no

scripts/AppRun

@@ -15,6 +15,16 @@ export EMACSDATA="$APPIMAGE_ROOT/share/emacs/$VERSION/etc"
 export EMACSDOC="$APPIMAGE_ROOT/share/emacs/$VERSION/etc"
 export EMACSPATH="$(echo "$APPIMAGE_ROOT"/libexec/emacs/$VERSION/*)"
 export PATH="$APPIMAGE_ROOT/bin:$PATH"
+export XDG_DATA_DIRS="$APPIMAGE_ROOT/share:${XDG_DATA_DIRS}"
+
+if [ -d "$APPIMAGE_ROOT/lib/gtk-3.0" ]; then
+    export GSETTINGS_SCHEMA_DIR=${APPIMAGE_ROOT}/share/glib-2.0/schemas/:${GSETTINGS_SCHEMA_DIR}
+    export GDK_PIXBUF_MODULE_FILE=${APPIMAGE_ROOT}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+    export GTK_PATH=${APPIMAGE_ROOT}/lib/gtk-3.0
+    export GIO_MODULE_DIR=${APPIMAGE_ROOT}/lib/gio
+    export GTK_DATA_PREFIX=${APPIMAGE_ROOT}
+    export GTK_THEME=Adwaita
+fi
 
 # check --emacs-appimage-run-as argument
 if [ "$1" = "--emacs-appimage-run-as" ]; then

scripts/build_emacs_in_docker.sh

@@ -4,6 +4,7 @@ SCRIPT_DIR=$(dirname "$(readlink -f "${0}")")
 
 cd "$WORK_DIR"
 
+rm -rf emacs
 cp -r emacs-src emacs
 
 pushd emacs
@@ -26,24 +27,25 @@ if [[ "$BUILD_GUI" = "pgtk" ]]; then
 elif [[ "$BUILD_GUI" = "x11" || "$BUILD_GUI" = "gtk3" ]]; then
     IS_GUI=yes
     ARGS+=" --with-x --without-pgtk --without-gconf --with-x-toolkit=gtk3"
+
+    # copy GTK related files
+    cp -r /usr/lib/$(uname -m)-linux-gnu/gdk-pixbuf-2.0 "$DIST_APPDIR/lib/"
+    cp -r /usr/lib/$(uname -m)-linux-gnu/gtk-3.0 "$DIST_APPDIR/lib/"
+    cp -r /usr/lib/$(uname -m)-linux-gnu/gio "$DIST_APPDIR/lib/"
+    cp -r /usr/share/glib-2.0 "$DIST_APPDIR/share/"
 elif [[ "$BUILD_GUI" = "lucid" ]]; then
     IS_GUI=yes
     ARGS+=" --with-x --without-pgtk --without-gconf --with-x-toolkit=lucid"
 else
     ARGS+=" --without-x --without-pgtk --without-ns"
 fi
 
-# TODO: libtiff caused some trouble on compatibility:
-# it's depend by gtk (which we donot bundle) and have incompatible APIs between versions.
-# so disable libtiff for now
 # TODO: imagemagick requires dynamic coders. we don't support them correctly now (so it cannot work correctly)
 # so disable imagemagick for now
 ARGS+=" --without-tiff --without-imagemagick"
 if [[ "$IS_GUI" = "yes" ]]; then
-    ARGS+=" --with-gif --with-png --with-rsvg --with-webp"
+    ARGS+=" --with-gif --with-png --with-rsvg --with-webp --with-tiff --with-jpeg"
     ARGS+=" --with-harfbuzz --with-cairo --with-libotf --without-m17n-flt"
-    # use static lib for libjpeg, to prevent incompatible libjpeg.so version because it's depend by gtk
-    ARGS+=" --with-jpeg emacs_cv_jpeglib=/usr/lib/$(uname -m)-linux-gnu/libjpeg.a"
 fi
 
 

scripts/postprocess.py

@@ -154,33 +154,22 @@ def _parse_node(node, expected_level):
 
 # this is prefix
 LIB_BLACKLIST = [
-    # GTK related
-    'libgtk-3.so',
-    'libgdk-3.so',
-    'libgdk_pixbuf-2.0.so',
-    'libgio-2.0.so',
-    'libgobject-2.0.so',
-    'libglib-2.0.so',
     # X related
     'libX',  # prefix
     'libxcb.so',
     'libxcb-shape.so',
     'libSM.so',
     'libICE.so',
     # GUI base system
-    'libpango',
-    'libcairo.so',
     'libfreetype.so',
     'libfontconfig.so',
     'libharfbuzz.so',
     'libGL',
     'libOpenGL',
     'libEGL',
     'libdbus-1.so',
-    'librsvg',   # dynamic loaded by gdk
     # base system
     'libgcc_s.so',
-    'libgnutls.so',
     'libstdc++.so.6',
     # glibc
     'libpthread.so',