* temporarily removed conflicting patch, bumping to 94

This commit is contained in:
Dominika 2021-12-05 13:18:56 +01:00
parent 0be3fe7abb
commit 2a7c8af65f
2 changed files with 12 additions and 12 deletions

View file

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

View file

@ -7,7 +7,7 @@ set -e
srcdir=$1; srcdir=$1;
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
#_COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git'; #_COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git';
_COMMON_REPO='https://git.sakamoto.pl/domi/librewolf-common.git'; _COMMON_REPO='https://git.sakamoto.pl/domi/foxgirl-common.git';
_PKGVER_TAG="v${pkgver}-${pkgrel}" _PKGVER_TAG="v${pkgver}-${pkgrel}"
_COMMON_TAG=${COMMON_TAG:-${_PKGVER_TAG}} _COMMON_TAG=${COMMON_TAG:-${_PKGVER_TAG}}
_COMMON_DIR="${CI_PROJECT_DIR}"/common _COMMON_DIR="${CI_PROJECT_DIR}"/common
@ -206,7 +206,7 @@ patch -Np1 -i "${_PATCHES_DIR}/bookmarksbar.patch"
patch -Np1 -i "${_PATCHES_DIR}/smile.patch" patch -Np1 -i "${_PATCHES_DIR}/smile.patch"
patch -Np1 -i "${_PATCHES_DIR}/strings.patch" patch -Np1 -i "${_PATCHES_DIR}/strings.patch"
patch -Np1 -i "${_PATCHES_DIR}/view-page-info.patch" patch -Np1 -i "${_PATCHES_DIR}/view-page-info.patch"
patch -Np1 -i "${_PATCHES_DIR}/useragent-override.patch" #patch -Np1 -i "${_PATCHES_DIR}/useragent-override.patch"
echo '[]' > browser/components/newtab/data/content/tippytop/top_sites.json echo '[]' > browser/components/newtab/data/content/tippytop/top_sites.json
echo '[]' > browser/components/urlbar/content/preloaded-top-urls.json echo '[]' > browser/components/urlbar/content/preloaded-top-urls.json