[Git][gajim/gajim][gtk4] refactor: Windows: Adapt build to GTK4

[@wurstsalat]

Daniel Brötzmann pushed to branch gtk4 at gajim / gajim


Commits:
b7dce833 by wurstsalat at 2024-11-03T12:06:28+01:00
refactor: Windows: Adapt build to GTK4

- - - - -


1 changed file:

- win/_base.sh


Changes:

=====================================
win/_base.sh
=====================================
@@ -133,7 +133,7 @@ function post_install_deps {
     rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/96x96"
     rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/64x64"
     rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/48x48"
-    "${MINGW_ROOT}"/bin/gtk-update-icon-cache-3.0.exe --force \
+    "${MINGW_ROOT}"/bin/gtk4-update-icon-cache.exe --force \
         "${MINGW_ROOT}/share/icons/Adwaita"
 
     # Compile GLib schemas
@@ -174,7 +174,7 @@ function install_gajim {
     cp -r gajim/data/icons/hicolor "${MINGW_ROOT}"/share/icons
 
     # Update icon cache
-    "${MINGW_ROOT}"/bin/gtk-update-icon-cache-3.0.exe --force \
+    "${MINGW_ROOT}"/bin/gtk4-update-icon-cache.exe --force \
         "${MINGW_ROOT}/share/icons/hicolor"
 
 }
@@ -195,7 +195,7 @@ function cleanup_install {
         fi
     done
 
-    
KEEP="gajim|gajim-debug|python3|gdbus|gspawn-win32-helper|gspawn-win64-helper"
+    KEEP="gajim|gajim-debug|python3|gdbus|gspawn-win64-helper"
 
     echo "deleting .exe files"
     find "${MINGW_ROOT}" -regextype "posix-extended" -name "*.exe" -and ! \
@@ -229,7 +229,6 @@ function cleanup_install {
     rm -Rf "${MINGW_ROOT}"/share/gdb
     rm -Rf "${MINGW_ROOT}"/share/libcaca
     rm -Rf "${MINGW_ROOT}"/share/gettext
-    rm -Rf "${MINGW_ROOT}"/share/gtk-3.0
     rm -Rf "${MINGW_ROOT}"/share/nghttp2
     rm -Rf "${MINGW_ROOT}"/share/fontconfig
     rm -Rf "${MINGW_ROOT}"/share/gettext-*
@@ -247,7 +246,6 @@ function cleanup_install {
     rm -Rf "${MINGW_ROOT}"/lib/"${PYTHON_ID}".*/dist-packages/Ogre
     rm -Rf "${MINGW_ROOT}"/lib/cmake
     rm -Rf "${MINGW_ROOT}"/lib/gettext
-    rm -Rf "${MINGW_ROOT}"/lib/gtk-3.0
     rm -Rf "${MINGW_ROOT}"/lib/mpg123
     rm -Rf "${MINGW_ROOT}"/lib/p11-kit
     rm -Rf "${MINGW_ROOT}"/lib/ruby
@@ -306,7 +304,6 @@ function cleanup_install {
     find "${MINGW_ROOT}" -regex ".*/bin/[^.]+" -exec rm -f {} \;
     find "${MINGW_ROOT}" -regex ".*/bin/[^.]+\\.[0-9]+" -exec rm -f {} \;
 
-    find "${MINGW_ROOT}" -name "gtk30-properties.mo" -exec rm -rf {} \;
     find "${MINGW_ROOT}" -name "gettext-tools.mo" -exec rm -rf {} \;
 
     find "${MINGW_ROOT}" -name "old_root.pem" -exec rm -rf {} \;



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/b7dce833d13477ed0d95865e3f2444c4e508e506

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/b7dce833d13477ed0d95865e3f2444c4e508e506
You're receiving this email because of your account on dev.gajim.org.



_______________________________________________
Commits mailing list -- commits@gajim.org
To unsubscribe send an email to commits-le...@gajim.org