From 4e310b402336f6963624aae518448a79e63f05a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 9 Oct 2020 20:09:02 +0700 Subject: [PATCH 1/2] gtkglext: kill pangox --- srcpkgs/gtkglext/template | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtkglext/template b/srcpkgs/gtkglext/template index e4911af5430..73f5d8682c4 100644 --- a/srcpkgs/gtkglext/template +++ b/srcpkgs/gtkglext/template @@ -1,11 +1,11 @@ # Template file for 'gtkglext' pkgname=gtkglext version=1.2.0 -revision=7 +revision=8 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="pkg-config glib-devel" -makedepends="pangox-compat-devel libXt-devel gtk+-devel glu-devel" +hostmakedepends="pkg-config glib-devel automake libtool" +makedepends="libXt-devel gtk+-devel glu-devel" short_desc="OpenGL extension to GTK+" maintainer="Martin Riese " license="GPL-2.0-or-later, LGPL-2.1-or-later" @@ -13,6 +13,14 @@ homepage="https://projects.gnome.org/gtkglext" distfiles="${SOURCEFORGE_SITE}/gtkglext/gtkglext/${version}/gtkglext-${version}.tar.gz" checksum=e5073f3c6b816e7fa67d359d9745a5bb5de94a628ac85f624c992925a46844f9 +pre_configure() { + autoreconf -fi +} + +post_patch() { + rm -f gdk/x11/gdkglfont-x11.c +} + gtkglext-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 16d8b4f2498253ad33412589853b2cfbf652d752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 9 Oct 2020 20:09:38 +0700 Subject: [PATCH 2/2] pangox-compat: drop - ftbfs - last updated 10 years ago --- common/shlibs | 1 - srcpkgs/pangox-compat-devel | 1 - srcpkgs/pangox-compat/template | 25 ------------------------- 3 files changed, 27 deletions(-) delete mode 120000 srcpkgs/pangox-compat-devel delete mode 100644 srcpkgs/pangox-compat/template diff --git a/common/shlibs b/common/shlibs index 7dad8c2117d..bf849ddfbba 100644 --- a/common/shlibs +++ b/common/shlibs @@ -91,7 +91,6 @@ libatk-1.0.so.0 atk-1.26.0_1 libpangocairo-1.0.so.0 pango-1.24.0_1 libpangoft2-1.0.so.0 pango-1.24.0_1 libpangoxft-1.0.so.0 pango-xft-1.36.3_2 -libpangox-1.0.so.0 pangox-compat-0.0.2_1 libpango-1.0.so.0 pango-1.24.0_1 libcairo.so.2 cairo-1.8.6_1 libcairo-gobject.so.2 cairo-1.8.6_1 diff --git a/srcpkgs/pangox-compat-devel b/srcpkgs/pangox-compat-devel deleted file mode 120000 index bb1b03dc520..00000000000 --- a/srcpkgs/pangox-compat-devel +++ /dev/null @@ -1 +0,0 @@ -pangox-compat \ No newline at end of file diff --git a/srcpkgs/pangox-compat/template b/srcpkgs/pangox-compat/template deleted file mode 100644 index 58a37c01e21..00000000000 --- a/srcpkgs/pangox-compat/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'pangox-compat' -pkgname=pangox-compat -version=0.0.2 -revision=4 -build_style=gnu-configure -configure_args="--disable-static" -hostmakedepends="pkg-config" -makedepends="pango-devel" -replaces="pango<1.32" -short_desc="Library for layout and rendering of text (pangox compat library)" -maintainer="Orphaned " -homepage="http://www.pango.org/" -license="LGPL-2.1" -distfiles="${GNOME_SITE}/${pkgname}/0.0/${pkgname}-${version}.tar.xz" -checksum=552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046 - -pangox-compat-devel_package() { - depends="libX11-devel pango-devel>=1.31 ${sourcepkg}-${version}_${revision}" - short_desc+=" -- development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -}