mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-07 22:54:11 -05:00
Modernize libxfont2, remove duplicate package. — libxext → 1.3.6-1,libxfont2 → 2.0.7 (#13047)
* Modernize libxfont2, remove duplicate package. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * updater-libxfont2-2.0.7: Package File Update Run on linux/386 container. * updater-libxfont2-2.0.7: Package File Update Run on linux/amd64 container. * updater-libxfont2-2.0.7: Package File Update Run on linux/arm/v7 container. * Force libxext rebuild. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * updater-libxfont2-2.0.7: Package File Update Run on linux/amd64 container. * updater-libxfont2-2.0.7: Package File Update Run on linux/arm/v7 container. * remove filelists. Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: chromebrew-actions[bot] <chromebrew-actions[bot]@users.noreply.github.com> Co-authored-by: satmandu <satmandu@users.noreply.github.com>
This commit is contained in:
chromebrew-actions[bot]
committed by
GitHub
GitHub
parent
96eb93be4f
commit
45a05405b8
@@ -89,6 +89,7 @@ renamed_packages = Set[
|
||||
{ pkg_name: 'itstool', pkg_rename: 'py3_itstool', comments: 'Renamed to indicate switch to pip buildsystem.' },
|
||||
{ pkg_name: 'jsonc', pkg_rename: 'json_c', comments: 'Renamed to better match upstream.' },
|
||||
{ pkg_name: 'libcurl', pkg_rename: 'curl', comments: 'Renamed to better match upstream.' },
|
||||
{ pkg_name: 'libxfont', pkg_rename: 'libxfont2', comments: 'Renamed to better match upstream.' },
|
||||
{ pkg_name: 'libgpgerror', pkg_rename: 'libgpg_error', comments: 'Renamed to better match upstream.' },
|
||||
{ pkg_name: 'libjpeg', pkg_rename: 'libjpeg_turbo', comments: 'Renamed to better match upstream.' },
|
||||
{ pkg_name: 'libsdl2', pkg_rename: 'sdl2', comments: 'Renamed to better match upstream.' },
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Total size: 935196
|
||||
# Total size: 995671
|
||||
/usr/local/include/X11/extensions/MITMisc.h
|
||||
/usr/local/include/X11/extensions/XEVI.h
|
||||
/usr/local/include/X11/extensions/XLbx.h
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
# Total size: 2274498
|
||||
/usr/local/include/X11/fonts/libxfont2.h
|
||||
/usr/local/lib/libXfont2.a
|
||||
/usr/local/lib/libXfont2.la
|
||||
/usr/local/lib/libXfont2.so
|
||||
/usr/local/lib/libXfont2.so.2
|
||||
/usr/local/lib/libXfont2.so.2.0.0
|
||||
/usr/local/lib/pkgconfig/xfont2.pc
|
||||
@@ -1,4 +1,4 @@
|
||||
# Total size: 1828428
|
||||
# Total size: 1838129
|
||||
/usr/local/include/X11/fonts/libxfont2.h
|
||||
/usr/local/lib/libXfont2.a
|
||||
/usr/local/lib/libXfont2.la
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
/usr/local/include/X11/fonts/libxfont2.h
|
||||
/usr/local/lib/libXfont2.a
|
||||
/usr/local/lib/libXfont2.la
|
||||
/usr/local/lib/libXfont2.so
|
||||
/usr/local/lib/libXfont2.so.2
|
||||
/usr/local/lib/libXfont2.so.2.0.0
|
||||
/usr/local/lib/pkgconfig/xfont2.pc
|
||||
@@ -1,4 +1,4 @@
|
||||
# Total size: 1010714
|
||||
# Total size: 1059736
|
||||
/usr/local/include/X11/extensions/MITMisc.h
|
||||
/usr/local/include/X11/extensions/XEVI.h
|
||||
/usr/local/include/X11/extensions/XLbx.h
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
# Total size: 3624186
|
||||
/usr/local/include/X11/fonts/libxfont2.h
|
||||
/usr/local/lib64/libXfont2.a
|
||||
/usr/local/lib64/libXfont2.la
|
||||
/usr/local/lib64/libXfont2.so
|
||||
/usr/local/lib64/libXfont2.so.2
|
||||
/usr/local/lib64/libXfont2.so.2.0.0
|
||||
/usr/local/lib64/pkgconfig/xfont2.pc
|
||||
@@ -1,4 +1,4 @@
|
||||
# Total size: 1994458
|
||||
# Total size: 2056729
|
||||
/usr/local/include/X11/fonts/libxfont2.h
|
||||
/usr/local/lib64/libXfont2.a
|
||||
/usr/local/lib64/libXfont2.la
|
||||
|
||||
@@ -3,27 +3,27 @@ require 'buildsystems/autotools'
|
||||
class Libxext < Autotools
|
||||
description 'library for the X window system'
|
||||
homepage 'https://x.org/wiki/'
|
||||
version '1.3.6'
|
||||
version '1.3.6-1'
|
||||
license 'MIT'
|
||||
compatibility 'aarch64 armv7l x86_64'
|
||||
source_url 'https://www.x.org/releases/individual/lib/libXext-1.3.6.tar.xz'
|
||||
source_sha256 'edb59fa23994e405fdc5b400afdf5820ae6160b94f35e3dc3da4457a16e89753'
|
||||
source_url 'https://gitlab.freedesktop.org/xorg/lib/libxext.git'
|
||||
git_hashtag "libXext-#{version.split('-').first}"
|
||||
binary_compression 'tar.zst'
|
||||
|
||||
binary_sha256({
|
||||
aarch64: '5ed26f102a7fefc71259c3849ba8549d6cc11b6af74a73bafe333c8ee880120b',
|
||||
armv7l: '5ed26f102a7fefc71259c3849ba8549d6cc11b6af74a73bafe333c8ee880120b',
|
||||
x86_64: '0d9a949182965e1eb29f6c27c20b74dd30adef38cad9f169d09e662730777ae0'
|
||||
aarch64: '62e7c72360e9ef01f3653a803cb69d49d8c075ffcd0889751829135deb6b5009',
|
||||
armv7l: '62e7c72360e9ef01f3653a803cb69d49d8c075ffcd0889751829135deb6b5009',
|
||||
x86_64: 'f1284ee9e7b256da531edad962a014302d6d627d8beb60a30af5cd6c751d1a34'
|
||||
})
|
||||
|
||||
depends_on 'glibc' # R
|
||||
depends_on 'libbsd' # R
|
||||
depends_on 'libx11' # R
|
||||
depends_on 'libxau' # R
|
||||
depends_on 'libxcb' # R
|
||||
depends_on 'libxdmcp' # R
|
||||
depends_on 'llvm_lib' => :build
|
||||
depends_on 'xmlto' => :build
|
||||
depends_on 'xorg_proto' # R
|
||||
|
||||
run_tests
|
||||
end
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
require 'package'
|
||||
|
||||
class Libxfont < Package
|
||||
description 'library for the X window system'
|
||||
homepage 'https://x.org/wiki/'
|
||||
version '2.0.1'
|
||||
license 'custom'
|
||||
compatibility 'aarch64 armv7l x86_64'
|
||||
source_url 'https://www.x.org/archive/individual/lib/libXfont2-2.0.1.tar.gz'
|
||||
source_sha256 '381b6b385a69343df48a082523c856aed9042fbbc8ee0a6342fb502e4321230a'
|
||||
binary_compression 'tar.xz'
|
||||
|
||||
binary_sha256({
|
||||
aarch64: 'd8c0c65c7a09a22609e0f80ed208430c20d27fad1f8da2126e1bf232a1c4269f',
|
||||
armv7l: 'd8c0c65c7a09a22609e0f80ed208430c20d27fad1f8da2126e1bf232a1c4269f',
|
||||
x86_64: 'a39664217180079324ce09fb7d341b3d02c9eb479b32c709447d9fea8561ecaf'
|
||||
})
|
||||
|
||||
depends_on 'libfontenc'
|
||||
depends_on 'freetype'
|
||||
|
||||
def self.build
|
||||
system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
|
||||
system 'make'
|
||||
end
|
||||
|
||||
def self.install
|
||||
system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
|
||||
end
|
||||
end
|
||||
@@ -1,36 +1,25 @@
|
||||
require 'package'
|
||||
require 'buildsystems/autotools'
|
||||
|
||||
class Libxfont2 < Package
|
||||
class Libxfont2 < Autotools
|
||||
description 'X.org X font library'
|
||||
homepage 'https://www.x.org/wiki/'
|
||||
version '2.0.6'
|
||||
version '2.0.7'
|
||||
license 'MIT'
|
||||
compatibility 'aarch64 armv7l x86_64'
|
||||
source_url 'https://www.x.org/archive/individual/lib/libXfont2-2.0.6.tar.xz'
|
||||
source_sha256 '74ca20017eb0fb3f56d8d5e60685f560fc85e5ff3d84c61c4cb891e40c27aef4'
|
||||
source_url 'https://gitlab.freedesktop.org/xorg/lib/libxfont.git'
|
||||
git_hashtag "libXfont2-#{version}"
|
||||
binary_compression 'tar.zst'
|
||||
|
||||
binary_sha256({
|
||||
aarch64: 'ab1e630f1c5a7a5917620dfb5bd34feeea7fdc002f73166d2ef8ed7674a1c537',
|
||||
armv7l: 'ab1e630f1c5a7a5917620dfb5bd34feeea7fdc002f73166d2ef8ed7674a1c537',
|
||||
x86_64: '4a72ab2f2da91acfff1ff03d0b7c47ac37ad9d0d3c5adc1d6ad1e98448f24200'
|
||||
aarch64: 'be7287111f3bc930bb5c90e17e9f780370cbdce03116d101d6ca281000fbcf78',
|
||||
armv7l: 'be7287111f3bc930bb5c90e17e9f780370cbdce03116d101d6ca281000fbcf78',
|
||||
x86_64: 'e0c2c516e7ff9fdff3c10f4930497e3e187cbee0fe34ffd618e0a98f8a91abe2'
|
||||
})
|
||||
|
||||
depends_on 'fop' => :build
|
||||
depends_on 'libxtrans'
|
||||
depends_on 'libfontenc'
|
||||
depends_on 'libx11'
|
||||
depends_on 'libxtrans' => :build
|
||||
depends_on 'libfontenc' => :build
|
||||
depends_on 'libx11' => :build
|
||||
depends_on 'harfbuzz' => :build
|
||||
depends_on 'xmlto' => :build
|
||||
|
||||
def self.build
|
||||
system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh'
|
||||
system "./configure #{CREW_CONFIGURE_OPTIONS} \
|
||||
--disable-selective-werror"
|
||||
system 'make'
|
||||
end
|
||||
|
||||
def self.install
|
||||
system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -5490,14 +5490,9 @@ url: https://www.x.org/archive/individual/lib
|
||||
activity: none
|
||||
---
|
||||
kind: url
|
||||
name: libxfont
|
||||
url: https://www.x.org/archive/individual/lib
|
||||
activity: none
|
||||
---
|
||||
kind: url
|
||||
name: libxfont2
|
||||
url: https://www.x.org/archive/individual/lib
|
||||
activity: none
|
||||
activity: low
|
||||
---
|
||||
kind: url
|
||||
name: libxft
|
||||
|
||||
Reference in New Issue
Block a user