Merge branch 'main' of https://github.com/ellie-commons/Jorts

Author: teamcons

meson.build

@@ -7,13 +7,11 @@ gnome = import('gnome')
 i18n = import('i18n')
 
 add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name()), language:'c')
+windows_build = build_machine.system() == 'windows'
 
-if build_machine.system() == 'windows'
-    windows_build = true
-else
-    windows_build = false
-endif
 
+#================================
+# Set flags for icon variants, and target in the case of windows builds
 
 vala_flags = []
 variant = get_option('variant')[0]
@@ -26,15 +24,10 @@ else
     vala_flags = ['--define', 'DEFAULT']
 endif
 
-
 if windows_build
     vala_flags += ['--define', 'WINDOWS']
 endif
 
-
-
-
-
 add_project_arguments(vala_flags, language: 'vala')
 
 #================================
@@ -57,6 +50,9 @@ gresource = gnome.compile_resources(
     source_dir: 'data'
 )
 
+#================================
+# dependencies
+
 dependencies = [
         dependency('granite-7'),
         dependency('gobject-2.0'),
@@ -65,6 +61,8 @@ dependencies = [
         dependency('gtk4'),
     ]
 
+# We need to compile an icon into the exe to avoid "missing icon" icon at every turn
+# Libportal is not available in MSYS2, built the file only on linuxes
 if windows_build
     dependencies += dependency('gio-windows-2.0')
     ico_src = import('windows').compile_resources('windows/icons/ico.rc')
@@ -74,9 +72,8 @@ else
     dependencies += dependency('libportal')
 endif
 
-#================================
-
 
+#================================
 # Add subfolders for Meson to look
 subdir('data')
 subdir('po')

windows/deploy.sh

@@ -1,7 +1,18 @@
 #!/bin/bash
 
-# Variables
-# Run app from base directory, not ./windows
+# Script to go all the way from building to compiling to creating an installer
+# Install MSYS2 then run prep.sh before this to prep your box
+# Very tweaked version of the deploy.sh from SuperCamel: https://github.com/supercamel/ValaOnWindows
+
+# Run this from base directory, not ./windows
+
+# Run the exe of your app in deploy/bin :
+# From the MSYS2 console to check you have all packages necessary for it to run on windows
+# From windows Explorer by double-click to check if everything it needs is in the deploy folder
+# Copy stuff from /c/MSYS2/mingw64/ everything needed should be kinda there
+
+#--------------------------------
+# Variables.
 # Write path UNIX-style ("/"). Script will invert the slash where relevant.
 app_name="Jorts"
 build_dir="builddir"
@@ -11,13 +22,14 @@ version="3.5.0"
 deploy_dir="windows/deploy"
 exe_name="io.github.ellie_commons.jorts.exe"
 
-# Rebuild the exe as a release build
+#--------------------------------
+# Rebuild and compile the exe as a release build
 rm -rfd ${build_dir}
 meson setup --buildtype release ${build_dir}
 ninja -C ${build_dir}
 
-# Copy DLLS
-echo "Copying DLLs..."
+#--------------------------------
+# Prepare structure
 mkdir -p "${deploy_dir}"
 mkdir -p "${deploy_dir}/bin"
 mkdir -p "${deploy_dir}/etc"
@@ -29,14 +41,17 @@ mkdir -p "${deploy_dir}/usr"
 cp "${build_dir}/src/${exe_name}" "${deploy_dir}/bin"
 cp -r "windows/icons" "${deploy_dir}"
 
-dlls=$(ldd "${deploy_dir}/bin/${exe_name}" | grep "/mingw64" | awk '{print $3}')
 
+# Detect what DLL we need and slorp it into bin
+echo "Copying DLLs..."
+dlls=$(ldd "${deploy_dir}/bin/${exe_name}" | grep "/mingw64" | awk '{print $3}')
 for dll in $dlls 
 do 
     cp "$dll" "${deploy_dir}/bin"
 done
 
-
+# These are not detected but needed to display icons properly
+# Dont ask me how many tears of blood it took to figure out these idiots
 cp -rnv /mingw64/bin/rsvg-convert.exe ${deploy_dir}/bin/
 cp -rnv /mingw64/bin/librsvg-2-2.dll ${deploy_dir}/bin/
 cp -rnv /mingw64/bin/libxml2-16.dll ${deploy_dir}/bin/
@@ -55,28 +70,45 @@ cp -rnv /mingw64/share/fontconfig/ ${deploy_dir}/share/
 cp -rnv /mingw64/share/GConf/ ${deploy_dir}/share/
 cp -rnv /mingw64/lib/gettext/ ${deploy_dir}/lib/
 
-# We need this to properly display icons
+# We need this to properly display icons too. 
 cp -rnv /mingw64/include/librsvg-2.0 ${deploy_dir}/include/
 cp -rnv /mingw64/lib/gdk-pixbuf-2.0/ ${deploy_dir}/lib/
 #export GDK_PIXBUF_MODULEDIR=lib/gdk-pixbuf-2.0/2.10.0/loaders
 #gdk-pixbuf-query-loaders > ${deploy_dir}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
 # Make sure this one is actually copied, manually, in the deploy
-# If only some icons show up its because of this shit.
+# That file caused so many issues trying to build
 cat windows/loaders.cache > ${deploy_dir}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
-# Ive tried, and failed, to pull only needed icons
-
-# Only what we need
+#--------------------------------
+# ICONS. Only what we need. Shits heavy af
+# Honestly you could get away with copying the whole icon theme. The script goes into the weeds only to shave off MBs
+# TODO: No matter what, the edit-find icon in the searchfield of emoji-popover shows as missing
+# TODO: Abstract this into a script. A better coded one.
 mkdir -pv ${deploy_dir}/share/icons/elementary
-cp -rnv /mingw64/share/icons/elementary/actions* ${deploy_dir}/share/icons/elementary/
-cp -rnv /mingw64/share/icons/elementary/status* ${deploy_dir}/share/icons/elementary/
+
+mkdir -p /mingw64/share/icons/elementary/actions/ ${deploy_dir}/share/icons/elementary/
+mkdir -p /mingw64/share/icons/elementary/actions@2x/ ${deploy_dir}/share/icons/elementary/
+mkdir -p /mingw64/share/icons/elementary/actions@3x/ ${deploy_dir}/share/icons/elementary/
+cp -rnv /mingw64/share/icons/elementary/actions/symbolic ${deploy_dir}/share/icons/elementary/actions/
+cp -rnv /mingw64/share/icons/elementary/actions@2x/symbolic ${deploy_dir}/share/icons/elementary/actions@2x/
+cp -rnv /mingw64/share/icons/elementary/actions@3x/symbolic ${deploy_dir}/share/icons/elementary/actions@3x/
+
+mkdir -p /mingw64/share/icons/elementary/status/ ${deploy_dir}/share/icons/elementary/
+mkdir -p /mingw64/share/icons/elementary/status@2x/ ${deploy_dir}/share/icons/elementary/
+mkdir -p /mingw64/share/icons/elementary/status@3x/ ${deploy_dir}/share/icons/elementary/
+cp -rnv /mingw64/share/icons/elementary/status/symbolic ${deploy_dir}/share/icons/elementary/status/
+cp -rnv /mingw64/share/icons/elementary/status@2x/symbolic ${deploy_dir}/share/icons/elementary/status@2x/
+cp -rnv /mingw64/share/icons/elementary/status@3x/symbolic ${deploy_dir}/share/icons/elementary/status@3x/
+
 cp -rnv /mingw64/share/icons/elementary/emotes* ${deploy_dir}/share/icons/elementary/
 cp -rnv /mingw64/share/icons/elementary/index.theme ${deploy_dir}/share/icons/elementary/
 gtk4-update-icon-cache.exe -f ${deploy_dir}/share/icons/elementary/
 
-
+#--------------------------------
 # Write the theme to gtk settings
+# The NSIS below handles installing the font, as it works differently on windows
+
 mkdir -v ${deploy_dir}/etc/gtk-4.0/
 cat << EOF > ${deploy_dir}/etc/gtk-4.0/settings.ini
 [Settings]
@@ -89,6 +121,7 @@ gtk-xft-hintstyle=hintful
 gtk-xft-rgba=rgb
 EOF
 
+#Doesnt seem needed, but keep around just in case
 #glib-compile-schemas ${deploy_dir}/share/glib-2.0/schemas
 
 #================================================================
@@ -224,7 +257,7 @@ Section "Install"
     WriteRegStr HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "UninstallString" "\$INSTDIR\\Uninstall.exe"
     WriteRegStr HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "Publisher" "Ellie-Commons"
     WriteRegStr HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "URLInfoAbout" "https://github.com/ellie-commons/jorts"
-    WriteRegDWORD HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "EstimatedSize" "0x00026548" ;157MB
+    WriteRegDWORD HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "EstimatedSize" "0x000220EC" ;139,5MB
 SectionEnd
 
 Section "Uninstall"
@@ -258,6 +291,11 @@ SectionEnd
 
 EOF
 
+
+#--------------------------------
+# Build the final exe installer.
+# Test out the deploy bin just in case though.
+
 echo "Running NSIS..."
 makensis windows/${app_name}-Installer.nsi
 

windows/icons/settings-mini.ico

@@ -4,62 +4,62 @@
 #
 # LoaderDir = lib\gdk-pixbuf-2.0\2.10.0\loaders
 #
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-ani.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
 "ani" 4 "gdk-pixbuf" "Windows animated cursor" "LGPL"
 "application/x-navi-animation" ""
 "ani" ""
 "RIFF    ACON" "    xxxx    " 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-avif.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-avif.dll"
 "avif" 5 "gdk-pixbuf" "AV1 Image File Format" "BSD"
 "image/avif" ""
 "avif" ""
 "    ftypavif" "zzz         " 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-bmp.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
 "bmp" 5 "gdk-pixbuf" "BMP" "LGPL"
 "image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
 "bmp" ""
 "BM" "" 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-gif.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
 "gif" 4 "gdk-pixbuf" "GIF" "LGPL"
 "image/gif" ""
 "gif" ""
 "GIF8" "" 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-heif.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-heif.dll"
 "heif/avif" 4 "pixbufloader-heif" "HEIF/AVIF Image" "LGPL3"
 "image/heif" "image/heic" "image/avif" ""
 "heif" "heic" "avif" ""
 "    ftyp" "xxxx    " 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-icns.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
 "icns" 4 "gdk-pixbuf" "MacOS X icon" "GPL"
 "image/x-icns" ""
 "icns" ""
 "icns" "" 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-ico.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
 "ico" 5 "gdk-pixbuf" "Windows icon" "LGPL"
 "image/x-icon" "image/x-ico" "image/x-win-bitmap" "image/vnd.microsoft.icon" "application/ico" "image/ico" "image/icon" "text/ico" ""
 "ico" "cur" ""
 "  \001   " "zz znz" 100
 "  \002   " "zz znz" 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-jpeg.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
 "jpeg" 5 "gdk-pixbuf" "JPEG" "LGPL"
 "image/jpeg" ""
 "jpeg" "jpe" "jpg" ""
 "\377\330" "" 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-png.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dll"
 "png" 5 "gdk-pixbuf" "PNG" "LGPL"
 "image/png" ""
 "png" ""
 "\211PNG\r\n\032\n" "" 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-pnm.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
 "pnm" 4 "gdk-pixbuf" "PNM/PBM/PGM/PPM" "LGPL"
 "image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
 "pnm" "pbm" "pgm" "ppm" ""
@@ -70,14 +70,14 @@
 "P5" "" 100
 "P6" "" 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-qtif.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.dll"
 "qtif" 4 "gdk-pixbuf" "QuickTime" "LGPL"
 "image/x-quicktime" "image/qtif" ""
 "qtif" "qif" ""
 "abcdidsc" "xxxx    " 100
 "abcdidat" "xxxx    " 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-tga.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
 "tga" 4 "gdk-pixbuf" "Targa" "LGPL"
 "image/x-tga" ""
 "tga" "targa" ""
@@ -88,28 +88,28 @@
 "  \n" "xz " 100
 "  \v" "xz " 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-tiff.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
 "tiff" 5 "gdk-pixbuf" "TIFF" "LGPL"
 "image/tiff" ""
 "tiff" "tif" ""
 "MM *" "  z " 100
 "II* " "   z" 100
 "II* \020   CR\002 " "   z zzz   z" 0
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-xbm.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
 "xbm" 4 "gdk-pixbuf" "XBM" "LGPL"
 "image/x-xbitmap" ""
 "xbm" ""
 "#define " "" 100
 "/*" "" 50
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-xpm.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
 "xpm" 4 "gdk-pixbuf" "XPM" "LGPL"
 "image/x-xpixmap" ""
 "xpm" ""
 "/* XPM */" "" 100
 
-"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\pixbufloader_svg.dll"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/pixbufloader_svg.dll"
 "svg" 6 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL"
 "image/svg+xml" "image/svg" "image/svg-xml" "image/vnd.adobe.svg+xml" "text/xml-svg" "image/svg+xml-compressed" ""
 "svg" "svgz" "svg.gz" ""

windows/loaders.cache

@@ -1,16 +1,18 @@
 #!/bin/bash
-
 # Script to prepare the environment
 
+# Line below for copypaste in msis2 console because im not retyping that
 # cd /c/Documents\ and\ Settings/TC/Desktop/jorts
-mkdir -v deploy
+
+mkdir -pv windows/deploy
 
 alias pacman='pacman --noconfirm'
 pacman -Syu
 pacman -S meson gcc ninja
-pacman -S mingw-w64-ucrt-x86_64-{gtk4,vala,granite7,ninja,meson,nsis,gcc}
-pacman -S mingw-w64-libgee mingw-w64-gsettings-desktop-schemas
 pacman -S mingw-w64-x86_64-desktop-file-utils
+pacman -S mingw-w64-ucrt-x86_64-{gtk4,vala,ninja,meson,nsis,gcc}
+pacman -S mingw-w64-ucrt-x86_64-granite7
+pacman -S mingw-w64-libgee mingw-w64-gsettings-desktop-schemas
 pacman -S mingw-w64-x86_64-gtk-elementary-theme mingw-w64-x86_64-elementary-icon-theme
 pacman -S mingw-w64-ucrt-x86_64-vala mingw-w64-x86_64-vala
-pacman -S mingw-w64-x86_64-librsvg x86_64-w64-mingw32-windres
+pacman -S mingw-w64-x86_64-librsvg