[pacman-dev] [PATCH] RFC: remove upx and optipng support from makepkg

[Allan McRae]

These options were added before libmakepkg allowed passes like this to be
dropped in.  I prefer only real core packaging tasks to be included in
makepkg and additional things like this to be dropped in by a user or
distribution that wants to support them.

Signed-off-by: Allan McRae <allan at archlinux.org>
---

BAH!  I reluctently accepted the optipng patch before I split out
libmakepkg.  I never thought of removing it before it saw a release...

 scripts/Makefile.am                   |  2 --
 scripts/libmakepkg/tidy/optipng.sh.in | 44 ---------------------------------
 scripts/libmakepkg/tidy/upx.sh.in     | 46 -----------------------------------
 scripts/po/POTFILES.in                |  2 --
 4 files changed, 94 deletions(-)
 delete mode 100644 scripts/libmakepkg/tidy/optipng.sh.in
 delete mode 100644 scripts/libmakepkg/tidy/upx.sh.in

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index d660c0b..6f9abb8 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 4c07674..0000000
--- 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 at 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 f638335..0000000
--- 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 at 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/po/POTFILES.in b/scripts/po/POTFILES.in
index 3ac5a43..d115d89 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
-- 
2.7.0