From 044c595da110e77838b1d74bf864b14f97516f32 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/7] 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 + #include + #include +-#include + #include + + #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 " 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 21156265945f10fe5b0f938b1e89dea92cc4ecef 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/7] 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 " -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 3e6f5a0fca6aac2f0f5c49f6621187a8174811fe 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 21:17:50 +0700 Subject: [PATCH 3/7] 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 --- 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 " 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 4b1797fb128157b211f6b3aafaf56cf5186d368a 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 22:15:54 +0700 Subject: [PATCH 4/7] 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 fab8f2ec98cd4be7877226d563b9fc27abe656f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 10 Oct 2020 11:34:34 +0700 Subject: [PATCH 5/7] vba-m: not requires gtkglext anymore --- srcpkgs/vba-m/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template index 8d69e721e36..659de62621c 100644 --- a/srcpkgs/vba-m/template +++ b/srcpkgs/vba-m/template @@ -2,14 +2,14 @@ pkgname=vba-m reverts=1292_2 version=2.1.4 -revision=2 +revision=3 archs="x86_64* i686*" wrksrc="visualboyadvance-m-${version}" build_style=cmake configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE" hostmakedepends="gettext pkg-config unzip zip yasm wxWidgets-common-devel" makedepends="zlib-devel libpng-devel MesaLib-devel libopenal-devel SDL2-devel - gtkmm2-devel gtkglext-devel gtkglextmm-devel ffmpeg-devel gtk+3-devel + gtkmm2-devel ffmpeg-devel gtk+3-devel SFML-devel wxWidgets-gtk3-devel libgomp-devel" short_desc="Gameboy Advance Emulator" maintainer="Andrea Brancaleoni " From da059f0bb694e897e99319538f4ef8c98683e15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 10 Oct 2020 11:31:35 +0700 Subject: [PATCH 6/7] gtkglextmm: drop package - Nothing else needs this library - Last updated 10 years ago - Need PangoX --- common/shlibs | 2 - srcpkgs/gtkglextmm-devel | 1 - .../patches/fix_ftbfs_gtk_2_20.patch | 28 ---- .../patches/fix_ftbfs_gtk_2_36.patch | 121 ------------------ .../patches/fix_ftbfs_gtk_2_37.patch | 24 ---- .../patches/gtkglextmm-1.2.0-aclocal.patch | 11 -- srcpkgs/gtkglextmm/template | 27 ---- 7 files changed, 214 deletions(-) delete mode 120000 srcpkgs/gtkglextmm-devel delete mode 100644 srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_20.patch delete mode 100644 srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_36.patch delete mode 100644 srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_37.patch delete mode 100644 srcpkgs/gtkglextmm/patches/gtkglextmm-1.2.0-aclocal.patch delete mode 100644 srcpkgs/gtkglextmm/template diff --git a/common/shlibs b/common/shlibs index 9b794da9309..748044bb40a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2212,8 +2212,6 @@ libwebsockets.so.15 libwebsockets-3.2.0_1 libnfc.so.0 libnfc-1.7.1_1 libfuzzy.so.2 libfuzzy-2.12_1 libSDL_gfx.so.15 SDL_gfx-2.0.25_2 -libgdkglextmm-x11-1.2.so.0 gtkglextmm-1.2.0_1 -libgtkglextmm-x11-1.2.so.0 gtkglextmm-1.2.0_1 libsfml-network.so.2.5 SFML-2.5.0_1 libsfml-system.so.2.5 SFML-2.5.0_1 libsfml-window.so.2.5 SFML-2.5.0_1 diff --git a/srcpkgs/gtkglextmm-devel b/srcpkgs/gtkglextmm-devel deleted file mode 120000 index d514cfcb39d..00000000000 --- a/srcpkgs/gtkglextmm-devel +++ /dev/null @@ -1 +0,0 @@ -gtkglextmm \ No newline at end of file diff --git a/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_20.patch b/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_20.patch deleted file mode 100644 index acf7c1b4fea..00000000000 --- a/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_20.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Fix FTBFS due to missing GdkSpanFunc definition - . - The sequence of #include directives is important - if gtk/gtkglwidget.h - is included first, before widget.h, it includes gdk.h without undefing - GDK_DISABLE_DEPRECATED - this leads to GdkSpanFunc not being defined - and compilation errors. - The fix is to first include widget.h which includes the right gdkmm header - which defines GDK_DISABLE_DEPRECATED before including gdk.h. -Forwarded: no -Bug-Ubuntu: http://launchpad.net/bugs/662572 - -Index: gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc -=================================================================== ---- gtkglext/gtkmm/gl/widget.cc 2010-12-08 13:31:59.651270000 +0100 -+++ gtkglext/gtkmm/gl/widget.cc 2010-12-08 13:32:10.871270000 +0100 -@@ -17,10 +17,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - --#include -- - #include "widget.h" - -+#include -+ - namespace Gtk - { - namespace GL diff --git a/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_36.patch b/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_36.patch deleted file mode 100644 index 8156bae16b8..00000000000 --- a/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_36.patch +++ /dev/null @@ -1,121 +0,0 @@ -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc -=================================================================== ---- gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200 -+++ gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200 -@@ -1,15 +1,8 @@ -- --#include -- - // Disable the 'const' function attribute of the get_type() functions. - // GCC would optimize them out because we don't use the return value. - #undef G_GNUC_CONST - #define G_GNUC_CONST /* empty */ - --#include --#include --#include -- - // #include the widget headers so that we can call the get_type() static methods: - - #include "tokens.h" -@@ -19,6 +12,12 @@ - #include "pixmap.h" - #include "window.h" - -+#include -+ -+#include -+#include -+#include -+ - extern "C" - { - -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc -=================================================================== ---- gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200 -+++ gdkglext/gdkmm/gl/query.cc 2013-05-16 23:42:40.193801834 +0200 -@@ -17,10 +17,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - --#include -- - #include "query.h" - -+#include -+ - namespace Gdk - { - namespace GL -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc -=================================================================== ---- gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200 -+++ gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:42:40.193801834 +0200 -@@ -17,11 +17,11 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -+#include "pixmapext.h" -+ - #include - #include - --#include "pixmapext.h" -- - namespace Gdk - { - namespace GL -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc -=================================================================== ---- gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200 -+++ gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:42:40.193801834 +0200 -@@ -17,11 +17,11 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -+#include "windowext.h" -+ - #include - #include - --#include "windowext.h" -- - namespace Gdk - { - namespace GL -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc -=================================================================== ---- gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200 -+++ gdkglext/gdkmm/gl/font.cc 2013-05-16 23:43:07.637456821 +0200 -@@ -17,10 +17,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - --#include -- - #include "font.h" - -+#include -+ - namespace Gdk - { - namespace GL -Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc -=================================================================== ---- gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100 -+++ gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200 -@@ -19,11 +19,11 @@ - - #include - --#include -- - #include "wrap_init.h" - #include "init.h" - -+#include -+ - namespace Gdk - { - namespace GL diff --git a/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_37.patch b/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_37.patch deleted file mode 100644 index 59cbd7763f9..00000000000 --- a/srcpkgs/gtkglextmm/patches/fix_ftbfs_gtk_2_37.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/gtkglext/gtkmm/gl/drawingarea.cc b/gtkglext/gtkmm/gl/drawingarea.cc -index 82bb7f4..5a8c5e3 100644 ---- gtkglext/gtkmm/gl/drawingarea.cc -+++ gtkglext/gtkmm/gl/drawingarea.cc -@@ -17,6 +17,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -+#include - #include "drawingarea.h" - - namespace Gtk -diff --git a/gtkglext/gtkmm/gl/widget.cc b/gtkglext/gtkmm/gl/widget.cc -index 598d6e2..2d6833b 100644 ---- gtkglext/gtkmm/gl/widget.cc -+++ gtkglext/gtkmm/gl/widget.cc -@@ -17,6 +17,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -+#include - #include "widget.h" - - #include diff --git a/srcpkgs/gtkglextmm/patches/gtkglextmm-1.2.0-aclocal.patch b/srcpkgs/gtkglextmm/patches/gtkglextmm-1.2.0-aclocal.patch deleted file mode 100644 index 25c319645fc..00000000000 --- a/srcpkgs/gtkglextmm/patches/gtkglextmm-1.2.0-aclocal.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- m4macros/gtkglextmm.m4 2004-05-18 08:29:34.000000000 +0200 -+++ m4macros/gtkglextmm.m4 2006-05-31 16:46:09.000000000 +0200 -@@ -222,7 +222,7 @@ - dnl AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD([ACTION-IF-SUPPORTED [, ACTION-IF-NOT-SUPPORTED]]) - dnl Checks whether gtkglextmm supports multihead. - dnl --AC_DEFUN(AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD, -+AC_DEFUN([AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD], - [ AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_CACHE_CHECK([whether gtkglextmm supports multihead], diff --git a/srcpkgs/gtkglextmm/template b/srcpkgs/gtkglextmm/template deleted file mode 100644 index 3fea41e8284..00000000000 --- a/srcpkgs/gtkglextmm/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'gtkglextmm' -pkgname=gtkglextmm -version=1.2.0 -revision=3 -build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="gtkglext-devel gtkmm2-devel pangomm-devel" -short_desc="C++ bindings for gtkglext" -maintainer="Andrea Brancaleoni " -license="LGPL-2.1" -homepage="https://projects.gnome.org/gtkglext/" -distfiles="${SOURCEFORGE_SITE}/gtkglext/${pkgname}-${version}.tar.bz2" -checksum=6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea - -gtkglextmm-devel_package() { - depends="${makedepends} ${sourcepkg}-${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/share/doc - vmove usr/share/aclocal - vmove usr/lib/gtkglextmm-1.2 - } -} From 43aafd1f7fc141acda2c2a9a1bb3e21f543efc74 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 23:36:18 +0700 Subject: [PATCH 7/7] ufoai: merge ufoai-data back --- srcpkgs/ufoai-data | 1 - srcpkgs/ufoai/patches/sdl2_gl_orthof.patch | 17 +++++++++++++++++ srcpkgs/ufoai/template | 18 +++++------------- 3 files changed, 22 insertions(+), 14 deletions(-) delete mode 120000 srcpkgs/ufoai-data create mode 100644 srcpkgs/ufoai/patches/sdl2_gl_orthof.patch 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/patches/sdl2_gl_orthof.patch b/srcpkgs/ufoai/patches/sdl2_gl_orthof.patch new file mode 100644 index 00000000000..3d9ffd070ce --- /dev/null +++ b/srcpkgs/ufoai/patches/sdl2_gl_orthof.patch @@ -0,0 +1,17 @@ +SDL_opengl.h dosen't have the nessecary headers. GL/gl.h has the parts +of SDL_opengl.h needed for SDL_opengl_glext.h, then include +SDL_opengl_glext.h which has the *f functions. + +--- src/client/renderer/r_gl.h 2020-10-08 07:50:29.818581990 +1100 ++++ src/client/renderer/r_gl.h 2020-10-08 07:52:16.805006133 +1100 +@@ -29,7 +29,8 @@ + #include "../../ports/android/r_gles_android.h" + #include + #else +-#include ++#include ++#include + #endif + + inline void R_DrawArrays (GLint first, GLsizei count) { + diff --git a/srcpkgs/ufoai/template b/srcpkgs/ufoai/template index 6463d2c47c6..6e37afab3e7 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,17 +9,18 @@ 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 " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://ufoai.org/" distfiles=" ${SOURCEFORGE_SITE}/${pkgname}/UFO_AI%202.x/${version}/${pkgname}-${version}-source.tar.bz2 ${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="pangox" # 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}"