X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcairo;h=082cc4edd91e5422a7c99333b3c55a488fe07904;hb=b84005daaaaa7d0e82d34485c56b0546cc4942d0;hp=591549ab3e7e86118005d8f856c72ad9a39020e2;hpb=4a8dc4556aed707286cf3930f57d62362d85a6f8;p=ipfire-2.x.git diff --git a/lfs/cairo b/lfs/cairo index 591549ab3e..082cc4edd9 100644 --- a/lfs/cairo +++ b/lfs/cairo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 IPFire Team # # # # 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 # @@ -24,10 +24,10 @@ include Config -VER = 1.10.2 +VER = 1.16.0 THISAPP = cairo-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f101a9e88b783337b20b2e26dfd26d5f +$(DL_FILE)_MD5 = f19e0353828269c22bd72e271243a552 install : $(TARGET) @@ -69,8 +69,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-win32 --disable-os2 --disable-beos + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cairo-1.16.0-binutils-2.34.patch + cd $(DIR_APP) && ./configure --prefix=/usr \ + --disable-win32 --disable-os2 --disable-beos cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)