libcairo: unsplit libcairo-gobject subpackage

Used by librsvg, but libcairo is being installed anyway.

packages/libcairo/build.sh

@@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://cairographics.org
 TERMUX_PKG_DESCRIPTION="Cairo 2D vector graphics library"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.16.0
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/cairo-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
 TERMUX_PKG_DEPENDS="fontconfig, freetype, glib, liblzo, libpixman, libpng, libx11, libxcb, libxext, libxrender, zlib"
-TERMUX_PKG_BREAKS="libcairo-dev"
-TERMUX_PKG_REPLACES="libcairo-dev"
+TERMUX_PKG_BREAKS="libcairo-dev, libcairo-gobject"
+TERMUX_PKG_REPLACES="libcairo-dev, libcairo-gobject"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-gtk-doc-html

packages/libcairo/libcairo-gobject.subpackage.sh

@@ -1,3 +0,0 @@
-TERMUX_SUBPKG_INCLUDE="lib/libcairo-gobject.so*"
-TERMUX_SUBPKG_DESCRIPTION="GObject bindings for cairo"
-TERMUX_SUBPKG_DEPENDS="glib"

packages/librsvg/build.sh

@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/action/show/Projects/LibRsvg
 TERMUX_PKG_DESCRIPTION="Library to render SVG files using cairo"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=2.46.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/librsvg/${TERMUX_PKG_VERSION:0:4}/librsvg-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=768e46467d874161a277bd696551f4f364b3c8d51eeedeb9b4fe1277a2496ae8
-TERMUX_PKG_DEPENDS="libcroco, pango, gdk-pixbuf, libcairo-gobject, zlib"
+TERMUX_PKG_DEPENDS="gdk-pixbuf, libcairo, libcroco, pango, zlib"
 TERMUX_PKG_BREAKS="librsvg-dev"
 TERMUX_PKG_REPLACES="librsvg-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-introspection --disable-pixbuf-loader"