From a13a33be736e43b3c59d4158496bb76551535b6e Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 2 Dec 2024 15:09:24 +0800 Subject: [PATCH] cpl/src/xx/build.sh: drop repo= --- compile/src/u-gtk/build.sh | 9 +++------ compile/src/u-misc/build.sh | 12 ++++-------- compile/src/v-feh/build.sh | 3 +-- compile/src/v-geany/build.sh | 3 +-- compile/src/v-lxde/build.sh | 6 ++---- compile/src/v-pcmanfm/build.sh | 9 +++------ compile/src/v-tint2/build.sh | 14 +++++--------- compile/src/v-xlunch/build.sh | 3 +-- compile/src/xcompmgr/build.sh | 6 ++---- 9 files changed, 22 insertions(+), 43 deletions(-) diff --git a/compile/src/u-gtk/build.sh b/compile/src/u-gtk/build.sh index bef6544b..69f9964a 100644 --- a/compile/src/u-gtk/build.sh +++ b/compile/src/u-gtk/build.sh @@ -8,8 +8,7 @@ function atk(){ ##@meson log "Downloading atk..." branch="--branch=ATK_2_35_1" #ATK_2_36_0 [2.35.1@ubt2004; 2.36.0@alpine315] branch="--branch=ATK_2_36_0" - repo=$GITHUB/GNOME/atk #nuaa> njuu - rm -rf /tmp/atk; git clone --depth=1 $branch $repo /tmp/atk + rm -rf /tmp/atk; git clone --depth=1 $branch $GITHUB/GNOME/atk /tmp/atk cd /tmp/atk # [44/53] Linking static target atk/libatk-1.0.a # [45/53] Linking target atk/libatk-1.0.so.0.23510.1 ##err attempted static link of dynamic object '/usr/lib/libglib-2.0.so' @@ -39,8 +38,7 @@ function gdk-pixbuf(){ ##@meson log "Downloading gdk-pixbuf..." branch="--branch=2.40.0" #2.42.8 [2.40.0@ubt2004; 2.42.8@alpine315] branch="--branch=2.42.8" - repo=$GITHUB/GNOME/gdk-pixbuf - rm -rf /tmp/gdk-pixbuf; git clone --depth=1 $branch $repo /tmp/gdk-pixbuf + rm -rf /tmp/gdk-pixbuf; git clone --depth=1 $branch $GITHUB/GNOME/gdk-pixbuf /tmp/gdk-pixbuf cd /tmp/gdk-pixbuf export LDFLAGS="-Wl,--as-needed -Wl,--strip-all" #同atk # ./autogen.sh @@ -90,8 +88,7 @@ function gtk(){ branch="--branch=2.24.32" #2.24.33 ##提示automake版本不符(过高) branch="--branch=2.24.33" # https://blog.csdn.net/weixin_46591962/article/details/132247425 - repo=$GITHUB/GNOME/gtk - rm -rf /tmp/gtk; git clone --depth=1 $branch $repo /tmp/gtk + rm -rf /tmp/gtk; git clone --depth=1 $branch $GITHUB/GNOME/gtk /tmp/gtk cd /tmp/gtk args="--disable-option-checking \ --disable-FEATURE \ diff --git a/compile/src/u-misc/build.sh b/compile/src/u-misc/build.sh index 77c487df..9d3e2e7c 100644 --- a/compile/src/u-misc/build.sh +++ b/compile/src/u-misc/build.sh @@ -8,8 +8,7 @@ function su_exec(){ log "Downloading SU-EXEC..." rm -rf /tmp/su-exec; # mkdir -p /tmp/su-exec # branch="--branch=$XLUNCH_VER" - repo=https://gitee.com/g-system/fk-su-exec - git clone --depth=1 $branch $repo /tmp/su-exec #; + git clone --depth=1 $branch https://gitee.com/g-system/fk-su-exec /tmp/su-exec #; log "Configuring SU-EXEC..." cd /tmp/su-exec #&& ./bootstrap; # ./configure --enable-static --prefix=$TARGETPATH ##无./configure|autoconf @@ -34,8 +33,7 @@ function lrzsz(){ log "Downloading LRZSZ..." rm -rf /tmp/lrzsz; # mkdir -p /tmp/lrzsz # branch="--branch=$LRZSZ_VER" - repo=https://gitee.com/g-system/fk-lrzsz - git clone --depth=1 $branch $repo /tmp/lrzsz #; + git clone --depth=1 $branch https://gitee.com/g-system/fk-lrzsz /tmp/lrzsz #; log "Configuring LRZSZ..." cd /tmp/lrzsz #&& ./bootstrap; autoconf @@ -66,8 +64,7 @@ function n2n(){ log "Downloading N2N..." rm -rf /tmp/n2n; # mkdir -p /tmp/n2n # branch="--branch=$N2N_VER" - repo=https://gitee.com/g-system/fk-lucktu-n2n - git clone --depth=1 $branch $repo /tmp/n2n #; + git clone --depth=1 $branch https://gitee.com/g-system/fk-lucktu-n2n /tmp/n2n #; log "Configuring N2N..." cd /tmp/n2n #&& ./bootstrap; bash autogen.sh @@ -116,8 +113,7 @@ function tinc(){ log "Downloading TINC..." rm -rf /tmp/tinc; # mkdir -p /tmp/tinc # branch="--branch=$TINC_VER" - repo=https://gitee.com/g-system/fk-tinc - git clone --depth=1 $branch $repo /tmp/tinc #; + git clone --depth=1 $branch https://gitee.com/g-system/fk-tinc /tmp/tinc #; log "Configuring TINC..." cd /tmp/tinc #&& ./bootstrap; autoreconf -if diff --git a/compile/src/v-feh/build.sh b/compile/src/v-feh/build.sh index 76dcb708..7d322c6a 100644 --- a/compile/src/v-feh/build.sh +++ b/compile/src/v-feh/build.sh @@ -17,8 +17,7 @@ function feh(){ # down_catfile ${FEH_URL} | tar -zx --strip 1 -C /tmp/fk-feh # branch="--branch=$FEH_VER" # repo=https://hub.nuaa.cf/Tomas-M/feh - repo=https://gitee.com/g-system/fk-feh - git clone --depth=1 $branch $repo /tmp/fk-feh #; + git clone --depth=1 $branch https://gitee.com/g-system/fk-feh /tmp/fk-feh #; log "Configuring FEH..." cd /tmp/fk-feh #&& ./bootstrap; deps1="-lXft -lX11 -lxcb -lXau -lfontconfig -lfreetype -lXrender -lXdmcp -lpng -lexpat -lxml2 -lz -lbz2 -lbrotlidec -lbrotlicommon" diff --git a/compile/src/v-geany/build.sh b/compile/src/v-geany/build.sh index ad6d2f5a..e84d4582 100644 --- a/compile/src/v-geany/build.sh +++ b/compile/src/v-geany/build.sh @@ -10,8 +10,7 @@ function geany(){ rm -rf /tmp/geany; # mkdir -p /tmp/geany # down_catfile ${GEANY_URL} | tar -zx --strip 1 -C /tmp/geany branch="--branch=1.3.1" - repo=$GITHUB/lxde/geany - rm -rf /tmp/geany; git clone --depth=1 $branch $repo /tmp/geany #; + rm -rf /tmp/geany; git clone --depth=1 $branch $GITHUB/lxde/geany /tmp/geany #; log "Configuring GEANY..." cd /tmp/geany #&& ./bootstrap; export LDFLAGS="-Wl,--strip-all -Wl,--as-needed" diff --git a/compile/src/v-lxde/build.sh b/compile/src/v-lxde/build.sh index ae250341..2090a554 100644 --- a/compile/src/v-lxde/build.sh +++ b/compile/src/v-lxde/build.sh @@ -12,9 +12,8 @@ function lxappearance(){ log "Downloading LXAPPEARANCE..." rm -rf /tmp/lxappearance; # mkdir -p /tmp/lxappearance # down_catfile ${LXAPPEARANCE_URL} | tar -zx --strip 1 -C /tmp/lxappearance - repo=$GITHUB/lxde/lxappearance # branch="--branch=$LXAPPEARANCE_VER" - git clone --depth=1 $branch $repo /tmp/lxappearance #; + git clone --depth=1 $branch $GITHUB/lxde/lxappearance /tmp/lxappearance #; log "Configuring LXAPPEARANCE..." cd /tmp/lxappearance #&& ./bootstrap; ./autogen.sh @@ -53,9 +52,8 @@ function lxtask(){ log "Downloading LXTASK..." rm -rf /tmp/lxtask; # mkdir -p /tmp/lxtask # down_catfile ${LXAPPEARANCE_URL} | tar -zx --strip 1 -C /tmp/lxtask - repo=$GITHUB/lxde/lxtask # branch="--branch=$LXAPPEARANCE_VER" - git clone --depth=1 $branch $repo /tmp/lxtask #; + git clone --depth=1 $branch $GITHUB/lxde/lxtask /tmp/lxtask #; log "Configuring LXTASK..." cd /tmp/lxtask #&& ./bootstrap; ./autogen.sh diff --git a/compile/src/v-pcmanfm/build.sh b/compile/src/v-pcmanfm/build.sh index 84048cee..bc0b2fba 100644 --- a/compile/src/v-pcmanfm/build.sh +++ b/compile/src/v-pcmanfm/build.sh @@ -53,8 +53,7 @@ function libfm(){ # down_catfile ${IMLIB2_URL} | tar -zx --strip 1 -C /tmp/libfm branch="--branch=1.3.1" #1.3.2 branch="--branch=1.3.2" # #ok with automake @alpine315 - repo=https://gitee.com/g-system/fk-libfm - rm -rf /tmp/libfm; git clone --depth=1 $branch $repo /tmp/libfm + rm -rf /tmp/libfm; git clone --depth=1 $branch https://gitee.com/g-system/fk-libfm /tmp/libfm cd /tmp/libfm # attempted static link of dynamic object `/usr/lib/libmenu-cache.so' #ref_pcmanfm.md>> # 改动态编译：OK @@ -99,8 +98,7 @@ function menu-cache(){ ##依赖libfm-extra @libfm log "Downloading menu-cache..." # branch="--branch=1.1.0" #default master [1.1.0:294commits@ubt2004; master:297commits@ff] # repo=$GITHUB/lxde/menu-cache - repo=https://gitee.com/g-system/fk-menu-cache - rm -rf /tmp/menu-cache; git clone --depth=1 $branch $repo /tmp/menu-cache + rm -rf /tmp/menu-cache; git clone --depth=1 $branch https://gitee.com/g-system/fk-menu-cache /tmp/menu-cache cd /tmp/menu-cache # attempted static link of dynamic object `/usr/local/lib/libfm-extra.so' export LDFLAGS="-Wl,--strip-all -Wl,--as-needed" @@ -156,8 +154,7 @@ function pcmanfm(){ rm -rf /tmp/pcmanfm; # mkdir -p /tmp/pcmanfm # down_catfile ${PCMANFM_URL} | tar -zx --strip 1 -C /tmp/pcmanfm branch="--branch=1.3.1" - repo=$GITHUB/lxde/pcmanfm - rm -rf /tmp/pcmanfm; git clone --depth=1 $branch $repo /tmp/pcmanfm #; + rm -rf /tmp/pcmanfm; git clone --depth=1 $branch $GITHUB/lxde/pcmanfm /tmp/pcmanfm #; log "Configuring PCMANFM..." cd /tmp/pcmanfm #&& ./bootstrap; export LDFLAGS="-Wl,--strip-all -Wl,--as-needed" diff --git a/compile/src/v-tint2/build.sh b/compile/src/v-tint2/build.sh index 170abea3..daea4626 100644 --- a/compile/src/v-tint2/build.sh +++ b/compile/src/v-tint2/build.sh @@ -14,7 +14,6 @@ function libcroco(){ mkdir -p /tmp/libcroco log "Downloading libcroco..." - # repo= # rm -rf /tmp/libcroco; git clone --depth=1 $branch $repo /tmp/libcroco # cd /tmp/libcroco down_catfile ${LIBCROCO_URL} | tar -Jx --strip 1 -C /tmp/libcroco @@ -63,9 +62,8 @@ function librsvg(){ log "Downloading librsvg..." # git clone $GITHUB/GNOME/librsvg # git checkout 2.40.21 #2.50.7 - repo=$GITHUB/GNOME/librsvg branch="--branch=2.40.21" - rm -rf /tmp/librsvg; git clone --depth=1 $branch $repo /tmp/librsvg + rm -rf /tmp/librsvg; git clone --depth=1 $branch $GITHUB/GNOME/librsvg /tmp/librsvg cd /tmp/librsvg ./autogen.sh ./configure --enable-static @@ -81,8 +79,7 @@ function librsvg(){ # [xcb-util] function xcbutil(){ log "Downloading xcb_util..." - repo=$GITHUB/freedesktop-unofficial-mirror/xcb__util - rm -rf /tmp/xcb-util; git clone --depth=1 $branch $repo /tmp/xcb-util + rm -rf /tmp/xcb-util; git clone --depth=1 $branch $GITHUB/freedesktop-unofficial-mirror/xcb__util /tmp/xcb-util cd /tmp/xcb-util # git clone $GITHUB/freedesktop-unofficial-mirror/xcb__util # cd xcb__util/ @@ -107,8 +104,7 @@ function xcbutil(){ function libxi(){ # git clone https://hub.yzuu.cf/aleax/libxi log "Downloading libxi..." - repo=$GITHUB/aleax/libxi - rm -rf /tmp/libxi; git clone --depth=1 $branch $repo /tmp/libxi + rm -rf /tmp/libxi; git clone --depth=1 $branch $GITHUB/aleax/libxi /tmp/libxi cd /tmp/libxi ./autogen.sh ./configure --enable-static --disable-shared #disable dyn; @@ -195,8 +191,8 @@ function tint2(){ rm -rf /tmp/tint2; # mkdir -p /tmp/tint2 # down_catfile ${TINT2_URL} | tar -zx --strip 1 -C /tmp/tint2 branch="--branch=16.1" - repo=$GITHUB/o9000/tint2 - rm -rf /tmp/tint2; git clone --depth=1 $branch $repo /tmp/tint2 #; + # repo=$GITHUB/o9000/tint2 + rm -rf /tmp/tint2; git clone --depth=1 $branch $GITHUB/o9000/tint2 /tmp/tint2 #; log "Configuring TINT2..." cd /tmp/tint2 #&& ./bootstrap; # sed -i "s^bash extra/genentries^#bash extra/genentries^g" Makefile diff --git a/compile/src/v-xlunch/build.sh b/compile/src/v-xlunch/build.sh index 649c7ecb..2f4d10b4 100644 --- a/compile/src/v-xlunch/build.sh +++ b/compile/src/v-xlunch/build.sh @@ -57,8 +57,7 @@ function xlunch(){ # down_catfile ${XLUNCH_URL} | tar -zx --strip 1 -C /tmp/xlunch # branch="--branch=$XLUNCH_VER" # repo=https://hub.nuaa.cf/Tomas-M/xlunch - repo=https://gitee.com/g-system/fk-xlunch - git clone --depth=1 $branch $repo /tmp/xlunch #; + git clone --depth=1 $branch https://gitee.com/g-system/fk-xlunch /tmp/xlunch #; log "Configuring XLUNCH..." cd /tmp/xlunch #&& ./bootstrap; # ./configure --enable-static --prefix=$TARGETPATH ##无./configure|autoconf diff --git a/compile/src/xcompmgr/build.sh b/compile/src/xcompmgr/build.sh index 1df238b4..c181add8 100644 --- a/compile/src/xcompmgr/build.sh +++ b/compile/src/xcompmgr/build.sh @@ -8,8 +8,7 @@ function Xdamage(){ # curl -# -L -f ${IMLIB2_URL} | tar -xJ --strip 1 -C /tmp/Xdamage # down_catfile ${IMLIB2_URL} | tar -zx --strip 1 -C /tmp/Xdamage # repo=https://hub.nuaa.cf/cubanismo/libXdamage - repo=https://gitee.com/g-system/fk-lib-xdamage - git clone --depth=1 $branch $repo /tmp/Xdamage + git clone --depth=1 $branch https://gitee.com/g-system/fk-lib-xdamage /tmp/Xdamage cd /tmp/Xdamage ./autogen.sh ./configure; @@ -35,8 +34,7 @@ function xcompmgr(){ rm -rf /tmp/xcompmgr; # mkdir -p /tmp/xcompmgr # down_catfile ${XCOMPMGR_URL} | tar -zx --strip 1 -C /tmp/xcompmgr # branch="--branch=$XCOMPMGR_VER" - repo=https://gitee.com/g-system/fk-xcompmgr - git clone --depth=1 $branch $repo /tmp/xcompmgr #; + git clone --depth=1 $branch https://gitee.com/g-system/fk-xcompmgr /tmp/xcompmgr #; log "Configuring XCOMPMGR..." cd /tmp/xcompmgr #&& ./bootstrap; bash autogen.sh