wok-next rev 20656
spidermonkey: fix packaging; elinks: build with openssl10.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri May 04 15:50:36 2018 +0300 (2018-05-04) |
| parents | 471441bc00c3 |
| children | b863487b8e7a |
| files | elinks/receipt pm-utils/receipt pm-utils/stuff/grep-x.patch pm-utils/stuff/harddrive.patch pm-utils/stuff/patches/grep-x.patch pm-utils/stuff/patches/harddrive.patch pm-utils/stuff/patches/series spidermonkey/receipt |
line diff
1.1 --- a/elinks/receipt Fri May 04 14:33:10 2018 +0300 1.2 +++ b/elinks/receipt Fri May 04 15:50:36 2018 +0300 1.3 @@ -1,4 +1,4 @@ 1.4 -# SliTaz package receipt. 1.5 +# SliTaz package receipt v2. 1.6 1.7 PACKAGE="elinks" 1.8 VERSION="0.12pre6" 1.9 @@ -6,18 +6,18 @@ 1.10 SHORT_DESC="Full featured www text browser" 1.11 MAINTAINER="allan316@gmail.com" 1.12 LICENSE="GPL2" 1.13 +WEB_SITE="http://elinks.or.cz" 1.14 + 1.15 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.16 -WEB_SITE="http://elinks.or.cz" 1.17 WGET_URL="$WEB_SITE/download/$TARBALL" 1.18 -TAGS="web-browser" 1.19 1.20 -DEPENDS="openssl bzip2 spidermonkey zlib libidn expat gpm" 1.21 -BUILD_DEPENDS="openssl-dev bzip2-dev spidermonkey-dev zlib-dev libidn-dev \ 1.22 -expat-dev gpm-dev" 1.23 +BUILD_DEPENDS="openssl10-dev bzip2-dev spidermonkey-dev zlib-dev libidn-dev \ 1.24 +expat-dev gpm-dev gettext" 1.25 1.26 -# Rules to configure and make the package. 1.27 -compile_rules() 1.28 -{ 1.29 +compile_rules() { 1.30 + export CPPFLAGS="$CPPFLAGS -I/usr/include/openssl-1.0" 1.31 + export LDFLAGS="$LDFLAGS -L/usr/lib/openssl-1.0" 1.32 + 1.33 # --enable-fastmem: disables internal `malloc()` debugging and 1.34 # use `alloca()` wherever possible. 1.35 # --disable-backtrace disables internal backtrace code. 1.36 @@ -25,13 +25,15 @@ 1.37 --enable-fastmem \ 1.38 --disable-backtrace \ 1.39 --without-x \ 1.40 - $CONFIGURE_ARGS && 1.41 - make && make DESTDIR=$DESTDIR install 1.42 + --with-openssl \ 1.43 + --enable-88-colors \ 1.44 + $CONFIGURE_ARGS && 1.45 + make && 1.46 + make DESTDIR=$DESTDIR install 1.47 } 1.48 1.49 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.50 -genpkg_rules() 1.51 -{ 1.52 - mkdir -p $fs/usr 1.53 - cp -a $install/usr/bin $fs/usr 1.54 +genpkg_rules() { 1.55 + copy @std 1.56 + DEPENDS="bzlib expat libidn openssl10 spidermonkey zlib" 1.57 + TAGS="web-browser" 1.58 }
2.1 --- a/pm-utils/receipt Fri May 04 14:33:10 2018 +0300 2.2 +++ b/pm-utils/receipt Fri May 04 15:50:36 2018 +0300 2.3 @@ -7,47 +7,43 @@ 2.4 MAINTAINER="domcox@slitaz.org" 2.5 LICENSE="GPL2" 2.6 WEB_SITE="http://pm-utils.freedesktop.org/" 2.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/pm-utils.html" 2.8 2.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.10 -WGET_URL="http://pm-utils.freedesktop.org/releases/$TARBALL" 2.11 +WGET_URL="https://pm-utils.freedesktop.org/releases/$TARBALL" 2.12 + 2.13 +BUILD_DEPENDS="symlinks" 2.14 2.15 compile_rules() { 2.16 - # workaround grep -x not implemented in busybox 2.17 - patch -p1 pm/functions.in $stuff/grep-x.patch 2.18 - # remove acoustic management not implemented in busybox 2.19 - patch -p1 pm/power.d/harddrive $stuff/harddrive.patch 2.20 - 2.21 ./configure $CONFIGURE_ARGS && 2.22 make && 2.23 - make DESTDIR=$DESTDIR install 2.24 + make DESTDIR=$DESTDIR install || return 1 2.25 + 2.26 + # add video quirks 2.27 + cp -r $stuff/video-quirks $install/usr/lib/pm-utils/ 2.28 + 2.29 + fix symlinks 2.30 + 2.31 + ln -s pm-action.8 man/pm-suspend.8 2.32 + ln -s pm-action.8 man/pm-hibernate.8 2.33 + ln -s pm-action.8 man/pm-suspend-hybrid.8 2.34 + cook_pick_manpages man/*.1 man/*.8 2.35 } 2.36 2.37 genpkg_rules() { 2.38 - # main 2.39 - mkdir -p $fs/usr/lib 2.40 - cp -a $install/usr/bin $fs/usr 2.41 - cp -a $install/usr/sbin $fs/usr 2.42 - cp -a $install/usr/lib/pm-utils $fs/usr/lib 2.43 - 2.44 - # sysconfig 2.45 - mkdir -p $fs/etc 2.46 - cp -a $install/etc/pm $fs/etc 2.47 - 2.48 - # remove incompatible hooks 2.49 - # NetworkManager hook 2.50 + copy @std 2.51 + # remove incompatible hooks: 2.52 + # NetworkManager hook 2.53 rm -f $fs/usr/lib/pm-utils/sleep.d/55NetworkManager 2.54 - # grub hook (Redhat specific) 2.55 + # grub hook (Redhat specific) 2.56 rm -f $fs/usr/lib/pm-utils/sleep.d/01grub 2.57 - # readahead hook (not busybox compliant) 2.58 + # readahead hook (not busybox compliant) 2.59 rm -f $fs/usr/lib/pm-utils/power.d/readahead 2.60 - # sata_alpm (causes disk errors on many hardware) 2.61 + # sata_alpm (causes disk errors on many hardware) 2.62 rm -f $fs/usr/lib/pm-utils/power.d/sata_alpm 2.63 2.64 - # add video quirks 2.65 - cp -a $stuff/video-quirks $fs/usr/lib/pm-utils 2.66 - 2.67 DEPENDS="bash kbd" 2.68 - CONFIG_FILES="/etc/pm" 2.69 + CONFIG_FILES="/etc/pm/" 2.70 TAGS="power-management" 2.71 } 2.72
3.1 --- a/pm-utils/stuff/grep-x.patch Fri May 04 14:33:10 2018 +0300 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,27 +0,0 @@ 3.4 ---- functions.in.orig 3.5 -+++ functions.in.new 3.6 -@@ -215,8 +215,22 @@ 3.7 - for p in "$@"; do 3.8 - echo "$p" >> "$PARAMETERS.rm" 3.9 - done 3.10 -- # let grep do the dirty work. 3.11 -- grep -vxFf "$PARAMETERS.rm" "$PARAMETERS" > "$PARAMETERS.new" 3.12 -+ # let awk do the dirty work. 3.13 -+ cat "$PARAMETERS" | awk -v VAR="$(cat "$PARAMETERS.rm")" ' 3.14 -+ { 3.15 -+ del=0 3.16 -+ split(VAR,rm) 3.17 -+ for(i in rm) 3.18 -+ { 3.19 -+ if($1==rm[i]){ 3.20 -+ del++ 3.21 -+ } 3.22 -+ } 3.23 -+ if(del==0) 3.24 -+ { 3.25 -+ print $1 3.26 -+ } 3.27 -+ }' > "$PARAMETERS.new" 3.28 - fi 3.29 - cp -f "$PARAMETERS.new" "$PARAMETERS" 3.30 - }
4.1 --- a/pm-utils/stuff/harddrive.patch Fri May 04 14:33:10 2018 +0300 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,52 +0,0 @@ 4.4 ---- harddrive.orig 4.5 -+++ harddrive.new 4.6 -@@ -23,7 +23,7 @@ 4.7 - $0: Control hard drive spindown, write caching, 4.8 - power management and acoustic management. 4.9 - 4.10 --This hook has 8 tuneable parameters: 4.11 -+This hook has 6 tuneable parameters: 4.12 - DRIVE_SPINDOWN_VALUE_AC = time until a drive will spin down on AC 4.13 - Defaults to 0, which disables drive spindown. 4.14 - DRIVE_SPINDOWN_VALUE_BAT = time until a drive will spin down on battery 4.15 -@@ -45,14 +45,6 @@ 4.16 - 4.17 - See the -B option on the hdparm man page 4.18 - 4.19 --Drive acoustic management: 4.20 --DRIVE_ACOUSTIC_MGMT_AC = Drive Acoustic Management value on AC 4.21 --Defaults to 254 for max head speed. 4.22 --DRIVE_ACOUSTIC_MGMT_BAT = Drive Acoustic Management value on battery 4.23 --Defaults to 128 for max quietness. 4.24 -- 4.25 --See the -M option on the hdparm man page. 4.26 -- 4.27 - Drives to manage: 4.28 - DRIVE_LIST = the list of hard drives to manage. 4.29 - Defaults to "/dev/[hs]d[a-z]", which will manage up to the first 25 drives. 4.30 -@@ -62,8 +54,7 @@ 4.31 - 4.32 - harddrive_ac () { 4.33 - for dev in $DRIVE_LIST; do 4.34 -- # disable write caching, do not spin down the drive, disable APM 4.35 -- # and acoustic management, and sync everything to drive. 4.36 -+ # enable write caching, do not spin down the drive, disable APM 4.37 - printf "Disabling hard drive power management for %s..." "$dev" 4.38 - hdparm -W $DRIVE_WRITE_CACHE_AC \ 4.39 - -S $DRIVE_SPINDOWN_VALUE_AC \ 4.40 -@@ -75,12 +66,12 @@ 4.41 - 4.42 - harddrive_battery() { 4.43 - for dev in $DRIVE_LIST; do 4.44 -- # disable write caching, enable acoustic management 4.45 -+ # disable write caching, spin down the drive, enable APM 4.46 -+ # and sync everything to drive. 4.47 - printf "Enabling power management for %s..." "$dev" 4.48 - hdparm -W $DRIVE_WRITE_CACHE_BAT \ 4.49 - -S $DRIVE_SPINDOWN_VALUE_BAT \ 4.50 -- -B $DRIVE_POWER_MGMT_BAT \ 4.51 -- -M $DRIVE_ACOUSTIC_MGMT_BAT -F $dev >/dev/null 2>&1 \ 4.52 -+ -B $DRIVE_POWER_MGMT_BAT -f $dev >/dev/null 2>&1 \ 4.53 - && echo Done. || echo Failed. 4.54 - done 4.55 - }
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/pm-utils/stuff/patches/grep-x.patch Fri May 04 15:50:36 2018 +0300 5.3 @@ -0,0 +1,27 @@ 5.4 +--- a/pm/functions.in 5.5 ++++ b/pm/functions.in 5.6 +@@ -215,8 +215,22 @@ 5.7 + for p in "$@"; do 5.8 + echo "$p" >> "$PARAMETERS.rm" 5.9 + done 5.10 +- # let grep do the dirty work. 5.11 +- grep -vxFf "$PARAMETERS.rm" "$PARAMETERS" > "$PARAMETERS.new" 5.12 ++ # let awk do the dirty work. 5.13 ++ cat "$PARAMETERS" | awk -v VAR="$(cat "$PARAMETERS.rm")" ' 5.14 ++ { 5.15 ++ del=0 5.16 ++ split(VAR,rm) 5.17 ++ for(i in rm) 5.18 ++ { 5.19 ++ if($1==rm[i]){ 5.20 ++ del++ 5.21 ++ } 5.22 ++ } 5.23 ++ if(del==0) 5.24 ++ { 5.25 ++ print $1 5.26 ++ } 5.27 ++ }' > "$PARAMETERS.new" 5.28 + fi 5.29 + cp -f "$PARAMETERS.new" "$PARAMETERS" 5.30 + }
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/pm-utils/stuff/patches/harddrive.patch Fri May 04 15:50:36 2018 +0300 6.3 @@ -0,0 +1,52 @@ 6.4 +--- a/pm/power.d/harddrive 6.5 ++++ b/pm/power.d/harddrive 6.6 +@@ -23,7 +23,7 @@ 6.7 + $0: Control hard drive spindown, write caching, 6.8 + power management and acoustic management. 6.9 + 6.10 +-This hook has 8 tuneable parameters: 6.11 ++This hook has 6 tuneable parameters: 6.12 + DRIVE_SPINDOWN_VALUE_AC = time until a drive will spin down on AC 6.13 + Defaults to 0, which disables drive spindown. 6.14 + DRIVE_SPINDOWN_VALUE_BAT = time until a drive will spin down on battery 6.15 +@@ -45,14 +45,6 @@ 6.16 + 6.17 + See the -B option on the hdparm man page 6.18 + 6.19 +-Drive acoustic management: 6.20 +-DRIVE_ACOUSTIC_MGMT_AC = Drive Acoustic Management value on AC 6.21 +-Defaults to 254 for max head speed. 6.22 +-DRIVE_ACOUSTIC_MGMT_BAT = Drive Acoustic Management value on battery 6.23 +-Defaults to 128 for max quietness. 6.24 +- 6.25 +-See the -M option on the hdparm man page. 6.26 +- 6.27 + Drives to manage: 6.28 + DRIVE_LIST = the list of hard drives to manage. 6.29 + Defaults to "/dev/[hs]d[a-z]", which will manage up to the first 25 drives. 6.30 +@@ -62,8 +54,7 @@ 6.31 + 6.32 + harddrive_ac () { 6.33 + for dev in $DRIVE_LIST; do 6.34 +- # disable write caching, do not spin down the drive, disable APM 6.35 +- # and acoustic management, and sync everything to drive. 6.36 ++ # enable write caching, do not spin down the drive, disable APM 6.37 + printf "Disabling hard drive power management for %s..." "$dev" 6.38 + hdparm -W $DRIVE_WRITE_CACHE_AC \ 6.39 + -S $DRIVE_SPINDOWN_VALUE_AC \ 6.40 +@@ -75,12 +66,12 @@ 6.41 + 6.42 + harddrive_battery() { 6.43 + for dev in $DRIVE_LIST; do 6.44 +- # disable write caching, enable acoustic management 6.45 ++ # disable write caching, spin down the drive, enable APM 6.46 ++ # and sync everything to drive. 6.47 + printf "Enabling power management for %s..." "$dev" 6.48 + hdparm -W $DRIVE_WRITE_CACHE_BAT \ 6.49 + -S $DRIVE_SPINDOWN_VALUE_BAT \ 6.50 +- -B $DRIVE_POWER_MGMT_BAT \ 6.51 +- -M $DRIVE_ACOUSTIC_MGMT_BAT -F $dev >/dev/null 2>&1 \ 6.52 ++ -B $DRIVE_POWER_MGMT_BAT -f $dev >/dev/null 2>&1 \ 6.53 + && echo Done. || echo Failed. 6.54 + done 6.55 + }
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/pm-utils/stuff/patches/series Fri May 04 15:50:36 2018 +0300 7.3 @@ -0,0 +1,4 @@ 7.4 +# workaround grep -x not implemented in busybox 7.5 +grep-x.patch 7.6 +# remove acoustic management not implemented in busybox 7.7 +harddrive.patch
8.1 --- a/spidermonkey/receipt Fri May 04 14:33:10 2018 +0300 8.2 +++ b/spidermonkey/receipt Fri May 04 15:50:36 2018 +0300 8.3 @@ -14,6 +14,8 @@ 8.4 BUILD_DEPENDS="nspr-dev" 8.5 SPLIT="spidermonkey-dev" 8.6 8.7 +COOKOPTS="skip-log-errors" 8.8 + 8.9 compile_rules() { 8.10 cd $src/src 8.11 8.12 @@ -27,23 +29,18 @@ 8.13 export CFLAGS="${CFLAGS} -DJS_C_STRINGS_ARE_UTF8" 8.14 # build - threadsafe 8.15 make -j1 -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 \ 8.16 - DIST=$DESTDIR/usr all export 2>&1 | grep -v 'OBJ/nspr/Version' 8.17 + DIST=$DESTDIR/usr all export 8.18 } 8.19 8.20 genpkg_rules() { 8.21 case $PACKAGE in 8.22 spidermonkey) 8.23 - mkdir -p $fs/usr/lib 8.24 - 8.25 - cp -a $install/usr/bin $fs/usr 8.26 - cp -a $install/usr/lib/*so* $fs/usr/lib 8.27 + copy @std 8.28 DEPENDS="nspr" 8.29 TAGS="javascript" 8.30 ;; 8.31 *-dev) 8.32 - mkdir -p $fs/usr/lib $fs/usr/include/js 8.33 - cp -a $install/usr/include/js/* $fs/usr/include/js 8.34 - cp -a $install/usr/lib/*.*a $fs/usr/lib/ 8.35 + copy @dev 8.36 ;; 8.37 esac 8.38 }