gtkglext: kill pangox

This commit is contained in:
Đoàn Trần Công Danh 2020-10-09 20:09:02 +07:00
parent 613c1c37f4
commit 9b7d338c1e
2 changed files with 79 additions and 3 deletions

View File

@ -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 = \

View File

@ -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}"