diff --git a/srcpkgs/gtksourceview2-devel b/srcpkgs/gtksourceview2-devel
deleted file mode 120000
index 8615d3370892ad..00000000000000
--- a/srcpkgs/gtksourceview2-devel
+++ /dev/null
@@ -1 +0,0 @@
-gtksourceview2
\ No newline at end of file
diff --git a/srcpkgs/gtksourceview2/patches/python3.patch b/srcpkgs/gtksourceview2/patches/python3.patch
deleted file mode 100644
index 0a05b38556d669..00000000000000
--- a/srcpkgs/gtksourceview2/patches/python3.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/gtksourceview/language-specs/convert.py
-+++ b/gtksourceview/language-specs/convert.py
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python
-
- import xml.dom.minidom as dom
--import cgi
-+import html
-
- default_styles = {
- 'Comment' : 'def:comment',
-@@ -29,7 +29,7 @@
- raise RuntimeError("don't know how to escape '%s'" % (ch,))
-
- def escape_regex(s):
-- return cgi.escape(s)
-+ return html.escape(s)
-
- def normalize_id(id):
- if id == "C#":
-@@ -91,9 +91,9 @@
- if self.mimetypes or self.globs:
- string += indent + '\n'
- if self.mimetypes:
-- string += 2*indent + '%s\n' % (cgi.escape(self.mimetypes),)
-+ string += 2*indent + '%s\n' % (html.escape(self.mimetypes),)
- if self.globs:
-- string += 2*indent + '%s\n' % (cgi.escape(self.globs),)
-+ string += 2*indent + '%s\n' % (html.escape(self.globs),)
- string += indent + '\n\n'
-
- return string
-@@ -175,7 +175,7 @@
- self.is_container = False
-
- def format(self, indent, esc_ctx, line_esc_ctx):
-- print "Implement me: %s.format()" % (type(self).__name__,)
-+ print("Implement me: %s.format()" % (type(self).__name__,))
- return indent*2 + '\n' % (self.id)
-
- def format_escape(self, indent, esc_ctx, line_esc_ctx):
-@@ -472,7 +472,7 @@
- elif cur.tagName == "syntax-item":
- ctx = parseSyntaxItem(cur, name, _name, style)
- else:
-- print "Unknown tag: %s" % (cur.tagName,)
-+ print("Unknown tag: %s" % (cur.tagName,))
- ctx = None
-
- return ctx
-@@ -510,7 +510,7 @@
- import sys
-
- if not sys.argv[1:]:
-- print "usage: %s LANG_FILE" % (sys.argv[0])
-+ print("usage: %s LANG_FILE" % (sys.argv[0]))
- sys.exit(1)
-
- lang_file = parse_file(sys.argv[1])
diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
deleted file mode 100644
index 09d1301526530f..00000000000000
--- a/srcpkgs/gtksourceview2/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'gtksourceview2'
-pkgname=gtksourceview2
-version=2.10.5
-revision=8
-build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+-devel libxml2-devel"
-short_desc="Text widget that extends GTK+ GtkTextView widget"
-maintainer="Orphaned "
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
-checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=3
-
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
-
-do_check() {
- : #requires xserver
-}
-
-gtksourceview2-devel_package() {
- depends="gtk+-devel libxml2-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/share/gtk-doc
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/gtksourceview2/update b/srcpkgs/gtksourceview2/update
deleted file mode 100644
index 3022b9fb76a49c..00000000000000
--- a/srcpkgs/gtksourceview2/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=gtksourceview
-ignore="[!2].* 2.9?.*"
diff --git a/srcpkgs/higan/template b/srcpkgs/higan/template
index 9bf6e7e475fb94..29510b6edf7d8a 100644
--- a/srcpkgs/higan/template
+++ b/srcpkgs/higan/template
@@ -1,14 +1,14 @@
# Template file for 'higan'
pkgname=higan
version=110
-revision=3
+revision=4
build_wrksrc=higan
build_style=gnu-makefile
-make_build_args='compiler=${CXX} platform=linux'
-make_install_args='compiler=${CXX} platform=linux prefix=${DESTDIR}/usr'
+make_build_args='compiler=${CXX} platform=linux hiro=gtk3'
+make_install_args='compiler=${CXX} platform=linux hiro=gtk3 prefix=${DESTDIR}/usr'
hostmakedepends="unzip pkg-config"
-makedepends="gtk+-devel gtksourceview2-devel libgomp-devel
- SDL2-devel MesaLib-devel libXv-devel libao-devel
+makedepends="gtk+3-devel gtksourceview-devel libgomp-devel
+ SDL2-devel MesaLib-devel libXv-devel libao-devel cairo-devel
alsa-lib-devel libopenal-devel pulseaudio-devel"
short_desc="Multi-system emulator (SNES/Game Boy/Mega Drive/PC Engine/WonderSwan)"
maintainer="John "
@@ -24,14 +24,14 @@ pre_install() {
vlicense $wrksrc/LICENSE.txt
}
-if [ "$build_option_icarus" ];then
- post_build() {
- cd $wrksrc/icarus
- make ${makejobs} compiler=${CXX} platform=linux
- }
+post_build() {
+ if [ "$build_option_icarus" ];then
+ make -C $wrksrc/icarus ${makejobs} $make_build_args
+ fi
+}
- post_install() {
- cd $wrksrc/icarus
- make STRIP=true compiler=${CXX} platform=linux prefix=${DESTDIR}/usr install
- }
-fi
+post_install() {
+ if [ "$build_option_icarus" ];then
+ make -C $wrksrc/icarus STRIP=true $make_install_args
+ fi
+}