Re: [PR PATCH] [Updated] Kill pangox-compat

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages kill-pangox
https://github.com/void-linux/void-packages/pull/25455

Kill pangox-compat


A patch file from https://github.com/void-linux/void-packages/pull/25455.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kill-pangox-25455.patch --]
[-- Type: text/x-diff, Size: 12052 bytes --]

From 8e735fcb2b9df589e36dfcc4781c5e65b8325b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Oct 2020 20:09:02 +0700
Subject: [PATCH 1/5] gtkglext: kill pangox

---
 srcpkgs/gtkglext/patches/kill-pangox.patch | 68 ++++++++++++++++++++++
 srcpkgs/gtkglext/template                  | 14 ++++-
 2 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/gtkglext/patches/kill-pangox.patch

diff --git a/srcpkgs/gtkglext/patches/kill-pangox.patch b/srcpkgs/gtkglext/patches/kill-pangox.patch
new file mode 100644
index 00000000000..5f68c77e5e6
--- /dev/null
+++ b/srcpkgs/gtkglext/patches/kill-pangox.patch
@@ -0,0 +1,68 @@
+diff --git configure.in configure.in
+index e5b678c..f4937d0 100644
+--- configure.in
++++ configure.in
+@@ -59,10 +59,6 @@ m4_define([gmodule_required_version], [2.0.0])
+ m4_define([pango_pkg], [pango])
+ m4_define([pango_required_version], [1.0.0])
+ 
+-# Pangox
+-m4_define([pangox_pkg], [pangox])
+-m4_define([pangox_required_version], [1.0.0])
+-
+ # PangoFT2
+ m4_define([pangoft2_pkg], [pangoft2])
+ m4_define([pangoft2_required_version], [1.0.0])
+@@ -349,7 +345,6 @@ PKG_CHECK_MODULES([BASE_DEPENDENCIES], [\
+ gtk_pkg >= gtk_required_version \
+ gdk_pkg >= gdk_required_version \
+ pango_pkg >= pango_required_version \
+-pangox_pkg >= pangox_required_version \
+ gmodule_pkg >= gmodule_required_version \
+ ])
+ 
+@@ -794,7 +789,7 @@ LIBS="$save_LIBS"
+ # CFLAGS and LIBS
+ ##################################################
+ 
+-GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
++GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
+diff --git gdk/Makefile.am gdk/Makefile.am
+index 700213e..09f6ba7 100644
+--- gdk/Makefile.am
++++ gdk/Makefile.am
+@@ -73,7 +73,6 @@ gdkglext_public_h_sources = \
+ 	gdkgldrawable.h		\
+ 	gdkglpixmap.h		\
+ 	gdkglwindow.h		\
+-	gdkglfont.h		\
+ 	gdkglshapes.h		\
+ 	gdkglglext.h
+ 
+diff --git gdk/gdkgl.h gdk/gdkgl.h
+index f22a31c..fc80db3 100644
+--- gdk/gdkgl.h
++++ gdk/gdkgl.h
+@@ -33,7 +33,6 @@
+ #include <gdk/gdkgldrawable.h>
+ #include <gdk/gdkglpixmap.h>
+ #include <gdk/gdkglwindow.h>
+-#include <gdk/gdkglfont.h>
+ #include <gdk/gdkglshapes.h>
+ 
+ #endif /* __GDK_GL_H__ */
+diff --git gdk/x11/Makefile.am gdk/x11/Makefile.am
+index a7fb6f6..526b7cc 100644
+--- gdk/x11/Makefile.am
++++ gdk/x11/Makefile.am
+@@ -35,7 +35,6 @@ gdkglext_x11_c_sources = \
+ 	gdkgldrawable-x11.c	\
+ 	gdkglpixmap-x11.c	\
+ 	gdkglwindow-x11.c	\
+-	gdkglfont-x11.c		\
+ 	gdkglglxext.c
+ 
+ gdkglext_x11_headers = \
diff --git a/srcpkgs/gtkglext/template b/srcpkgs/gtkglext/template
index e4911af5430..737a9741598 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 gtk+-devel"
+makedepends="libXt-devel gtk+-devel glu-devel"
 short_desc="OpenGL extension to GTK+"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 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 8e379b1dc5d0be4f8918ccf19d9239f4a8e3efdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Oct 2020 20:09:38 +0700
Subject: [PATCH 2/5] 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 ea2b1b4c85d..9b794da9309 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 <orphan@voidlinux.org>"
-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"
-	}
-}

From 76f2ad83a863e0ba729b6b7f06da86e590d80c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Oct 2020 21:17:50 +0700
Subject: [PATCH 3/5] gnubg: s/-Wl,--no-as-needed//, fix arm-cross

Use www.gnu.org as homepage, old site is unreachable

- arm-cross fixed by @fosslinux
Co-authored-by: fosslinux <fosslinux@aussies.space>
---
 srcpkgs/gnubg/template | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/gnubg/template b/srcpkgs/gnubg/template
index 4bbe300c6c6..173af550bb4 100644
--- a/srcpkgs/gnubg/template
+++ b/srcpkgs/gnubg/template
@@ -1,28 +1,28 @@
 # Template file for 'gnubg'
 pkgname=gnubg
 version=1.06.002
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-cputest ax_cv_gcc_x86_cpuid_0x00000001=6000000"
-if [ "$XBPS_TARGET_MACHINE" = x86_64 ]; then
-	configure_args+=" --enable-simd=sse2"
-fi
-hostmakedepends="pkg-config python-devel gdk-pixbuf-devel"
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" ${pkgname}"
-fi
+hostmakedepends="pkg-config python gdk-pixbuf-devel"
 makedepends="libcurl-devel libglib-devel gtk+-devel gtkglext-devel python-devel
  libcanberra-devel readline-devel readline sqlite-devel"
