git merge origin/master

.gitlab-ci.yml

@@ -23,6 +23,7 @@ Build:
     use_docker: "false"
   image: librewolf/bsys5-image-$DISTRO
   tags:
+    - amd64
     # Build on dedicated runner
     - dedicated
   except:
@@ -139,9 +140,12 @@ Release:
 
 Update Repositories:
   stage: deploy
-  image: curlimages/curl
   needs:
     - job: "Build"
-      artifacts: true
+    - job: "Release"
+  image: ubuntu
+  before_script:
+    - apt-get update
+    - apt-get install -y curl
   script:
-    - curl https://shorsh.de/update_lw_repos.php?version=$VERSION-$RELEASE&log=true&token=$REPO_DEPLOY_TOKEN
+    - curl https://shorsh.de/update_lw_repos.php?version=$(cat version)-$(cat release)&log=true&token=$REPO_DEPLOY_TOKEN

assets/linux.build-deb.sh

@@ -4,10 +4,12 @@ mv -v librewolf lwdist
 
 mkdir -p librewolf/DEBIAN
 cd librewolf/DEBIAN
- cat <<EOF > control
+cat <<EOF >control
 Architecture: all
 Build-Depends: inkscape, librsvg2-bin
-Depends: libc6, libgcc1, libstdc++6, wget
+Depends: lsb-release, libasound2 (>= 1.0.16), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.31), libcairo-gobject2 (>= 1.10.0), libcairo2 (>= 1.10.0), libdbus-1-3 (>= 1.9.14), libdbus-glib-1-2 (>= 0.78), libfontconfig1 (>= 2.12.6), libfreetype6 (>= 2.10.1), libgcc-s1 (>= 3.3), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.42), libgtk-3-0 (>= 3.14), libharfbuzz0b (>= 0.6.0), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libstdc++6 (>= 10), libx11-6, libx11-xcb1 (>= 2:1.6.9), libxcb-shm0, libxcb1, libxcomposite1 (>= 1:0.4.5), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6, libxrandr2 (>= 2:1.4.0), libxrender1, libxtst6
+Recommends: libcanberra0, libdbusmenu-glib4, libdbusmenu-gtk3-4
+Suggests: fonts-lyx
 Description: The Librewolf Browser
 Download-Size: 56.0 MB
 Essential: no
@@ -18,7 +20,7 @@ Priority: optional
 Provides: gnome-www-browser, www-browser, x-www-browser
 Section: web
 EOF
- echo "Version: $1-$2" >> control
+echo "Version: $1-$2" >>control
 cd ..
 
 mkdir -p usr/share/librewolf
@@ -42,5 +44,3 @@ dpkg-deb --build librewolf
 echo ""
 ls -lh librewolf.deb
 exit 0
-
-

assets/linux.librewolf.desktop.in

@@ -10,7 +10,7 @@ Type=Application
 MimeType=application/json;application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
 Comment=LibreWolf Browser
 Categories=Network;WebBrowser;Security;
-StartupWMClass=LibreWolf
+StartupWMClass=librewolf-default
 Exec=MYDIR/librewolf %u
 Icon=MYDIR/browser/chrome/icons/default/default64.png
 

assets/windows.Dockerfile

@@ -26,9 +26,15 @@ RUN true
 RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build
 RUN tar xf librewolf-$version-$source_release.source.tar.gz
 WORKDIR librewolf-$version-$source_release
-RUN    MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser
-RUN    /root/.cargo/bin/cargo install cbindgen
+RUN echo "ac_add_options --target=x86_64-pc-mingw32" > mozconfig
+RUN echo "ac_add_options --enable-bootstrap" > mozconfig
+RUN echo "" > mozconfig
+RUN MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser
+RUN /root/.cargo/bin/cargo install cbindgen
+RUN /root/.cargo/bin/rustup target add x86_64-pc-mingw32
 
+# not sure about this one..
+RUN pip install testresources pycairo
 
 # our work happens here, on the host filesystem.
 WORKDIR /work

release

@@ -1 +1 @@
-1
+2