remove midori, it needs libpeas, which needs gobject-introspection

I am not able to cross-compile gobject-introspection and not ever
willing to try it again. It's a mess. Update all packages required
on the way to midori, which now will be removed. sorry.

mk/host.mk

@@ -15,7 +15,7 @@ HOST_AUTOTOOL_ENV+=	PATH='${HOST_PATH}' \
 HOST_CONFIGURE_ENV?=	PATH='${HOST_PATH}' \
 			${COMMON_ENV} \
 			${HOST_ENV} \
-			PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig' \
+			PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig:${STAGING_HOST_DIR}/usr/lib/${GNU_HOST_NAME}/pkgconfig' \
 			PKG_CONFIG_SYSROOT_DIR='${STAGING_HOST_DIR}' \
 			PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 

mk/mirrors.mk

@@ -55,6 +55,7 @@ MASTER_SITE_MYSQL?=		\
 	http://mysql.easynet.be/ \
 
 MASTER_SITE_GNOME?=	\
+	https://download.gnome.org/sources/ \
 	ftp://ftp.gnome.org/pub/GNOME/sources/ \
 	ftp://ftp.linux.org.uk/mirrors/ftp.gnome.org/sources/ \
 	ftp://ftp.acc.umu.se/pub/GNOME/sources/	\

package/atk/Makefile

@@ -4,13 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		atk
-PKG_VERSION:=		2.20.0
-PKG_EXTRAVER:=		2.20
+PKG_VERSION:=		2.36.0
+PKG_EXTRAVER:=		2.36
 PKG_RELEASE:=		1
-PKG_HASH:=		493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0
+PKG_HASH:=		fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788
 PKG_DESCR:=		accessibility toolkit library
 PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		glib
+PKG_BUILDDEP:=		glib meson-host
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		$(MASTER_SITE_GNOME:=atk/$(PKG_EXTRAVER)/)
 PKG_LIBNAME:=		libatk
@@ -20,6 +20,14 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBATK,libatk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
+
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
+
+MESON_FLAGS+=		-Dintrospection=false
+
 libatk-install:
 	$(INSTALL_DIR) $(IDIR_LIBATK)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libatk-*.so* $(IDIR_LIBATK)/usr/lib

package/dillo/Makefile

@@ -24,6 +24,8 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CFLAGS+=		-fcommon
+TARGET_CXXFLAGS+=	-fcommon
 TARGET_LDFLAGS+=	-liconv
 CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config
 CONFIGURE_ARGS+=	--enable-ssl

package/fltk/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		fltk
-PKG_VERSION:=		1.3.3
+PKG_VERSION:=		1.3.8
 PKG_RELEASE:=		1
-PKG_HASH:=		f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97
+PKG_HASH:=		f3c1102b07eb0e7a50538f9fc9037c18387165bc70d4b626e94ab725b9d4d1bf
 PKG_DESCR:=		fast light toolkit
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		mesa libx11 libxi freeglut libfreetype

package/font-adobe-100dpi/Makefile