+depends="python"
 short_desc="GNU Backgammon game"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.gnubg.org"
-distfiles="http://www.gnubg.org/media/sources/$pkgname-release-$version-sources.tar.gz"
+homepage="https://www.gnu.org/software/gnubg/"
+distfiles="$GNU_SITE/gnubg/$pkgname-release-$version-sources.tar.gz"
 checksum=ce1b0b0c1900717cc598032a14cf8c0ee60faf24d84368b39922c0102983bc87
-LDFLAGS="-Wl,--no-as-needed -lm -lreadline"
+LDLIBS="-lm -lreadline -lpython2.7"
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" ${pkgname}"
+	CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/python2.7"
+fi
 
 case "$XBPS_TARGET_MACHINE" in
-	arm*) broken="https://build.voidlinux.org/builders/armv7l_builder/builds/6536/steps/shell_3/logs/stdio" ;;
+	x86_64*) configure_args+=" --enable-simd=sse2" ;;
 esac
 
 pre_configure() {
@@ -32,4 +32,3 @@ pre_configure() {
 		makebearoff -t 6x6 -f gnubg_ts0.bd
 	fi
 }
-

From d371a2595e0bb7d88a2934280e0c410dd6c1331c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Oct 2020 22:15:54 +0700
Subject: [PATCH 4/5] pcb: merge pcb-data in

---
 srcpkgs/pcb-data     |  1 -
 srcpkgs/pcb/template | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 120000 srcpkgs/pcb-data

diff --git a/srcpkgs/pcb-data b/srcpkgs/pcb-data
deleted file mode 120000
index 660275f2247..00000000000
--- a/srcpkgs/pcb-data
+++ /dev/null
@@ -1 +0,0 @@
-pcb
\ No newline at end of file
diff --git a/srcpkgs/pcb/template b/srcpkgs/pcb/template
index 882fffad2c7..1ffd99a8bc7 100644
--- a/srcpkgs/pcb/template
+++ b/srcpkgs/pcb/template
@@ -2,7 +2,7 @@
 pkgname=pcb
 reverts=20140316_4
 version=4.2.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-desktop-database --disable-update-mime-database"
 hostmakedepends="flex geda gerbv intltool netpbm pkg-config
@@ -16,11 +16,4 @@ license="GPL-2.0-or-later"
 homepage="http://pcb.geda-project.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=1ceeaf1bdbe0508b9b140ca421eb600836579114c04dee939341c5d594f36e5d
-
-pcb-data_package() {
-	archs=noarch
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/pcb
-	}
-}
+replaces="pcb-data>=0"

From b65f3b7ac856f5db9283ac0e07817652b46a1130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 9 Oct 2020 23:36:18 +0700
Subject: [PATCH 5/5] ufoai: merge ufoai-data back

---
 srcpkgs/ufoai-data     |  1 -
 srcpkgs/ufoai/template | 16 ++++------------
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/ufoai-data

diff --git a/srcpkgs/ufoai-data b/srcpkgs/ufoai-data
deleted file mode 120000
index 92362c4dbe5..00000000000
--- a/srcpkgs/ufoai-data
+++ /dev/null
@@ -1 +0,0 @@
-ufoai
\ No newline at end of file
diff --git a/srcpkgs/ufoai/template b/srcpkgs/ufoai/template
index 6463d2c47c6..8f5bc1001f8 100644
--- a/srcpkgs/ufoai/template
+++ b/srcpkgs/ufoai/template
@@ -1,7 +1,7 @@
 # Template file for 'ufoai'
 pkgname=ufoai
 version=2.5
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="MesaLib-devel glu-devel libjpeg-turbo-devel
  libvorbis-devel libopenal-devel xvidcore-devel libtheora-devel
  SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel libcurl-devel
  gtkglext-devel gtksourceview2-devel"
-depends="ufoai-data>=${version} ca-certificates"
+depends="ca-certificates"
 short_desc="UFO Alien Invasion"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"
@@ -19,7 +19,8 @@ distfiles="
  ${SOURCEFORGE_SITE}/${pkgname}/UFO_AI%202.x/${version}/${pkgname}-${version}-data.tar"
 checksum="0c7cc3bc9efeb276f71cbe6ee8ff7c76f98d183de79f1a069fa63059cf182a8f
  5e706a424aff6a2ea30a4c798129d6304e897387eadf808528129b512b7dcdb0"
-broken="ELF in /usr/share"
+replaces="ufoai-data>=0"
+broken="with or without pangox: error: 'glOrthof' was not declared in this scope; did you mean 'glOrtho'"
 
 # suppress a lot of warnings
 CXXFLAGS="-Wno-cast-align -Wno-cast-qual -Wno-inline"
@@ -67,15 +68,6 @@ post_install() {
 	sed -i ${DESTDIR}/usr/share/applications/* -e "s;/usr/games/;;"
 }
 
-ufoai-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/ufoai/base/*.pk3
-		vmove usr/share/ufoai/base/i18n
-	}
-}
-
 ufoai-radiant_package() {
 	short_desc+=" - map editor"
 	depends="${sourcepkg}>=${version}_${revision}"