mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge 4e023af58b into merged_master (Elements PR #899)
This commit is contained in:
commit
e40504244e
6 changed files with 6 additions and 30 deletions
|
|
@ -33,6 +33,7 @@ packages:
|
|||
# Elements
|
||||
- "icnsutils"
|
||||
- "imagemagick"
|
||||
- "librsvg2-2"
|
||||
- "librsvg2-bin"
|
||||
remotes:
|
||||
- "url": "https://github.com/ElementsProject/elements.git"
|
||||
|
|
@ -61,10 +62,6 @@ script: |
|
|||
mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
|
||||
fi
|
||||
|
||||
ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
|
||||
dpkg -x librsvg*.deb new-rsvg
|
||||
export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
|
||||
|
||||
# Use $LIB in LD_PRELOAD to avoid hardcoding the dir (See `man ld.so`)
|
||||
function create_global_faketime_wrappers {
|
||||
for prog in ${FAKETIME_PROGS}; do
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ packages:
|
|||
- "git"
|
||||
- "icnsutils"
|
||||
- "imagemagick"
|
||||
- "librsvg2-2"
|
||||
- "librsvg2-bin"
|
||||
- "pkg-config"
|
||||
- "autoconf"
|
||||
|
|
@ -62,10 +63,6 @@ script: |
|
|||
mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
|
||||
fi
|
||||
|
||||
ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
|
||||
dpkg -x librsvg*.deb new-rsvg
|
||||
export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
|
||||
|
||||
function create_global_faketime_wrappers {
|
||||
for prog in ${FAKETIME_PROGS}; do
|
||||
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ packages:
|
|||
- "icnsutils"
|
||||
- "pkg-config"
|
||||
- "autoconf"
|
||||
- "librsvg2-2"
|
||||
- "librsvg2-bin"
|
||||
- "libtiff-tools"
|
||||
- "libtool"
|
||||
|
|
@ -55,10 +56,6 @@ script: |
|
|||
|
||||
export ZERO_AR_DATE=1
|
||||
|
||||
ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
|
||||
dpkg -x librsvg*.deb new-rsvg
|
||||
export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
|
||||
|
||||
function create_global_faketime_wrappers {
|
||||
for prog in ${FAKETIME_PROGS}; do
|
||||
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ packages:
|
|||
- "git"
|
||||
- "icnsutils"
|
||||
- "imagemagick"
|
||||
- "librsvg2-2"
|
||||
- "librsvg2-bin"
|
||||
- "pkg-config"
|
||||
- "autoconf"
|
||||
|
|
@ -51,10 +52,6 @@ script: |
|
|||
mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
|
||||
fi
|
||||
|
||||
ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
|
||||
dpkg -x librsvg*.deb new-rsvg
|
||||
export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
|
||||
|
||||
function create_global_faketime_wrappers {
|
||||
for prog in ${FAKETIME_PROGS}; do
|
||||
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ packages:
|
|||
- "icnsutils"
|
||||
- "pkg-config"
|
||||
- "autoconf"
|
||||
- "librsvg2-2"
|
||||
- "librsvg2-bin"
|
||||
- "libtiff-tools"
|
||||
- "libtool"
|
||||
|
|
@ -56,10 +57,6 @@ script: |
|
|||
|
||||
export ZERO_AR_DATE=1
|
||||
|
||||
ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
|
||||
dpkg -x librsvg*.deb new-rsvg
|
||||
export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
|
||||
|
||||
# Use $LIB in LD_PRELOAD to avoid hardcoding the dir (See `man ld.so`)
|
||||
function create_global_faketime_wrappers {
|
||||
for prog in ${FAKETIME_PROGS}; do
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ packages:
|
|||
- "git"
|
||||
- "icnsutils"
|
||||
- "imagemagick"
|
||||
- "librsvg2-2"
|
||||
- "librsvg2-bin"
|
||||
- "pkg-config"
|
||||
- "autoconf"
|
||||
|
|
@ -51,10 +52,6 @@ script: |
|
|||
mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
|
||||
fi
|
||||
|
||||
ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
|
||||
dpkg -x librsvg*.deb new-rsvg
|
||||
export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
|
||||
|
||||
# Use $LIB in LD_PRELOAD to avoid hardcoding the dir (See `man ld.so`)
|
||||
function create_global_faketime_wrappers {
|
||||
for prog in ${FAKETIME_PROGS}; do
|
||||
|
|
@ -154,11 +151,5 @@ script: |
|
|||
cp -rf contrib/windeploy $BUILD_DIR
|
||||
cd $BUILD_DIR/windeploy
|
||||
mkdir unsigned
|
||||
<<<<<<< HEAD
|
||||
cp $OUTDIR/elements-*setup-unsigned.exe unsigned/
|
||||
||||||| ac21090f20
|
||||
cp $OUTDIR/bitcoin-*setup-unsigned.exe unsigned/
|
||||
=======
|
||||
cp ${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe unsigned/
|
||||
>>>>>>> 65fb3dfc8d
|
||||
find . | sort | tar --mtime="$REFERENCE_DATETIME" --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue