v116.0.2-1

bump to v116.0-1
release v115.0.2-2
2023-08-09 09:30:54 +02:00 · 2023-08-02 00:43:35 +02:00 · 2023-07-12 14:51:03 +02:00 · 2023-07-12 13:40:27 +02:00 · 2023-07-10 15:33:14 +02:00 · 2023-07-09 22:55:22 +02:00
15 changed files with 89 additions and 179 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -15,21 +15,20 @@ Images:
    matrix:
      - DISTRO:
          - debian11
+          - debian12
          - ubuntu20
          - ubuntu22
          - mint20
          - mint21
          - fedora37
-          - fedora36
-          - macos-x86_64
-          - macos-aarch64
+          - fedora38
          - dind
-          - flatpak-appimage-x86_64
-          - flatpak-appimage-aarch64
  script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
+      registry.gitlab.com
    - make docker-$DISTRO
-    - docker push registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
+    - docker push
+      registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest

 Build:
  stage: build
@ -39,16 +38,13 @@ Build:
    matrix:
      - DISTRO:
          - debian11
+          - debian12
          - ubuntu20
          - ubuntu22
          - mint20
          - mint21
          - fedora37
-          - fedora36
-          - macos-x86_64
-          - macos-aarch64
-          - flatpak-appimage-x86_64
-          - flatpak-appimage-aarch64
+          - fedora38
  image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
  tags:
    - autoscale
@ -59,15 +55,13 @@ Build:
    - echo VERSION=$(cat version) >> variables.env
    - echo RELEASE=$(cat release) >> variables.env
    - echo SOURCE_RELEASE=$(cat source_release) >> variables.env
-    - "t=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
+    - "t=$(cat version)-$(cat source_release) ; if ! grep 1 release; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
  artifacts:
    paths:
      - librewolf-*.deb
      - librewolf-*.deb.sha256sum
      - librewolf-*.rpm
      - librewolf-*.rpm.sha256sum
-      - librewolf-*.dmg
-      - librewolf-*.dmg.sha256sum
      - librewolf-*-setup.exe
      - librewolf-*-setup.exe.sha256sum
      - librewolf-*-portable.zip
@ -90,7 +84,8 @@ Release:
  before_script:
    - apt-get update
    - apt-get install -y curl
-    - curl -L --output /usr/local/bin/release-cli "https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
+    - curl -L --output /usr/local/bin/release-cli
+      "https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
    - chmod +x /usr/local/bin/release-cli
  script:
    - |
@ -107,6 +102,8 @@ Release:

      upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb
      upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
+      upload_package librewolf-$FILEVER.en-US.debian12.x86_64.deb
+      upload_package librewolf-$FILEVER.en-US.debian12.x86_64.deb.sha256sum
      upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
      upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum
      upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb
@ -117,14 +114,11 @@ Release:
      upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
      upload_package librewolf-$FILEVER.fc37.x86_64.rpm
      upload_package librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
-      upload_package librewolf-$FILEVER.fc36.x86_64.rpm
-      upload_package librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
-      upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg
-      upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
-      upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg
-      upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum
+      upload_package librewolf-$FILEVER.fc38.x86_64.rpm
+      upload_package librewolf-$FILEVER.fc38.x86_64.rpm.sha256sum

      echo "Creating Codeberg release"
+      codeberg_release_body="${codeberg_release_body}\n[View on GitLab](https://gitlab.com/librewolf-community/browser/bsys5/-/releases/$FILEVER)"
      curl -X 'POST' \
        "https://codeberg.org/api/v1/repos/librewolf/bsys5/releases?token=$CODEBERG_TOKEN" \
        -H 'accept: application/json' \
@ -143,6 +137,10 @@ Release:
            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb",
            "distros": ["bullseye"]
          },
+          {
+            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb",
+            "distros": ["bookworm"]
+          },
          {
            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb",
            "distros": ["focal"]
@ -165,7 +163,7 @@ Release:
            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm"
          },
          {
-            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm"
+            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm"
          }
        ]
      }
@ -177,7 +175,10 @@ Release:
      echo "Submitted update request to LibreWolf Software Repository (https://updaterepos.librewolf.net/job?id=$id)"
  release:
    tag_name: "$FILEVER"
-    description: "## LibreWolf bsys5 Release v$FILEVER\n\n- \n\n(Built on GitLab by pipeline [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))"
+    description:
+      "## LibreWolf bsys5 Release v$FILEVER\n\n- \n\n(Built on GitLab by
+      pipeline
+      [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))"
    assets:
      links:
        - name: Debian 11 (deb)
@ -186,6 +187,12 @@ Release:
        - name: Debian 11 (sha256sum)
          link_type: other
          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
+        - name: Debian 12 (deb)
+          link_type: package
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb
+        - name: Debian 12 (sha256sum)
+          link_type: other
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb.sha256sum
        - name: Ubuntu 20 (deb)
          link_type: package
          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
@ -216,21 +223,9 @@ Release:
        - name: Fedora 37 (sha256sum)
          link_type: other
          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
-        - name: Fedora 36 (rpm)
+        - name: Fedora 38 (rpm)
          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm
-        - name: Fedora 36 (sha256sum)
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm
+        - name: Fedora 38 (sha256sum)
          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
-        - name: macOS x86_64 (dmg)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg
-        - name: macOS x86_64 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
-        - name: macOS aarch64 (dmg)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg
-        - name: macOS aarch64 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm.sha256sum
--- a/58
+++ b/58
@ -1,4 +1,4 @@
-.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora37 fedora37 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows flatpak-appimage flatpak-appimage-aarch64
+.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora37 fedora37 docker-fedora38 fedora38 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows

 version:=$(shell cat version)
 release:=$(shell cat release)
@ -13,21 +13,21 @@ help :
 	@echo "          [update] [prune]         - misc."
 	@echo ""
 	@echo "docker targets:" 
-	@echo "  [docker-debian11], [docker-mint20], [docker-mint21]"
+	@echo "  [docker-debian11], [docker-debian12],[docker-mint20], [docker-mint21]"
 	@echo "  [docker-ubuntu20], [docker-ubuntu21], [docker-ubuntu22]"
-	@echo "  [docker-fedora37], [docker-fedora36]"
+	@echo "  [docker-fedora37], [docker-fedora38]"
 	@echo "  [docker-macos-x86_64], [docker-macos-aarch64]"
 	@echo "  [docker-tumbleweed]"
 	@echo "  [docker-dind]"
-	@echo "  [docker-windows] [docker-flatpak-appimage-x86_64] [docker-flatpak-appimage-aarch64"
+	@echo "  [docker-windows]"
 	@echo ""
 	@echo "build targets:" 
-	@echo "  [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
+	@echo "  [debian11], [debian12], [mint20], [mint21], [ubuntu20], [ubuntu21]"
 	@echo "  [ubuntu22]"
-	@echo "  [fedora37], [fedora36]"
+	@echo "  [fedora37], [fedora38]"
 	@echo "  [macos-x64_64], [macos-aarch64]"
 	@echo "  [tumbleweed]"
-	@echo "  [windows] [flatpak-appimage-x86_64] [flatpak-appimage-aarch64]"
+	@echo "  [windows]"
 	@echo "  [tarball]"
 	@echo ""

@ -44,12 +44,14 @@ veryclean : clean
 prune :
 	docker system prune --all --force

-docker : docker-debian11 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora37 docker-fedora36 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
+docker : docker-debian11 docker-debian12 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora37 docker-fedora38 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind

 build :
 	${MAKE} clean
 	${MAKE} debian11
 	${MAKE} clean
+	${MAKE} debian12
+	${MAKE} clean
 	${MAKE} mint20
 	${MAKE} clean
 	${MAKE} mint21
@ -64,7 +66,7 @@ build :
 	${MAKE} clean
 	${MAKE} fedora37
 	${MAKE} clean
-	${MAKE} fedora36
+	${MAKE} fedora38
 	${MAKE} clean
 	${MAKE} tumbleweed
 	${MAKE} clean
@ -74,13 +76,10 @@ build :
 	${MAKE} clean
 	${MAKE} windows
 	${MAKE} clean
-	${MAKE} flatpak-appimage
-	${MAKE} clean
-	${MAKE} flatpak-appimage-aarch64
-	${MAKE} clean

 push :
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian12
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint20
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint21
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
@ -88,7 +87,7 @@ push :
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora37
-	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora36
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora38
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/tumbleweed
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
@ -96,6 +95,7 @@ push :

 rmi :
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian12
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint20
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint21
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
@ -103,7 +103,7 @@ rmi :
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora37
-	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora36
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora38
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/tumbleweed
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
@ -146,6 +146,12 @@ docker-debian11 :
 debian11 :
 	${MAKE} -f assets/linux.mk distro=debian11 build
 	${MAKE} -f assets/linux.artifacts.mk distro=debian11 artifacts-deb
+## debian12
+docker-debian12 :
+	${MAKE} -f assets/linux.mk distro=debian12 "distro_image=debian:bookworm" docker
+debian12 :
+	${MAKE} -f assets/linux.mk distro=debian12 build
+	${MAKE} -f assets/linux.artifacts.mk distro=debian12 artifacts-deb
 ## mint20
 docker-mint20 :
 	${MAKE} -f assets/linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
@ -182,12 +188,12 @@ docker-fedora37 :
 fedora37 :
 	${MAKE} -f assets/linux.mk distro=fedora37 build
 	${MAKE} -f assets/linux.artifacts.mk fc=fc37 distro=fedora37 artifacts-rpm
-## fedora36
-docker-fedora36 :
-	${MAKE} -f assets/linux.mk distro=fedora36 "distro_image=fedora:36" docker
-fedora36 :
-	${MAKE} -f assets/linux.mk distro=fedora36 build
-	${MAKE} -f assets/linux.artifacts.mk fc=fc36 distro=fedora36 artifacts-rpm
+## fedora38
+docker-fedora38 :
+	${MAKE} -f assets/linux.mk distro=fedora38 "distro_image=fedora:38" docker
+fedora38 :
+	${MAKE} -f assets/linux.mk distro=fedora38 build
+	${MAKE} -f assets/linux.artifacts.mk fc=fc38 distro=fedora38 artifacts-rpm
 ## opensuse tumbleweed
 docker-tumbleweed :
 	${MAKE} -f assets/linux.mk distro=tumbleweed "distro_image=opensuse/tumbleweed" docker
@ -224,16 +230,6 @@ docker-windows :
 windows :
 	${MAKE} -f assets/windows.mk build

-## flatpack-appimage
-docker-flatpak-appimage-x86_64 :
-	${MAKE} -f assets/flatpak-appimage.mk arch=x86_64 docker
-flatpak-appimage-x86_64 :
-	${MAKE} -f assets/flatpak-appimage.mk arch=x86_64 build
-docker-flatpak-appimage-aarch64 :
-	${MAKE} -f assets/flatpak-appimage.mk arch=aarch64 docker
-flatpak-appimage-aarch64 :
-	${MAKE} -f assets/flatpak-appimage.mk arch=aarch64 build
-
 #
 # Docker in Docker (for GitLab CI)
 #
--- a/README.md
+++ b/README.md
@ -12,10 +12,10 @@ scripts.
 | Platform                 | x86_64                  | aarch64            |
 | ------------------------ | ----------------------- | ------------------ |
 | Linux                    |                         |                    |
-| └─ Debian (deb)          | ✅ (debian11)           | -                  |
+| └─ Debian (deb)          | ✅ (debian11,debian12)  | -                  |
 | └─ Ubuntu (deb)          | ✅ (ubuntu20, ubuntu22) | -                  |
 | └─ Mint (deb)            | ✅ (mint20, mint21)     | -                  |
-| └─ Fedora (rpm)          | ✅ (fedora36, fedora37) | -                  |
+| └─ Fedora (rpm)          | ✅ (fedora38, fedora37) | -                  |
 | └─ openSUSE (rpm)        | ✅ (tumbleweed)         | -                  |
 | MacOS (dmg)              | ✅ (macos-x64_64)       | ✅ (macos-aarch64) |
 | Windows (setup,portable) | ✅ (windows)            | -                  |
--- a/assets/flatpak-appimage.Dockerfile
+++ b/assets/flatpak-appimage.Dockerfile
@ -1,54 +0,0 @@
-# $(arch)
-
-FROM debian:bullseye
-
-ARG arch=error
-
-ARG version=error
-ARG source_release=error
-
-# we use this wasi version
-ENV wasi_fullversion 14.0
-ENV wasi_mainversion 14
-
-
-
-# dependencies needed to run ./mach bootstrap
-RUN apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget build-essential libpython3-dev m4 unzip uuid zip libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb rsync
-
-# setup osx sdk
-RUN mkdir -p /osx-cross/MacOSX-SDKs &&\
-    cd /osx-cross/MacOSX-SDKs &&\
-    wget -q "https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.3.sdk.tar.xz" &&\
-    tar xf MacOSX11.3.sdk.tar.xz &&\
-    rm -f MacOSX11.3.sdk.tar.xz
-
-# run the bootstrap
-RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$version-$source_release/librewolf-$version-$source_release.source.tar.gz
-RUN tar xf librewolf-$version-$source_release.source.tar.gz
-WORKDIR librewolf-$version-$source_release
-RUN echo ac_add_options --target=$arch-apple-darwin > mozconfig
-RUN echo ac_add_options --enable-bootstrap >> mozconfig
-RUN echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX11.3.sdk >> mozconfig
-RUN MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser
-RUN ./mach artifact toolchain --from-build linux64-libdmg
-RUN ./mach artifact toolchain --from-build linux64-cctools-port
-RUN ./mach artifact toolchain --from-build linux64-hfsplus
-RUN ./mach artifact toolchain --from-build linux64-binutils
-RUN ./mach artifact toolchain --from-build sysroot-wasm32-wasi
-## RUN ./mach artifact toolchain --from-build linux64-clang-macosx-cross
-RUN /root/.cargo/bin/cargo install cbindgen
-RUN /root/.cargo/bin/rustup target add $arch-apple-darwin
-RUN cp -r binutils /root/.mozbuild
-RUN cp -r cctools /root/.mozbuild
-RUN cp -r sysroot-wasm32-wasi /root/.mozbuild
-## RUN cp -r clang /root/.mozbuild
-RUN cp -r dmg /root/.mozbuild
-RUN cp -r hfsplus-tools /root/.mozbuild
-RUN pip install testresources pycairo
-WORKDIR ..
-RUN rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz
-
-# our work happens here, on the host filesystem.
-WORKDIR /work
-VOLUME ["/work"]
--- a/assets/flatpak-appimage.mk
+++ b/assets/flatpak-appimage.mk
@ -1,30 +0,0 @@
-# $(arch)
-# $(use_docker)
-
-.PHONY : docker build
-
-version:=$(shell cat version)
-release:=$(shell cat release)
-source_release:=$(shell cat source_release)
-full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
-
-outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
-
-docker :
-	docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) - < assets/macos.Dockerfile
-
-build : $(outfile) $(outfile).sha256sum
-
-$(outfile) :
-	${MAKE} work
-	sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig
-ifeq ($(use_docker),false)
-	(cd work/librewolf-$(version)-$(source_release) && ./mach build && echo 'Packaging... (output hidden)' && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null)
-else
-	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && echo 'Packaging... (output hidden)' && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null"
-endif
-	cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile)
-
-$(outfile).sha256sum : $(outfile)
-	sha256sum $(outfile) > $(outfile).sha256sum
-	cat $(outfile).sha256sum
--- a/assets/linux.Dockerfile
+++ b/assets/linux.Dockerfile
@ -14,7 +14,7 @@ ENV TZ=Europe/Amsterdam


 # dependencies needed to run ./mach bootstrap
-RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget dpkg-sig ; true)
+RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget ; apt-get -y install dpkg-sig; true)
 RUN ( dnf -y upgrade && dnf -y install python3 python3-devel gcc wget rpm-build rpm-sign ; true)
 RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build ; true)

--- a/assets/linux.artifacts.mk
+++ b/assets/linux.artifacts.mk
@ -20,7 +20,7 @@ librewolf-$(full_version).en-US.$(distro).x86_64.deb : $(infile)
 	(cd work && tar xf ../$<)
 	cp -v assets/linux.build-deb.sh work/
 	[ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true
-	(cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > start-librewolf.desktop)
+	(cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > librewolf.desktop)
 ifeq ($(use_docker),false)
 	(cd work && bash linux.build-deb.sh $(full_version))
 else
@ -46,7 +46,7 @@ librewolf-$(full_version).$(fc).x86_64.rpm : $(infile)
 	cp -v release work
 	cp -v source_release work
 	cp -v assets/linux.librewolf.spec work/librewolf.spec
-	cp -v assets/linux.librewolf.desktop.in work/librewolf/start-librewolf.desktop.in
+	cp -v assets/linux.librewolf.desktop.in work/librewolf/librewolf.desktop.in
 	cp -v assets/linux.librewolf.ico work/librewolf/librewolf.ico
 	[ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true
 	rm -f work/librewolf/browser/features/proxy-failover@mozilla.com.xpi
@ -66,4 +66,3 @@ endif
 artifacts-rpm : $(infile) $(infile).sha256sum
 	sha256sum -c $(infile).sha256sum
 	${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(full_version).$(fc).x86_64.rpm
-
--- a/assets/linux.build-deb.sh
+++ b/assets/linux.build-deb.sh
@ -42,13 +42,13 @@ cp -v usr/share/librewolf/browser/chrome/icons/default/default16.png usr/share/i
 cp -v usr/share/librewolf/browser/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/librewolf.png
 cp -v usr/share/librewolf/browser/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/librewolf.png
 cp -v usr/share/librewolf/browser/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/librewolf.png
-cp -v ../start-librewolf.desktop usr/share/applications/start-librewolf.desktop
+cp -v ../librewolf.desktop usr/share/applications/librewolf.desktop

 cd ..
 dpkg-deb --build librewolf

-# Sign the deb file if private key is provided
-if [[ -f pk.asc ]]; then
+# Sign the deb file if private key is provided and we have dpkg-sig available
+if [[ -f pk.asc ]] && command -v dpkg-sig &>/dev/null; then
  gpg --import pk.asc
  dpkg-sig --sign builder librewolf.deb
 fi
--- a/assets/linux.build-rpm.sh
+++ b/assets/linux.build-rpm.sh
@ -43,6 +43,9 @@ rm -rf /usr/src && ln -sv /WORK /usr/src # Required for openSUSE
 sed "s/__VERSION__/$version/g" </work/librewolf.spec >/work/tmp.spec
 sed "s/__RELEASE__/$full_release/g" </work/tmp.spec >rpmbuild/SPECS/librewolf.spec

+# fix: remove some tool binaries we don't want
+rm -f /work/librewolf/{glxtest,vaapitest}
+
 # copy in the librewolf assets
 cp -rv /work/librewolf rpmbuild/SOURCES

@ -67,7 +70,7 @@ cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/defaul
 cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default32.png librewolf-$version/usr/share/icons/hicolor/32x32/apps/librewolf.png
 cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/hicolor/64x64/apps/librewolf.png
 cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default128.png librewolf-$version/usr/share/icons/hicolor/128x128/apps/librewolf.png
-sed "s/MYDIR/\/usr\/share\/librewolf/g" </work/librewolf/start-librewolf.desktop.in >librewolf-$version/usr/share/applications/librewolf.desktop
+sed "s/MYDIR/\/usr\/share\/librewolf/g" </work/librewolf/librewolf.desktop.in >librewolf-$version/usr/share/applications/librewolf.desktop

 tar cvfz lw.tar.gz librewolf-$version
 # todo perhaps: rm -rf librwolf-$version
--- a/assets/linux.librewolf.spec
+++ b/assets/linux.librewolf.spec
@ -61,6 +61,7 @@ cp -rv * "$RPM_BUILD_ROOT"
 /usr/share/librewolf/librewolf
 /usr/share/librewolf/librewolf-bin
 /usr/share/librewolf/librewolf.cfg
+/usr/share/librewolf/librewolf.desktop.in
 /usr/share/librewolf/librewolf.ico
 /usr/share/librewolf/libsmime3.so
 /usr/share/librewolf/libsoftokn3.so
@ -69,5 +70,3 @@ cp -rv * "$RPM_BUILD_ROOT"
 /usr/share/librewolf/omni.ja
 /usr/share/librewolf/platform.ini
 /usr/share/librewolf/plugin-container
-/usr/share/librewolf/start-librewolf.desktop.in
-
--- a/assets/macos.Dockerfile
+++ b/assets/macos.Dockerfile
@ -16,20 +16,21 @@ ENV wasi_mainversion 14
 # dependencies needed to run ./mach bootstrap
 RUN apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget build-essential libpython3-dev m4 unzip uuid zip libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb rsync

-# setup osx sdk
-RUN mkdir -p /osx-cross/MacOSX-SDKs &&\
-    cd /osx-cross/MacOSX-SDKs &&\
-    wget -q "https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.3.sdk.tar.xz" &&\
-    tar xf MacOSX11.3.sdk.tar.xz &&\
-    rm -f MacOSX11.3.sdk.tar.xz
+
+#
+# Setup MacOSX SDK v13.0
+RUN mkdir -p /osx-cross/MacOSX-SDKs && cd /osx-cross/MacOSX-SDKs && wget https://files.stanzabird.nl/MacOSX13.0.sdk.zip && unzip MacOSX13.0.sdk.zip && rm MacOSX13.0.sdk.zip
+

 # run the bootstrap
 RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$version-$source_release/librewolf-$version-$source_release.source.tar.gz
 RUN tar xf librewolf-$version-$source_release.source.tar.gz
 WORKDIR librewolf-$version-$source_release
+
 RUN echo ac_add_options --target=$arch-apple-darwin > mozconfig
 RUN echo ac_add_options --enable-bootstrap >> mozconfig
-RUN echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX11.3.sdk >> mozconfig
+RUN echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX13.0.sdk >> mozconfig
+
 RUN MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser
 RUN ./mach artifact toolchain --from-build linux64-libdmg
 RUN ./mach artifact toolchain --from-build linux64-cctools-port
@ -44,7 +45,7 @@ RUN cp -r cctools /root/.mozbuild
 RUN cp -r sysroot-wasm32-wasi /root/.mozbuild
 ## RUN cp -r clang /root/.mozbuild
 RUN cp -r dmg /root/.mozbuild
-RUN cp -r hfsplus-tools /root/.mozbuild
+# RUN cp -r hfsplus-tools /root/.mozbuild
 RUN pip install testresources pycairo
 WORKDIR ..
 RUN rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz
--- a/assets/macos.mozconfig
+++ b/assets/macos.mozconfig
@ -2,7 +2,7 @@ ac_add_options --enable-application=browser

 # for crosscompiling...
 ac_add_options --target=_ARCH_-apple-darwin
-ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX11.3.sdk
+ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX13.0.sdk

 CROSS_BUILD=1
 export CROSS=/root/.mozbuild
@ -22,7 +22,7 @@ export HOST_CC="$CROSS/clang/bin/clang"
 export HOST_CXX="$CROSS/clang/bin/clang++"

 # These are needed for packaging.
-export MKFSHFS="$CROSS/hfsplus-tools/newfs_hfs"
+# export MKFSHFS="$CROSS/hfsplus-tools/newfs_hfs"
 export DMG_TOOL="$CROSS/dmg/dmg"
 export HFS_TOOL="$CROSS/dmg/hfsplus"

--- a/submodules/windows
+++ b/submodules/windows
@ -1 +1 @@
-Subproject commit 33821c61665f96aaec2847c740c7e322b629d7da
+Subproject commit 70b155aca44a159c3a93430f283efd2df2381547
--- a/2
+++ b/2
@ -1 +1 @@
-110.0
+116.0.2
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit b3b007f1710ccfe2c9b6442f5f836a16af8b5acb
Author	SHA1	Message	Date
Bert van der Weerd	bdee933bb7	v116.0.2-1	2023-08-09 09:30:54 +02:00
Bert van der Weerd	cd229782af	bump to v116.0-1	2023-08-02 00:43:35 +02:00
Bert van der Weerd	cb0418a125	release v115.0.2-2	2023-07-12 14:51:03 +02:00
Bert van der Weerd	8f607da74f	v115.0.2-1 builds	2023-07-12 13:40:27 +02:00
Bert van der Weerd	ecbc75b72c	removed macOS from builds. v6 will now build macOS instead	2023-07-10 15:33:14 +02:00
Malte Jürgens	e6d0d3a00e	115.0.1-1	2023-07-09 22:55:22 +02:00
stanzabird	a09088b453	115.0	2023-07-08 20:10:06 +00:00
Bert van der Weerd	af044e3304	Merge branch 'master' of gitlab.com:librewolf-community/browser/bsys5	2023-06-23 13:21:36 +02:00
Bert van der Weerd	083f14d8c7	update to version 114.0.2-1	2023-06-23 13:21:26 +02:00
Malte Jürgens	f4dfbce94b	fix ci	2023-06-15 23:20:50 +02:00
Malte Jürgens	fa50ab2279	114.0.1-2-2	2023-06-12 19:02:42 +02:00
Malte Jürgens	8e511a8753	fix missing dpkg-sig	2023-06-12 19:02:02 +02:00
Malte Jürgens	b737e5783f	add debian 12 target	2023-06-11 10:30:37 +02:00
Bert van der Weerd	4070c5bdeb	bump to 114.0.1-2	2023-06-10 10:57:35 +02:00
Bert van der Weerd	e199efddca	bump version to 114.0.1-1	2023-06-10 01:35:54 +02:00
Bert van der Weerd	383f413bba	remove some tool binaries we dont want	2023-06-09 19:35:11 +02:00
Bert van der Weerd	1f6f06e9b4	bump version to 114.0-1	2023-06-09 12:55:45 +02:00
Bert van der Weerd	8d716372e7	bump to 113.02	2023-05-31 13:21:22 +02:00
Malte Jürgens	5b6e193b9a	add fedora38, remove fedora36	2023-05-28 10:15:46 +02:00
Bert van der Weerd	d8abb1279e	bump to version 113.0.1	2023-05-22 15:59:28 +02:00
Bert van der Weerd	a29404f692	fix merge conflict	2023-05-11 14:10:42 +02:00
Bert van der Weerd	ab018ea341	bump verison to 113.0-1	2023-05-11 14:09:19 +02:00
stanzabird	d3385ccd8f	Update 2 files - /source_release - /version	2023-04-30 11:24:34 +00:00
Malte Jürgens	9985e3de44	112.0.1-2	2023-04-19 01:21:11 +02:00
Bert van der Weerd	3aafd846ab	bump to 112.0-2	2023-04-17 13:06:16 +02:00
Malte Jürgens	7a4b5f652e	Merge branch 'rename-librewolf-desktop' into 'master' Rename start-librewolf.desktop to librewolf.desktop See merge request librewolf-community/browser/bsys5!17	2023-04-14 19:02:42 +00:00
Kelvin M. Klann	06af8517f2	Rename start-librewolf.desktop to librewolf.desktop So that it matches the executable name (/usr/bin/librewolf) and the filename used in the FAQ (librewolf.desktop)[1]. This also makes the filename consistent with the one used on other platforms (such as on Arch Linux[2]) and with what is used by Firefox (firefox.desktop). Commands used to search and replace: $ git grep -Flz start-librewolf.desktop \| xargs -0 -I '{}' sh -c \ "printf '%s\n' \"\$(sed \ 's/start-librewolf/librewolf/g' '{}')\" >'{}'" [1] `1c5a673547/pages/docs/faq.md` [2] `ecb7338cbe/librewolf.desktop` Fixes: https://github.com/netblue30/firejail/issues/5460	2023-04-11 17:52:04 -03:00
Bert van der Weerd	66b780ea0d	bump version to v112.0	2023-04-11 20:48:16 +02:00
Bert van der Weerd	4758ff2508	bump to v111.0.1	2023-03-22 16:28:37 +01:00
Bert van der Weerd	36b08ee7f0	bump to v111.0-3 for theming bug fix	2023-03-17 22:23:00 +01:00
Bert van der Weerd	f2d98eba7e	Now using private version of SDK 13.0	2023-03-16 23:03:33 +01:00
Bert van der Weerd	694cbfbc08	trying macosx64-sdk-toolchain	2023-03-16 13:15:54 +01:00
Bert van der Weerd	17a622c951	trying next artifact for SDK: macosx64-sdk-13.0	2023-03-16 13:07:26 +01:00
Bert van der Weerd	aef036119c	added ./mach artifact toolchain --from-build macosx64-sdk	2023-03-16 12:57:43 +01:00
Bert van der Weerd	63e9a7cafa	commented out SDK statments, testing if mach bootstrap grabs the SDK	2023-03-16 11:55:37 +01:00
Bert van der Weerd	2e2408a16a	Wed Mar 15 07:22:53 PM CET 2023	2023-03-15 19:22:53 +01:00
Bert van der Weerd	a6a221cc59	Wed Mar 15 07:12:02 PM CET 2023	2023-03-15 19:12:02 +01:00
Bert van der Weerd	829d1c8a36	now using sdk 13.0 instead of 11.3	2023-03-15 16:41:10 +01:00
Bert van der Weerd	18135d5494	bump version to 111.0	2023-03-15 16:16:05 +01:00
Malte Jürgens	004feab548	add gitlab link to codeberg release	2023-03-05 13:00:21 +01:00
Malte Jürgens	22acc65b52	110.0.1-1	2023-03-04 11:42:43 +01:00
Bert van der Weerd	9e9f913886	v110.0-2	2023-02-18 23:43:44 +01:00
stanzabird	9dc9e4ecd2	Merge branch 'fix-macos-images' into 'master' Fix macos images See merge request librewolf-community/browser/bsys5!15	2023-02-16 16:20:24 +00:00
Bert van der Weerd	8001d745da	Thu Feb 16 05:21:15 PM CET 2023	2023-02-16 17:21:15 +01:00
Bert van der Weerd	d28ed6123f	Thu Feb 16 05:19:07 PM CET 2023	2023-02-16 17:19:07 +01:00
stanzabird	5aa415ad6a	let's just try this for now	2023-02-16 13:17:59 +00:00
Bert van der Weerd	dff787bde5	Thu Feb 16 02:07:36 PM CET 2023	2023-02-16 14:07:36 +01:00
Bert van der Weerd	85949fec35	Thu Feb 16 02:06:01 PM CET 2023	2023-02-16 14:06:01 +01:00
Bert van der Weerd	d2bc452167	Thu Feb 16 01:49:34 PM CET 2023	2023-02-16 13:49:34 +01:00
Bert van der Weerd	0a0042c4b5	Thu Feb 16 01:48:26 PM CET 2023	2023-02-16 13:48:26 +01:00
Bert van der Weerd	0090a46403	Thu Feb 16 01:43:54 PM CET 2023	2023-02-16 13:43:54 +01:00
 @ -1 +1 @@
 .0
 .0.2
				`@ -0,0 +1 @@`
				`Subproject commit b3b007f1710ccfe2c9b6442f5f836a16af8b5acb`