switching CI, adding new patches

.gitlab-ci.yml

@@ -9,24 +9,24 @@ variables:
   # AARCH64: $AARCH64
   # X86_64: $X86_64
 
-#tarball_x86_64:
-#  image: ghcr.io/void-linux/void-linux:latest-thin-bb-x86_64
-#  stage: build
-#  script:
-#    - xbps-install -Sy bash
-#    - bash ./build_tarball.sh "${CI_PROJECT_DIR}/LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
-#  artifacts:
-#    name: "Librewolf-Tarball-${pkgver}-${pkgrel}-${CARCH}"
-#    paths:
-#      - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
-
-tarball_x86_64_musl:
-  image: ghcr.io/void-linux/void-linux:latest-thin-bb-x86_64-musl
+tarball_x86_64:
+  image: ghcr.io/void-linux/void-linux:latest-thin-bb-x86_64
   stage: build
   script:
     - xbps-install -Sy bash
-    - bash ./build_tarball.sh "${CI_PROJECT_DIR}/LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
+    - bash ./build_tarball.sh "${CI_PROJECT_DIR}/Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
   artifacts:
-    name: "Librewolf-Tarball-${pkgver}-${pkgrel}-${CARCH}"
+    name: "Foxgirl-${pkgver}-${pkgrel}-${CARCH}"
     paths:
-      - "LibreWolf-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
+      - "Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
+
+#tarball_x86_64_musl:
+#  image: ghcr.io/void-linux/void-linux:latest-thin-bb-x86_64-musl
+#  stage: build
+#  script:
+#    - xbps-install -Sy bash
+#    - bash ./build_tarball.sh "${CI_PROJECT_DIR}/Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"
+#  artifacts:
+#    name: "Foxgirl-${pkgver}-${pkgrel}-${CARCH}_musl"
+#    paths:
+#      - "Foxgirl-${pkgver}-${pkgrel}.${CARCH}.tar.bz2"

scripts/3_Configure_Source_Code.sh

@@ -196,7 +196,10 @@ patch -Np1 -i ${_PATCHES_DIR}/about-dialog.patch
 # created directories
 patch -Np1 -i ${_PATCHES_DIR}/mozilla_dirs.patch
 
+# Foxgirl-specific patches
 patch -Np1 -i "${_PATCHES_DIR}/urlbar.patch"
+patch -Np1 -i "${_PATCHES_DIR}/icons.patch"
 patch -Np1 -i "${_PATCHES_DIR}/wordmark.patch"
+patch -Np1 -i "${_PATCHES_DIR}/css.patch"
 
 rm -rf common