diff --git a/dev-libs/glib/glib2-2.54.2.recipe b/dev-libs/glib/glib2-2.54.3.recipe similarity index 77% rename from dev-libs/glib/glib2-2.54.2.recipe rename to dev-libs/glib/glib2-2.54.3.recipe index 246ebe464..653010751 100644 --- a/dev-libs/glib/glib2-2.54.2.recipe +++ b/dev-libs/glib/glib2-2.54.3.recipe @@ -8,9 +8,8 @@ GUI-related portions of GTK+, could make use of the non-GUI portions of the \ library without the overhead of depending on the entire GUI library. Since GLib is a cross-platform library, applications using it to interface \ with the operating system are usually portable across different operating \ -systems without major changes -" -HOMEPAGE="http://www.gtk.org/" +systems without major changes." +HOMEPAGE="https://www.gtk.org/" COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald 1991-2003 Free Software Foundation, Inc. 1997-2006 University of Cambridge. @@ -23,15 +22,18 @@ COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://git.gnome.org/browse/glib/snapshot/glib-$portVersion.tar.xz" -CHECKSUM_SHA256="c33ee86626d7e83a3f02cbcfbac50b34bd117eacd938168e15e3c91ab47ff38d" +CHECKSUM_SHA256="f04bad866b91cbe66c8277bbe5ec40acc04744a1f68cd4e577b80954678b1323" SOURCE_DIR="glib-$portVersion" PATCHES="glib2-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="?x86" + +libVersion="0.5400.3" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - glib2$secondaryArchSuffix = $portVersion compat >= 2 + glib2$secondaryArchSuffix = $portVersion cmd:gapplication$secondaryArchSuffix cmd:gdbus$secondaryArchSuffix cmd:gdbus_codegen$secondaryArchSuffix @@ -41,11 +43,11 @@ PROVIDES=" cmd:glib_compile_schemas$secondaryArchSuffix cmd:gresource$secondaryArchSuffix cmd:gsettings$secondaryArchSuffix - lib:libgio_2.0$secondaryArchSuffix = 0.5400.2 compat >= 0 - lib:libglib_2.0$secondaryArchSuffix = 0.5400.2 compat >= 0 - lib:libgmodule_2.0$secondaryArchSuffix = 0.5400.2 compat >= 0 - lib:libgobject_2.0$secondaryArchSuffix = 0.5400.2 compat >= 0 - lib:libgthread_2.0$secondaryArchSuffix = 0.5400.2 compat >= 0 + lib:libgio_2.0$secondaryArchSuffix = $libVersionCompat + lib:libglib_2.0$secondaryArchSuffix = $libVersionCompat + lib:libgmodule_2.0$secondaryArchSuffix = $libVersionCompat + lib:libgobject_2.0$secondaryArchSuffix = $libVersionCompat + lib:libgthread_2.0$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -65,48 +67,62 @@ PROVIDES_devel=" cmd:gobject_query$secondaryArchSuffix cmd:gtester$secondaryArchSuffix cmd:gtester_report$secondaryArchSuffix - devel:libgio_2.0$secondaryArchSuffix = 0.5400.2 compat >= 0 - devel:libglib_2.0$secondaryArchSuffix = 0.5400.2 compat >= 0 - devel:libgmodule_2.0$secondaryArchSuffix = 0.5400.2 compat >= 0 - devel:libgobject_2.0$secondaryArchSuffix = 0.5400.2 compat >= 0 - devel:libgthread_2.0$secondaryArchSuffix = 0.5400.2 compat >= 0 + devel:libgio_2.0$secondaryArchSuffix = $libVersionCompat + devel:libglib_2.0$secondaryArchSuffix = $libVersionCompat + devel:libgmodule_2.0$secondaryArchSuffix = $libVersionCompat + devel:libgobject_2.0$secondaryArchSuffix = $libVersionCompat + devel:libgthread_2.0$secondaryArchSuffix = $libVersionCompat " - REQUIRES_devel=" glib2$secondaryArchSuffix == $portVersion base - devel:libffi$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libintl$secondaryArchSuffix - devel:libpcre$secondaryArchSuffix - devel:libz$secondaryArchSuffix - cmd:perl haiku$secondaryArchSuffix - lib:libffi$secondaryArchSuffix + cmd:perl lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix + lib:libffi$secondaryArchSuffix lib:libpcre$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + devel:libffi$secondaryArchSuffix + devel:libpcre$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libiconv$secondaryArchSuffix - devel:libz$secondaryArchSuffix devel:libffi$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libpcre$secondaryArchSuffix >= 1 + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix - cmd:aclocal - cmd:autoconf cmd:make cmd:pkg_config$secondaryArchSuffix cmd:python cmd:which " +defineDebugInfoPackage glib2$secondaryArchSuffix \ + $binDir/gapplication \ + $binDir/gdbus \ + $binDir/gio \ + $binDir/gio-querymodules \ + $binDir/glib-compile-resources \ + $binDir/glib-compile-schemas \ + $binDir/gresource \ + $binDir/gsettings \ + $libDir/libgio-2.0.so.$libVersion \ + $libDir/libglib-2.0.so.$libVersion \ + $libDir/libgmodule-2.0.so.$libVersion \ + $libDir/libgobject-2.0.so.$libVersion \ + $libDir/libgthread-2.0.so.$libVersion + BUILD() { runConfigure ./autogen.sh CFLAGS=-D_BSD_SOURCE diff --git a/dev-libs/glib/patches/glib2-2.54.2.patchset b/dev-libs/glib/patches/glib2-2.54.3.patchset similarity index 100% rename from dev-libs/glib/patches/glib2-2.54.2.patchset rename to dev-libs/glib/patches/glib2-2.54.3.patchset