Revert "glib2: update to 2.64.2"

It is not ready and there are some issues described in
https://github.com/openwrt/packages/pull/11442

This reverts commit b465ac3002.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

libs/glib2/Makefile

@@ -8,33 +8,36 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
-PKG_VERSION:=2.64.2
-PKG_RELEASE:=1
+PKG_VERSION:=2.58.3
+PKG_RELEASE:=5
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/glib/2.64
-PKG_HASH:=9a2f21ed8f13b9303399de13a0252b7cbcede593d26971378ec6cb90e87f2277
+PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
+PKG_SOURCE_URL:=@GNOME/glib/2.58
+PKG_HASH:=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+
+PKG_BUILD_PARALLEL:=1
+HOST_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=gettext
+HOST_BUILD_DEPENDS:=gettext-full/host libiconv/host libffi/host
+PKG_INSTALL:=1
 
-PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-PKG_LICENSE:=LGPL-2.1-or-later
-PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:gnome:glib
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
+PKG_FIXUP:=autoreconf
+
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=meson/host
-HOST_BUILD_DEPENDS:=meson/host libffi/host libiconv/host
-PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
-include ../../devel/meson/meson.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/glib2
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+zlib +libpthread +libffi +libattr @!USE_UCLIBC
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +zlib +libpthread +libffi +libattr
   TITLE:=glib 2.0
+  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
   URL:=http://www.gtk.org/
 endef
 
@@ -42,42 +45,35 @@ define Package/glib2/description
   The GLib library of C routines
 endef
 
-TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
-TARGET_LDFLAGS += -Wl,--gc-sections
+TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections -flto
 
-COMP_ARGS= \
-	-Dselinux=disabled \
-	-Dlibmount=disabled \
-	-Dinternal_pcre=true \
-	-Dman=false \
-	-Ddtrace=false \
-	-Dsystemtap=false \
-	-Dgtk_doc=false \
-	-Dbsymbolic_functions=true \
-	-Dforce_posix_threads=true \
-	-Dfam=false \
-	-Dinstalled_tests=false \
-	-Dnls=disabled \
-	-Doss_fuzz=disabled
+HOST_CONFIGURE_ARGS += \
+	--disable-libelf \
+	--disable-selinux \
+	--with-libiconv=gnu \
+	--with-pcre=internal \
+	--disable-libmount
 
-MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false
-MESON_ARGS += $(COMP_ARGS) -Dxattr=true
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-debug \
+	--disable-selinux \
+	--disable-libmount \
+	--disable-fam \
+	--disable-gtk-doc-html \
+	--disable-man \
+	--disable-compile-warnings \
+	--with-libiconv=gnu \
+	--with-pcre=internal
 
-# hack to compile static libraries
-define Build/Compile
-	$(call Build/Compile/Meson)
-	$(call Ninja,-C $(MESON_BUILD_DIR) install,DESTDIR="$(PKG_INSTALL_DIR)")
-	$(call Meson, \
-		--reconfigure \
-		--buildtype plain \
-		--native-file $(PKG_BUILD_DIR)/openwrt-native.txt \
-		--cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \
-		-Ddefault_library=static \
-		$(MESON_ARGS) \
-		$(MESON_BUILD_DIR) \
-		$(PKG_BUILD_DIR), \
-		$(MESON_VARS))
-endef
+CONFIGURE_VARS += \
+	glib_cv_stack_grows=no \
+	glib_cv_uscore=no \
+	ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR_HOSTPKG)/bin/glib-genmarshal \
+	ac_cv_func_mmap_fixed_mapped=yes \
+	ac_cv_func_posix_getpwuid_r=yes \
+	ac_cv_func_posix_getgrgid_r=yes
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin
@@ -102,7 +98,7 @@ define Build/InstallDev
 		$(1)/usr/lib/
 
 	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
+		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
 		$(1)/usr/lib/
 
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig