diff --git a/x11-libs/gdk-pixbuf/gdk_pixbuf-2.42.2.recipe b/x11-libs/gdk-pixbuf/gdk_pixbuf-2.42.2.recipe index ff85d8a47..51d5b4377 100644 --- a/x11-libs/gdk-pixbuf/gdk_pixbuf-2.42.2.recipe +++ b/x11-libs/gdk-pixbuf/gdk_pixbuf-2.42.2.recipe @@ -9,7 +9,7 @@ GdkRGB buffers. HOMEPAGE="https://wiki.gnome.org/Projects/GdkPixbuf" COPYRIGHT="1999-2020 Gnome Project" LICENSE="GNU LGPL v2.1" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.gnome.org/sources/gdk-pixbuf/${portVersion%.*}/gdk-pixbuf-$portVersion.tar.xz" CHECKSUM_SHA256="83c66a1cfd591d7680c144d2922c5955d38b4db336d7cd3ee109f7bcf9afef15" SOURCE_DIR="gdk-pixbuf-$portVersion" @@ -22,13 +22,17 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" gdk_pixbuf$secondaryArchSuffix = $portVersion + cmd:gdk_pixbuf_csource$secondaryArchSuffix = $portVersion + cmd:gdk_pixbuf_pixdata$secondaryArchSuffix = $portVersion + cmd:gdk_pixbuf_query_loaders$secondaryArchSuffix = $portVersion + cmd:gdk_pixbuf_thumbnailer$secondaryArchSuffix = $portVersion lib:libgdk_pixbuf_2.0$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix + shared_mime_info$secondaryArchSuffix lib:libffi$secondaryArchSuffix lib:libgio_2.0$secondaryArchSuffix - lib:libgirepository_1.0$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix lib:libgmodule_2.0$secondaryArchSuffix lib:libgobject_2.0$secondaryArchSuffix @@ -46,29 +50,22 @@ PROVIDES_devel=" " REQUIRES_devel=" gdk_pixbuf$secondaryArchSuffix == $portVersion base - " - -PROVIDES_tools=" - gdk_pixbuf${secondaryArchSuffix}_tools = $portVersion - cmd:gdk_pixbuf_csource$secondaryArchSuffix = $portVersion - cmd:gdk_pixbuf_pixdata$secondaryArchSuffix = $portVersion - cmd:gdk_pixbuf_query_loaders$secondaryArchSuffix = $portVersion - cmd:gdk_pixbuf_thumbnailer$secondaryArchSuffix = $portVersion - " -REQUIRES_tools=" - gdk_pixbuf$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix - lib:libgio_2.0$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix - lib:libgmodule_2.0$secondaryArchSuffix - lib:libgobject_2.0$secondaryArchSuffix + devel:libffi$secondaryArchSuffix + devel:libglib_2.0$secondaryArchSuffix + devel:libpcre$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel shared_mime_info$secondaryArchSuffix - devel:libgirepository_1.0$secondaryArchSuffix + devel:libffi$secondaryArchSuffix + devel:libgio_2.0$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix + devel:libgmodule_2.0$secondaryArchSuffix + devel:libgobject_2.0$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libtiff$secondaryArchSuffix @@ -79,13 +76,14 @@ BUILD_PREREQUIRES=" cmd:meson cmd:ninja cmd:pkg_config$secondaryArchSuffix + cmd:python3 " defineDebugInfoPackage gdk_pixbuf$secondaryArchSuffix \ - "$(getPackagePrefix tools)/$relativeBinDir"/gdk-pixbuf-csource \ - "$(getPackagePrefix tools)/$relativeBinDir"/gdk-pixbuf-pixdata \ - "$(getPackagePrefix tools)/$relativeBinDir"/gdk-pixbuf-query-loaders \ - "$(getPackagePrefix tools)/$relativeBinDir"/gdk-pixbuf-thumbnailer \ + "$binDir"/gdk-pixbuf-csource \ + "$binDir"/gdk-pixbuf-pixdata \ + "$binDir"/gdk-pixbuf-query-loaders \ + "$binDir"/gdk-pixbuf-thumbnailer \ "$libDir"/libgdk_pixbuf-2.0.so.$libVersion BUILD() @@ -112,9 +110,6 @@ INSTALL() packageEntries devel \ $developDir - - packageEntries tools \ - $binDir } TEST()