@@ -22,9 +22,11 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_ADOBE_100DPI,font-adobe-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+XAKE_FLAGS+=		DESTDIR=''
+
 font-adobe-100dpi-install:
 	$(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi
-	$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
+	$(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/100dpi/* \
 		$(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/font-adobe-75dpi/Makefile

@@ -22,9 +22,11 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_ADOBE_75DPI,font-adobe-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+XAKE_FLAGS+=		DESTDIR=''
+
 font-adobe-75dpi-install:
 	$(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi
-	$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
+	$(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/75dpi/* \
 		$(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/font-util/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		font-util
-PKG_VERSION:=		1.3.1
+PKG_VERSION:=		1.3.2
 PKG_RELEASE:=		1
-PKG_HASH:=		34ebb0c9c14e0a392cdd5ea055c92489ad88d55ae148b2f1cfded0f3f63f2b5b
+PKG_HASH:=		f115a3735604de1e852a4bf669be0269d8ce8f21f8e0e74ec5934b31dadc1e76
 PKG_DESCR:=		font utility
 PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/

package/font-util/patches/patch-fontutil_pc_in

@@ -1,11 +1,14 @@
---- font-util-1.1.1.orig/fontutil.pc.in	2009-10-11 06:32:56.000000000 +0200
-+++ font-util-1.1.1/fontutil.pc.in	2010-12-02 22:28:16.000000000 +0100
-@@ -4,7 +4,7 @@ libdir=@libdir@
+--- font-util-1.3.2.orig/fontutil.pc.in	2019-08-26 00:25:25.000000000 +0200
++++ font-util-1.3.2/fontutil.pc.in	2022-03-01 21:10:24.228234038 +0100
+@@ -2,9 +2,9 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
  datarootdir=@datarootdir@
- datadir=@datadir@
+-datadir=@datadir@
++datadir=${prefix}/share
  fontrootdir=@fontrootdir@
 -mapdir=@MAPDIR@
-+mapdir=${prefix}/../@MAPDIR@
++mapdir=${fontrootdir}/util
   
  Name: FontUtil
  Description: Font utilities dirs

package/fontconfig/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		fontconfig
-PKG_VERSION:=		2.12.3
-PKG_RELEASE:=		2
-PKG_HASH:=		ffc3cbf6dd9fcd516ee42f48306a715e66698b238933d6fa7cef02ea8b3b818e
+PKG_VERSION:=		2.13.1
+PKG_RELEASE:=		1
+PKG_HASH:=		9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f
 PKG_DESCR:=		library for configuring and customizing font access
 PKG_SECTION:=		libs/fonts
 PKG_DEPENDS:=		libxml2

package/freetype/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		freetype
-PKG_VERSION:=		2.7
+PKG_VERSION:=		2.11.1
 PKG_RELEASE:=		1
-PKG_HASH:=		7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4
+PKG_HASH:=		f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b
 PKG_DESCR:=		free, high-quality and portable font engine
 PKG_SECTION:=		libs/fonts
 PKG_DEPENDS:=		zlib
@@ -27,11 +27,19 @@ $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE}
 HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--with-zlib \
 			--without-png \
-			--without-bzip2
+			--without-bzip2 \
+			--enable-freetype-config
 CONFIGURE_ARGS+=	--with-zlib \
 			--without-png \
 			--with-harfbuzz=no \
-			--without-bzip2
+			--without-bzip2 \
+			--enable-freetype-config
+
+hostpost-install:
+	$(SED) 's:^includedir=.*:includedir="$${prefix}/include":' \
+                -e 's:^libdir=.*:libdir="$${exec_prefix}/lib":' \
+                $(STAGING_HOST_DIR)/usr/bin/freetype-config
+
 
 libfreetype-install:
 	${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib

package/freetype/patches/patch-builds_unix_freetype-config_in

@@ -1,16 +0,0 @@
---- freetype-2.6.1.orig/builds/unix/freetype-config.in	2015-09-25 07:58:57.000000000 +0200
-+++ freetype-2.6.1/builds/unix/freetype-config.in	2015-10-23 10:37:49.000000000 +0200
-@@ -13,10 +13,10 @@ LC_ALL=C
- export LC_ALL
- 
- prefix="%prefix%"
--exec_prefix="%exec_prefix%"
-+exec_prefix="${prefix}/bin"
- exec_prefix_set="no"
--includedir="%includedir%"
--libdir="%libdir%"
-+includedir="${prefix}/include"
-+libdir="${prefix}/lib"
- 
- usage()
- {

package/freetype/patches/patch-builds_unix_freetype2_in

@@ -1,14 +1,13 @@
---- freetype-2.6.1.orig/builds/unix/freetype2.in	2015-09-25 07:58:57.000000000 +0200
-+++ freetype-2.6.1/builds/unix/freetype2.in	2015-10-23 10:43:36.000000000 +0200
-@@ -1,7 +1,8 @@
+--- freetype-2.11.1.orig/builds/unix/freetype2.in	2021-02-13 09:16:54.000000000 +0100
++++ freetype-2.11.1/builds/unix/freetype2.in	2022-03-01 21:51:10.996321135 +0100
+@@ -1,7 +1,7 @@
  prefix=%prefix%
 -exec_prefix=%exec_prefix%
 -libdir=%libdir%
 -includedir=%includedir%
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
-+
++exec_prefix=%prefix%
++libdir=%prefix%/lib
++includedir=%prefix%/include
  
  Name: FreeType 2
- URL: http://freetype.org
+ URL: https://freetype.org

package/fribidi/Makefile

@@ -4,13 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		fribidi
-PKG_VERSION:=		1.0.9
+PKG_VERSION:=		1.0.11
 PKG_RELEASE:=		1
-PKG_HASH:=		c5e47ea9026fb60da1944da9888b4e0a18854a0e2410bbfe7ad90a054d36e0c7
+PKG_HASH:=		30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d
 PKG_DESCR:=		unicode bidirectional algorithm
 PKG_SECTION:=		libs/misc
 PKG_URL:=		http://www.fribidi.org/
-PKG_SITES:=		https://github.com/fribidi/fribidi/releases/download/v1.0.9/
+PKG_SITES:=		https://github.com/fribidi/fribidi/releases/download/v1.0.11/
 PKG_OPTS:=		dev
 
 include $(ADK_TOPDIR)/mk/package.mk

package/gcr/Makefile

@@ -4,13 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		gcr
-PKG_VERSION:=		3.20.0
-PKG_EXTRAVER:=		3.20
-PKG_RELEASE:=		2
-PKG_HASH:=		90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379
+PKG_VERSION:=		3.40.0
+PKG_EXTRAVER:=		3.40
+PKG_RELEASE:=		1
+PKG_HASH:=		b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 PKG_DESCR:=		gnome keyring library
 PKG_SECTION:=		libs/crypto
-PKG_BUILDDEP:=		p11-kit intltool-host libgtk3
+PKG_BUILDDEP:=		p11-kit intltool-host libgtk3 meson-host
 PKG_URL:=		https://wiki.gnome.org/action/show/Projects/GnomeKeyring
 PKG_SITES:=		http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(PKG_EXTRAVER)/
 
@@ -18,6 +18,15 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GCR,gcr,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
+
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
+
+MESON_FLAGS+=		-Dintrospection=false \
+			-Dgtk_doc=false
+
 gcr-install:
 	$(INSTALL_DIR) $(IDIR_GCR)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/lib*.so* \

package/gdk-pixbuf/Makefile

@@ -11,7 +11,7 @@ PKG_HASH:=		d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879
 PKG_DESCR:=		image loading and pixel buffer manipulation library
 PKG_SECTION:=		libs/image
 PKG_BUILDDEP:=		libjpeg-turbo libtiff glib libpng
-HOST_BUILDDEP:=		glib-host libffi-host
+HOST_BUILDDEP:=		libiconv-host glib-host libffi-host
 PKG_NEEDS:=		c++
 PKG_SITES:=		$(MASTER_SITE_GNOME:=gdk-pixbuf/$(PKG_EXTRAVER)/)
 PKG_OPTS:=		dev

package/glib/Makefile

@@ -4,10 +4,10 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.56.1
+PKG_VERSION:=		2.70.0
 PKG_RELEASE:=		1
-PKG_EXTRAVER:=		2.56
-PKG_HASH:=		40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d
+PKG_EXTRAVER:=		2.70
+PKG_HASH:=		200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742
 PKG_DESCR:=		low-level core library that forms the basis of gtk+
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		libpcre zlib libffi
@@ -24,42 +24,33 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE)))
 $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
-ifeq ($(ADK_PACKAGE_LIBICONV),y)
-CONFIGURE_ARGS+=	--with-libiconv=yes
-else
-CONFIGURE_ARGS+=	--with-libiconv=no
-endif
-CONFIGURE_ARGS+=	--disable-mem-pools \
-			--disable-rebuilds \
-			--disable-fam \
-			--disable-dtrace \
-			--disable-compile-warnings \
-			--with-pcre=system \
-			--with-threads=posix
-CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
-			glib_cv_stack_grows=no \
-			glib_cv_have_strlcpy=no \
-			glib_cv_uscore=no \
-			ac_cv_func_posix_getpwuid_r=yes \
-			ac_cv_func_posix_getgrgid_r=yes
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
 
-HOST_STYLE:=		auto
-HOST_CPPFLAGS+=		-I$(STAGING_HOST_DIR)/usr/include/libmount
-ifneq ($(OS_FOR_BUILD),CYGWIN)
-HOST_CFLAGS+=		-fPIC
-endif
-HOST_CONFIGURE_ARGS+=	--disable-fam \
-			--disable-selinux \
-			--disable-dtrace \
-			--enable-static \
-			--with-pcre=internal \
-			--with-libiconv=yes \
-			--disable-shared \
-			--disable-compile-warnings
+TARGET_CFLAGS+=		-Wno-error=format-nonliteral
 
-hostpost-install:
-	$(CP) $(STAGING_HOST_DIR)/usr/lib/glib-2.0/include/glibconfig.h \
-		$(STAGING_HOST_DIR)/usr/include/glib-2.0/
+HOST_CONFIG_STYLE:=	manual
+HOST_STYLE:=		manual
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
+
+MESON_FLAGS:=		-Dtests=false -Dxattr=false -Doss_fuzz=disabled
+
+host-configure:
+	(cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build)
+
+host-build:
+	(cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build)
+
+glib-hostinstall:
+	(cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build)
+
+do-configure:
+	(cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix /usr \
+		--libdir lib --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf -Dtests=false _build)
+
+do-build:
+	(cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build)
 
 glib-install:
 	$(INSTALL_DIR) $(IDIR_GLIB)/usr/lib

package/glib/patches/patch-gobject-2_0_pc_in

@@ -1,10 +0,0 @@
---- glib-2.56.1.orig/gobject-2.0.pc.in	2016-10-22 07:12:49.000000000 +0200
-+++ glib-2.56.1/gobject-2.0.pc.in	2021-11-04 05:31:24.191433397 +0100
-@@ -7,6 +7,6 @@ Name: GObject
- Description: GLib Type, Object, Parameter and Signal Library
- Requires: glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} -lgobject-2.0
-+Libs: -L${libdir} -lgobject-2.0 -lffi
- Libs.private: @LIBFFI_LIBS@
- Cflags:

package/glib/patches/patch-meson_build

@@ -0,0 +1,10 @@
+--- glib-2.70.0.orig/meson.build	2021-09-17 12:17:56.849962700 +0200
++++ glib-2.70.0/meson.build	2022-02-28 20:24:15.048295012 +0100
+@@ -449,6 +449,7 @@ if cc.get_id() == 'gcc' or cc.get_id() =
+     '-Werror=missing-include-dirs',
+     '-Werror=missing-prototypes',
+     '-Werror=pointer-arith',
++    '-Wno-error=format-nonliteral',
+   ]
+   warning_c_link_args = [
+     '-Wl,-z,nodelete',

package/gst-plugins-base/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		gst-plugins-base
-PKG_VERSION:=		1.8.2
+PKG_VERSION:=		1.19.3
 PKG_RELEASE:=		1
-PKG_HASH:=		9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d
+PKG_HASH:=		e277f198623a26c1b0a1e19734656392e9368bebf3677cd94262a1316a960827
 PKG_DESCR:=		gstreamer base plugins
 PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		gstreamer
@@ -19,8 +19,13 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GST_PLUGINS_BASE,gst-plugins-base,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
+
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
+
 TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
-CONFIGURE_ARGS+=	--without-x
 
 gst-plugins-base-install:
 	$(INSTALL_DIR) $(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/

package/gst-plugins-good/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		gst-plugins-good
-PKG_VERSION:=		1.8.2
+PKG_VERSION:=		1.19.3
 PKG_RELEASE:=		1
-PKG_HASH:=		8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944
+PKG_HASH:=		79ea32a77fa47e6596530e38113bf97c113fd95658087d9a91ffb8af47d11d07
 PKG_DESCR:=		gstreamer good plugins
 PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		gstreamer
@@ -19,8 +19,13 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GST_PLUGINS_GOOD,gst-plugins-good,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
+
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
+
 TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
-CONFIGURE_ARGS+=	--without-x
 
 gst-plugins-good-install:
 	$(INSTALL_DIR) $(IDIR_GST_PLUGINS_GOOD)/usr/lib/gstreamer-1.0/

package/harfbuzz/Makefile

@@ -4,19 +4,19 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		harfbuzz
-PKG_VERSION:=		1.4.2
+PKG_VERSION:=		3.4.0
 PKG_RELEASE:=		1
-PKG_HASH:=		8f234dcfab000fdec24d43674fffa2fdbdbd654eb176afbde30e8826339cb7b3
+PKG_HASH:=		810bcd3d22fae3c2c18c3688455abc1cd0d7fb2fae25404890b0d77e6443bd0a
 PKG_DESCR:=		opentype text shaping engine
 PKG_SECTION:=		libs/fonts
-PKG_SITES:=		http://www.freedesktop.org/software/harfbuzz/release/
+PKG_SITES:=		https://github.com/harfbuzz/harfbuzz/archive/refs/tags/
 PKG_DEPENDS:=		cairo icu4c
 PKG_BUILDDEP:=		cairo icu4c
 HOST_BUILDDEP:=		cairo-host icu4c-host
 PKG_NEEDS:=		c++
 PKG_OPTS:=		dev
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+DISTFILES:=             ${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
@@ -24,8 +24,19 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_LDFLAGS+=		-lpthread -lrt
-HOST_STYLE:=		auto
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
+
+HOST_STYLE:=		meson
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
+
+MESON_FLAGS+=		-Dfreetype=disabled \
+			-Dtests=disabled
+
+host-postinstall:
+	$(CP) $(WRKBUILD)/meson-private/harfbuzz.pc \
+		$(STAGING_HOST_DIR)/usr/lib/pkgconfig/
 
 harfbuzz-install:
 	$(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib

package/harfbuzz/patches/patch-Makefile_in

@@ -1,11 +0,0 @@
---- harfbuzz-1.2.3.orig/Makefile.in	2016-02-25 04:26:05.967296536 +0100
-+++ harfbuzz-1.2.3/Makefile.in	2016-04-03 19:27:12.062508784 +0200
-@@ -373,7 +373,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- NULL = 
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = src util test docs win32
-+SUBDIRS = src
- EXTRA_DIST = \
- 	autogen.sh \
- 	harfbuzz.doap \

package/harfbuzz/patches/patch-src_harfbuzz_pc_in

@@ -1,18 +0,0 @@
---- harfbuzz-1.2.3.orig/src/harfbuzz.pc.in	2016-01-06 13:00:36.113138042 +0100
-+++ harfbuzz-1.2.3/src/harfbuzz.pc.in	2016-03-12 21:55:46.457327612 +0100
-@@ -1,13 +1,10 @@
- prefix=%prefix%
--exec_prefix=%exec_prefix%
--libdir=%libdir%
--includedir=%includedir%
- 
- Name: harfbuzz
- Description: HarfBuzz text shaping library
- Version: %VERSION%
- 
--Libs: -L${libdir} -lharfbuzz
-+Libs: -L${prefix}/lib -lharfbuzz
- Libs.private: %libs_private%
- Requires.private: %requires_private%
--Cflags: -I${includedir}/harfbuzz
-+Cflags: -I${prefix}/include/harfbuzz

package/libepoxy/Makefile

@@ -4,22 +4,27 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libepoxy
-PKG_VERSION:=		1.3.1
+PKG_VERSION:=		1.5.9
 PKG_RELEASE:=		1
-PKG_HASH:=		1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64
+PKG_HASH:=		d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4
 PKG_DESCR:=		opengl function pointer management
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		mesa
-PKG_BUILDDEP:=		util-macros-host mesa
-PKG_SITES:=		http://crux.nu/files/
+PKG_BUILDDEP:=		util-macros-host mesa meson-host
+PKG_SITES:=		https://github.com/anholt/libepoxy/releases/download/$(PKG_VERSION)/
 PKG_OPTS:=		dev
 
-DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBEPOXY,libepoxy,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
+
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
+
+
 libepoxy-install:
 	$(INSTALL_DIR) $(IDIR_LIBEPOXY)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libepoxy*.so* \

package/libgpg-error/Makefile

@@ -54,7 +54,7 @@ ifeq ($(ADK_TARGET_ARCH_SPARC64),y)
 LIBGPG_PREFIX:=		sparc64-unknown-linux-gnu
 endif
 ifeq ($(ADK_TARGET_ARCH_X86),y)
-LIBGPG_PREFIX:=		i686-pc-linux-gnu
+LIBGPG_PREFIX:=		i686-unknown-linux-gnu
 endif
 ifeq ($(ADK_TARGET_ARCH_X86_64),y)
 LIBGPG_PREFIX:=		x86_64-pc-linux-gnu

package/libgtk3/Makefile

@@ -4,18 +4,19 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libgtk3
-PKG_VERSION:=		3.20.6
-PKG_EXTRAVER:=		3.20
+PKG_VERSION:=		3.24.31
+PKG_EXTRAVER:=		3.24
 PKG_RELEASE:=		1
-PKG_HASH:=		3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2
+PKG_HASH:=		423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9
 PKG_DESCR:=		multi-platform toolkit for creating graphical user interfaces
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		glib cairo libxi libepoxy pango at-spi2-core
 PKG_DEPENDS+=		at-spi2-atk libxext libxrender libx11
-PKG_DEPENDS+=		libxcomposite libxdamage
+PKG_DEPENDS+=		libxcomposite libxdamage fribidi
 PKG_BUILDDEP:=		cairo atk pango libXext renderproto libXrender
 PKG_BUILDDEP+=		gdk-pixbuf libXcomposite libXdamage libX11 libXi
 PKG_BUILDDEP+=		at-spi2-core at-spi2-atk gdk-pixbuf-host libepoxy
+PKG_BUILDDEP+=		fribidi
 PKG_NEEDS:=		c++
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		$(MASTER_SITE_GNOME:=gtk+/$(PKG_EXTRAVER)/)
@@ -35,6 +36,7 @@ $(eval $(call PKG_template,LIBGTK3,libgtk3,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_D
 
 HOST_CFLAGS+=           -I$(STAGING_HOST_DIR)/usr/include/glib-2.0 -I$(STAGING_HOST_DIR)/usr/include/gdk-pixbuf-2.0
 HOST_LDFLAGS+=		-lgobject-2.0 -lgmodule-2.0 -pthread -lrt -lglib-2.0 -lgdk_pixbuf-2.0
+CONFIGURE_ENV+=		GLIB_COMPILE_RESOURCES=$(STAGING_HOST_DIR)/usr/bin/glib-compile-resources
 CONFIGURE_ARGS+=	--disable-gtk-doc-html \
 			--disable-gtk-doc \
 			--disable-modules \

package/libwebp/Makefile

@@ -4,24 +4,24 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libwebp
-PKG_VERSION:=		0.3.1
+PKG_VERSION:=		1.2.2
 PKG_RELEASE:=		1
-PKG_HASH:=		b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7
+PKG_HASH:=		51e9297aadb7d9eb99129fe0050f53a11fcce38a0848fb2b0389e385ad93695e
 PKG_DESCR:=		new image format for the web
 PKG_SECTION:=		libs/image
+PKG_BUILDEP:=		cmake-host
 PKG_URL:=		https://developers.google.com/speed/webp/
-PKG_SITES:=		https://webp.googlecode.com/files/
+PKG_SITES:=		https://github.com/webmproject/libwebp/archive/refs/tags/
 PKG_OPTS:=		dev
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		v${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
 
+CONFIG_STYLE:=		cmake
+
 $(eval $(call PKG_template,LIBWEBP,libwebp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libwebp-install:
-	$(INSTALL_DIR) $(IDIR_LIBWEBP)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libwebp*.so* \
-		$(IDIR_LIBWEBP)/usr/lib
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/meson/src/cross-compilation.conf.in

@@ -9,11 +9,13 @@ cpp = '@TARGET_CROSS@g++'
 ar = '@TARGET_CROSS@ar'                                                      
 strip = '@TARGET_CROSS@strip'                                                
 pkgconfig = '@STAGING_HOST_DIR@/usr/bin/pkg-config'
+
 [properties]                                                                 
 c_args = [@TARGET_CFLAGS@]                                                   
 c_link_args = [@TARGET_LDFLAGS@]                                             
 cpp_args = [@TARGET_CXXFLAGS@]                                               
 cpp_link_args = [@TARGET_LDFLAGS@]                                           
+needs_exe_wrapper = true
                                                                              
 [host_machine]                                                               
 system = 'linux'                                                             

package/midori/Makefile

@@ -1,49 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		midori
-PKG_VERSION:=		0.5.11
-PKG_RELEASE:=		2
-PKG_HASH:=		3b8f3a0fe8283fcbb0f9c88b2165e2689d3e18f7c1b5d275fff97cf20e7be198
-PKG_DESCR:=		graphical web browser
-PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libnotify webkitgtk gcr pango libatk cairo libsqlite
-PKG_DEPENDS+=		gdk-pixbuf libgtk3 p11-kit libxcomposite at-spi2-atk
-PKG_DEPENDS+=		libpng icu4c gstreamer gst-plugins-base dbus libgnutls
-PKG_DEPENDS+=		libxslt libjpeg-turbo libtasn1 libnettle enchant
-PKG_DEPENDS+=		libgmp at-spi2-core libxext
-PKG_BUILDDEP:=		cmake-host vala-host libnotify webkitgtk gcr
-PKG_BUILDDEP+=		librsvg-host librsvg pango atk cairo sqlite
-PKG_BUILDDEP+=		gdk-pixbuf libgtk3 p11-kit libpng icu4c gstreamer
-PKG_BUILDDEP+=		libXext
-PKG_URL:=		http://www.midori-browser.org
-PKG_SITES:=		http://distfiles.openadk.org/
-
-PKG_ARCH_DEPENDS:=	!mips
-
-WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,MIDORI,midori,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=          cmake
-CMAKE_FLAGS+=		-DUSE_GTK3=ON \
-			-DHALF_BRO_INCOM_WEBKIT2=ON \
-			-DENABLE_NLS=OFF \
-			-DUSE_ZEITGEIST=OFF
-
-midori-install:
-	$(INSTALL_DIR) $(IDIR_MIDORI)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/* \
-		$(IDIR_MIDORI)/usr/lib
-	$(INSTALL_DIR) $(IDIR_MIDORI)/usr/share
-	$(CP) $(WRKINST)/usr/share/* \
-		$(IDIR_MIDORI)/usr/share
-	$(INSTALL_DIR) $(IDIR_MIDORI)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/midori \
-		$(IDIR_MIDORI)/usr/bin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/midori/patches/patch-CMakeLists_txt

@@ -1,13 +0,0 @@
---- midori-0.5.11.orig/CMakeLists.txt	2015-08-30 13:56:26.000000000 +0200
-+++ midori-0.5.11/CMakeLists.txt	2016-04-03 15:01:39.481595419 +0200
-@@ -206,8 +206,8 @@ if (HALF_BRO_INCOM_WEBKIT2)
- elseif (USE_GTK3)
-     pkg_check_modules(DEPS_GTK REQUIRED
-                       gtk+-3.0>=3.10.0
--                      webkitgtk-3.0>=1.8.1
--                      javascriptcoregtk-3.0
-+                      webkitgtk-4.0>=1.8.1
-+                      javascriptcoregtk-4.0
-                       )
-     add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-3.0_VERSION}\"")
-     add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkitgtk-3.0_VERSION}\"")

package/pango/Makefile

@@ -4,14 +4,14 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		pango
-PKG_VERSION:=		1.40.3
-PKG_EXTRAVER:=		1.40
+PKG_VERSION:=		1.50.4
+PKG_EXTRAVER:=		1.50
 PKG_RELEASE:=		1
-PKG_HASH:=		abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3
+PKG_HASH:=		f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162
 PKG_DESCR:=		library for laying out and rendering of text
 PKG_SECTION:=		libs/fonts
-PKG_BUILDDEP:=		libXft glib cairo harfbuzz fontconfig
-HOST_BUILDDEP:=		cairo-host harfbuzz-host
+PKG_BUILDDEP:=		libXft glib cairo harfbuzz fontconfig fribidi
+HOST_BUILDDEP:=		cairo-host harfbuzz-host glib-host meson-host
 PKG_NEEDS:=		c++
 PKG_URL:=		http://www.pango.org/
 PKG_SITES:=		$(MASTER_SITE_GNOME:=pango/$(PKG_EXTRAVER)/)
@@ -23,10 +23,12 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,PANGO,pango,$(PKG_VERSION)-$(PKG_RELEASE)))
 $(eval $(call PKG_template,PANGO,pango,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
-HOST_LDFLAGS+=		-lffi
-HOST_STYLE:=		auto
-AUTOTOOLS_STYLE:=	autoreconf
-CONFIGURE_ARGS+=	--disable-man
+WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
+
+HOST_STYLE:=		meson
+CONFIG_STYLE:=		meson
+BUILD_STYLE:=		meson
+INSTALL_STYLE:=		meson
 
 pango-install:
 	$(INSTALL_DIR) $(IDIR_PANGO)/etc/pango $(IDIR_PANGO)/usr/lib

package/webkitgtk/Makefile

@@ -4,18 +4,18 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		webkitgtk
-PKG_VERSION:=		2.18.0
+PKG_VERSION:=		2.34.6
 PKG_RELEASE:=		1
-PKG_HASH:=		b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d
+PKG_HASH:=		6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6
 PKG_DESCR:=		web browser engine
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		glib icu4c zlib libwebp libgtk3 libsoup
 PKG_DEPENDS+=		libsecret libxt harfbuzz cairo libgcrypt
-PKG_DEPENDS+=		gst-plugins-base gstreamer libnotify
+PKG_DEPENDS+=		gstreamer libnotify libwebp gst-plugins-base
 PKG_BUILDDEP:=		glib icu4c zlib libwebp libgtk3 cmake-host
 PKG_BUILDDEP+=		libsoup libsecret libXt harfbuzz libnotify
-PKG_BUILDDEP+=		gst-plugins-base gstreamer cairo enchant
-PKG_BUILDDEP+=		gnutls libgcrypt
+PKG_BUILDDEP+=		gstreamer cairo enchant libwebp gst-plugins-base
+PKG_BUILDDEP+=		gnutls libgcrypt ruby-host
 PKG_URL:=		http://www.webkitgtk.org/
 PKG_SITES:=		http://webkitgtk.org/releases/
 PKG_OPTS:=		dev
@@ -41,6 +41,14 @@ CMAKE_FLAGS+= 		-DPORT=GTK \
 			-DUSE_LIBNOTIFY=OFF \
 			-DENABLE_JIT=OFF \
 			-DUSE_LIBHYPHEN=OFF \
+			-DUSE_SOUP2=ON \
+			-DUSE_WPE_RENDERER=OFF \
+			-DENABLE_GAMEPAD=OFF \
+			-DUSE_OPENJPEG=OFF \
+			-DUSE_WOFF2=OFF \
+			-DUSE_SYSTEMD=OFF \
+			-DUSE_LCMS=OFF \
+			-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
 			-DENABLE_INTROSPECTION=OFF
 
 webkitgtk-install:

package/webkitgtk/patches/patch-Source_PlatformGTK_cmake

@@ -1,7 +0,0 @@
---- webkitgtk-2.12.0.orig/Source/PlatformGTK.cmake	2016-03-17 08:51:05.000000000 +0100
-+++ webkitgtk-2.12.0/Source/PlatformGTK.cmake	2016-04-03 10:54:31.244767406 +0200
-@@ -1,4 +1,3 @@
--add_subdirectory(${WEBCORE_DIR}/platform/gtk/po)
- 
- # This allows exposing a 'gir' target which builds all GObject introspection files.
- if (ENABLE_INTROSPECTION)

package/xterm/Makefile

@@ -4,17 +4,17 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xterm
-PKG_VERSION:=		369
+PKG_VERSION:=		371
 PKG_RELEASE:=		1
-PKG_HASH:=		71ed6a48d064893d2149741a002781a973496fd24d52dadd364f63439a764e26
+PKG_HASH:=		32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5
 PKG_DESCR:=		terminal emulator
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libxaw libxt libncurses libxft fontconfig libuuid
 PKG_BUILDDEP:=		ncurses libXt libXmu libXaw libXft util-linux libSM
 PKG_URL:=		http://invisible-island.net/xterm/xterm.html
-PKG_SITES:=		https://invisible-island.net/datafiles/release/
+PKG_SITES:=		http://invisible-mirror.net/archives/xterm/
 
-DISTFILES:=             ${PKG_NAME}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tgz
 
 include $(ADK_TOPDIR)/mk/package.mk