[1/6] libart: Removal from IPFire

Message ID 20220407110449.1923450-1-adolf.belka@ipfire.org
State Accepted
Commit 758162bdc4f5d58cd10afd3f5efbdf7a3034b5b8
Headers
Series [1/6] libart: Removal from IPFire |

Commit Message

Adolf Belka April 7, 2022, 11:04 a.m. UTC
  Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/libart | 53 -----------------------
 lfs/libart                     | 78 ----------------------------------
 make.sh                        |  1 -
 3 files changed, 132 deletions(-)
 delete mode 100644 config/rootfiles/common/libart
 delete mode 100644 lfs/libart
  

Comments

Michael Tremer April 7, 2022, 3:54 p.m. UTC | #1
Acked-by: Michael Tremer <michael.tremer@ipfire.org>

> On 7 Apr 2022, at 12:04, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
> config/rootfiles/common/libart | 53 -----------------------
> lfs/libart                     | 78 ----------------------------------
> make.sh                        |  1 -
> 3 files changed, 132 deletions(-)
> delete mode 100644 config/rootfiles/common/libart
> delete mode 100644 lfs/libart
> 
> diff --git a/config/rootfiles/common/libart b/config/rootfiles/common/libart
> deleted file mode 100644
> index 7e98a600d..000000000
> --- a/config/rootfiles/common/libart
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -#usr/bin/libart2-config
> -#usr/include/libart-2.0
> -#usr/include/libart-2.0/libart_lgpl
> -#usr/include/libart-2.0/libart_lgpl/art_affine.h
> -#usr/include/libart-2.0/libart_lgpl/art_alphagamma.h
> -#usr/include/libart-2.0/libart_lgpl/art_bpath.h
> -#usr/include/libart-2.0/libart_lgpl/art_config.h
> -#usr/include/libart-2.0/libart_lgpl/art_filterlevel.h
> -#usr/include/libart-2.0/libart_lgpl/art_gray_svp.h
> -#usr/include/libart-2.0/libart_lgpl/art_misc.h
> -#usr/include/libart-2.0/libart_lgpl/art_pathcode.h
> -#usr/include/libart-2.0/libart_lgpl/art_pixbuf.h
> -#usr/include/libart-2.0/libart_lgpl/art_point.h
> -#usr/include/libart-2.0/libart_lgpl/art_rect.h
> -#usr/include/libart-2.0/libart_lgpl/art_rect_svp.h
> -#usr/include/libart-2.0/libart_lgpl/art_rect_uta.h
> -#usr/include/libart-2.0/libart_lgpl/art_render.h
> -#usr/include/libart-2.0/libart_lgpl/art_render_gradient.h
> -#usr/include/libart-2.0/libart_lgpl/art_render_mask.h
> -#usr/include/libart-2.0/libart_lgpl/art_render_svp.h
> -#usr/include/libart-2.0/libart_lgpl/art_rgb.h
> -#usr/include/libart-2.0/libart_lgpl/art_rgb_a_affine.h
> -#usr/include/libart-2.0/libart_lgpl/art_rgb_affine.h
> -#usr/include/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
> -#usr/include/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
> -#usr/include/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
> -#usr/include/libart-2.0/libart_lgpl/art_rgb_svp.h
> -#usr/include/libart-2.0/libart_lgpl/art_rgba.h
> -#usr/include/libart-2.0/libart_lgpl/art_svp.h
> -#usr/include/libart-2.0/libart_lgpl/art_svp_intersect.h
> -#usr/include/libart-2.0/libart_lgpl/art_svp_ops.h
> -#usr/include/libart-2.0/libart_lgpl/art_svp_point.h
> -#usr/include/libart-2.0/libart_lgpl/art_svp_render_aa.h
> -#usr/include/libart-2.0/libart_lgpl/art_svp_vpath.h
> -#usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
> -#usr/include/libart-2.0/libart_lgpl/art_svp_wind.h
> -#usr/include/libart-2.0/libart_lgpl/art_uta.h
> -#usr/include/libart-2.0/libart_lgpl/art_uta_ops.h
> -#usr/include/libart-2.0/libart_lgpl/art_uta_rect.h
> -#usr/include/libart-2.0/libart_lgpl/art_uta_svp.h
> -#usr/include/libart-2.0/libart_lgpl/art_uta_vpath.h
> -#usr/include/libart-2.0/libart_lgpl/art_vpath.h
> -#usr/include/libart-2.0/libart_lgpl/art_vpath_bpath.h
> -#usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h
> -#usr/include/libart-2.0/libart_lgpl/art_vpath_svp.h
> -#usr/include/libart-2.0/libart_lgpl/libart-features.h
> -#usr/include/libart-2.0/libart_lgpl/libart.h
> -#usr/lib/libart_lgpl_2.a
> -#usr/lib/libart_lgpl_2.la
> -usr/lib/libart_lgpl_2.so
> -usr/lib/libart_lgpl_2.so.2
> -usr/lib/libart_lgpl_2.so.2.3.21
> -#usr/lib/pkgconfig/libart-2.0.pc
> diff --git a/lfs/libart b/lfs/libart
> deleted file mode 100644
> index b5f463683..000000000
> --- a/lfs/libart
> +++ /dev/null
> @@ -1,78 +0,0 @@
> -###############################################################################
> -#                                                                             #
> -# IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.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 3 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/>.       #
> -#                                                                             #
> -###############################################################################
> -
> -###############################################################################
> -# Definitions
> -###############################################################################
> -
> -include Config
> -
> -VER        = 2.3.21
> -
> -THISAPP    = libart_lgpl-$(VER)
> -DL_FILE    = $(THISAPP).tar.bz2
> -DL_FROM    = $(URL_IPFIRE)
> -DIR_APP    = $(DIR_SRC)/$(THISAPP)
> -TARGET     = $(DIR_INFO)/$(THISAPP)
> -
> -###############################################################################
> -# Top-level Rules
> -###############################################################################
> -
> -objects = $(DL_FILE)
> -
> -$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> -
> -$(DL_FILE)_BLAKE2 = 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b
> -
> -install : $(TARGET)
> -
> -check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> -
> -download :$(patsubst %,$(DIR_DL)/%,$(objects))
> -
> -b2 : $(subst %,%_BLAKE2,$(objects))
> -
> -###############################################################################
> -# Downloading, checking, b2sum
> -###############################################################################
> -
> -$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> -	@$(CHECK)
> -
> -$(patsubst %,$(DIR_DL)/%,$(objects)) :
> -	@$(LOAD)
> -
> -$(subst %,%_BLAKE2,$(objects)) :
> -	@$(B2SUM)
> -
> -###############################################################################
> -# Installation Details
> -###############################################################################
> -
> -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> -	@$(PREBUILD)
> -	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
> -	$(UPDATE_AUTOMAKE)
> -	cd $(DIR_APP) && ./configure --prefix=/usr
> -	cd $(DIR_APP) && make $(MAKETUNING)
> -	cd $(DIR_APP) && make install
> -	@rm -rf $(DIR_APP)
> -	@$(POSTBUILD)
> diff --git a/make.sh b/make.sh
> index 95e6e89db..21d385d78 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1331,7 +1331,6 @@ buildipfire() {
>   lfsmake2 libexif
>   lfsmake2 libpng
>   lfsmake2 libtiff
> -  lfsmake2 libart
>   lfsmake2 gd
>   lfsmake2 slang
>   lfsmake2 newt
> -- 
> 2.35.1
>
  

Patch

diff --git a/config/rootfiles/common/libart b/config/rootfiles/common/libart
deleted file mode 100644
index 7e98a600d..000000000
--- a/config/rootfiles/common/libart
+++ /dev/null
@@ -1,53 +0,0 @@ 
-#usr/bin/libart2-config
-#usr/include/libart-2.0
-#usr/include/libart-2.0/libart_lgpl
-#usr/include/libart-2.0/libart_lgpl/art_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_alphagamma.h
-#usr/include/libart-2.0/libart_lgpl/art_bpath.h
-#usr/include/libart-2.0/libart_lgpl/art_config.h
-#usr/include/libart-2.0/libart_lgpl/art_filterlevel.h
-#usr/include/libart-2.0/libart_lgpl/art_gray_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_misc.h
-#usr/include/libart-2.0/libart_lgpl/art_pathcode.h
-#usr/include/libart-2.0/libart_lgpl/art_pixbuf.h
-#usr/include/libart-2.0/libart_lgpl/art_point.h
-#usr/include/libart-2.0/libart_lgpl/art_rect.h
-#usr/include/libart-2.0/libart_lgpl/art_rect_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_rect_uta.h
-#usr/include/libart-2.0/libart_lgpl/art_render.h
-#usr/include/libart-2.0/libart_lgpl/art_render_gradient.h
-#usr/include/libart-2.0/libart_lgpl/art_render_mask.h
-#usr/include/libart-2.0/libart_lgpl/art_render_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_a_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
-#usr/include/libart-2.0/libart_lgpl/art_rgb_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_rgba.h
-#usr/include/libart-2.0/libart_lgpl/art_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_intersect.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_ops.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_point.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_render_aa.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_vpath.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
-#usr/include/libart-2.0/libart_lgpl/art_svp_wind.h
-#usr/include/libart-2.0/libart_lgpl/art_uta.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_ops.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_rect.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_svp.h
-#usr/include/libart-2.0/libart_lgpl/art_uta_vpath.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath_bpath.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath_dash.h
-#usr/include/libart-2.0/libart_lgpl/art_vpath_svp.h
-#usr/include/libart-2.0/libart_lgpl/libart-features.h
-#usr/include/libart-2.0/libart_lgpl/libart.h
-#usr/lib/libart_lgpl_2.a
-#usr/lib/libart_lgpl_2.la
-usr/lib/libart_lgpl_2.so
-usr/lib/libart_lgpl_2.so.2
-usr/lib/libart_lgpl_2.so.2.3.21
-#usr/lib/pkgconfig/libart-2.0.pc
diff --git a/lfs/libart b/lfs/libart
deleted file mode 100644
index b5f463683..000000000
--- a/lfs/libart
+++ /dev/null
@@ -1,78 +0,0 @@ 
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.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 3 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/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.3.21
-
-THISAPP    = libart_lgpl-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 95e6e89db..21d385d78 100755
--- a/make.sh
+++ b/make.sh
@@ -1331,7 +1331,6 @@  buildipfire() {
   lfsmake2 libexif
   lfsmake2 libpng
   lfsmake2 libtiff
-  lfsmake2 libart
   lfsmake2 gd
   lfsmake2 slang
   lfsmake2 newt