| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/libmakepkg/tidy/optipng.sh.in | 44 | ||||
| -rw-r--r-- | scripts/libmakepkg/tidy/upx.sh.in | 46 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 16 | ||||
| -rw-r--r-- | scripts/po/POTFILES.in | 2 |
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d660c0b9..6f9abb86 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -85,11 +85,9 @@ LIBMAKEPKG_IN = \ libmakepkg/tidy/docs.sh \ libmakepkg/tidy/emptydirs.sh \ libmakepkg/tidy/libtool.sh \ - libmakepkg/tidy/optipng.sh \ libmakepkg/tidy/purge.sh \ libmakepkg/tidy/staticlibs.sh \ libmakepkg/tidy/strip.sh \ - libmakepkg/tidy/upx.sh \ libmakepkg/tidy/zipman.sh \ libmakepkg/util.sh \ libmakepkg/util/pkgbuild.sh \ diff --git a/scripts/libmakepkg/tidy/optipng.sh.in b/scripts/libmakepkg/tidy/optipng.sh.in deleted file mode 100644 index 4c07674d..00000000 --- a/scripts/libmakepkg/tidy/optipng.sh.in +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# optipng.sh - Compress PNG files using optpng -# -# Copyright (c) 2015-2016 Pacman Development Team <pacman-dev@archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -[[ -n "$LIBMAKEPKG_TIDY_OPTIPNG_SH" ]] && return -LIBMAKEPKG_TIDY_OPTIPNG_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" -source "$LIBRARY/util/option.sh" - - -packaging_options+=('optipng') -tidy_modify+=('tidy_optipng') - -tidy_optipng() { - if check_option "optipng" "y"; then - msg2 "$(gettext "Optimizing PNG images...")" - local png - find . -type f -iname "*.png" 2>/dev/null | while read -r png ; do - if [[ $(file --brief --mime-type "$png") = 'image/png' ]]; then - optipng "${OPTIPNGFLAGS[@]}" "$png" &>/dev/null || - warning "$(gettext "Could not optimize PNG image : %s")" "${png/$pkgdir\//}" - fi - done - fi -} diff --git a/scripts/libmakepkg/tidy/upx.sh.in b/scripts/libmakepkg/tidy/upx.sh.in deleted file mode 100644 index f6383350..00000000 --- a/scripts/libmakepkg/tidy/upx.sh.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# -# upx.sh - Compress package binaries with UPX -# -# Copyright (c) 2011-2016 Pacman Development Team <pacman-dev@archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -[[ -n "$LIBMAKEPKG_TIDY_UPX_SH" ]] && return -LIBMAKEPKG_TIDY_UPX_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" -source "$LIBRARY/util/option.sh" - - -packaging_options+=('upx') -tidy_modify+=('tidy_upx') - -tidy_upx() { - if check_option "upx" "y"; then - msg2 "$(gettext "Compressing binaries with %s...")" "UPX" - local binary - find . -type f -perm -u+w 2>/dev/null | while read -r binary ; do - case "$(file --brief --mime-type "$binary")" in - 'application/x-executable' | 'application/x-dosexec') - upx "${UPXFLAGS[@]}" "$binary" &>/dev/null || - warning "$(gettext "Could not compress binary : %s")" "${binary/$pkgdir\//}" - ;; - esac - done - fi -} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8d20e25d..5b4811f1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1556,22 +1556,6 @@ check_software() { fi fi - # upx - binary compression - if check_option "upx" "y"; then - if ! type -p upx >/dev/null; then - error "$(gettext "Cannot find the %s binary required for compressing binaries.")" "upx" - ret=1 - fi - fi - - # optipng - PNG image optimization - if check_option "optipng" "y"; then - if ! type -p optipng >/dev/null; then - error "$(gettext "Cannot find the %s binary required for optimizing PNG images.")" "optipng" - ret=1 - fi - fi - # distcc - compilation with distcc if check_buildoption "distcc" "y"; then if ! type -p distcc >/dev/null; then diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 3ac5a438..d115d89b 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -40,11 +40,9 @@ scripts/libmakepkg/tidy.sh.in scripts/libmakepkg/tidy/docs.sh.in scripts/libmakepkg/tidy/emptydirs.sh.in scripts/libmakepkg/tidy/libtool.sh.in -scripts/libmakepkg/tidy/optipng.sh.in scripts/libmakepkg/tidy/purge.sh.in scripts/libmakepkg/tidy/staticlibs.sh.in scripts/libmakepkg/tidy/strip.sh.in -scripts/libmakepkg/tidy/upx.sh.in scripts/libmakepkg/tidy/zipman.sh.in scripts/libmakepkg/util/message.sh scripts/libmakepkg/util/source.sh.in |