diff --git a/dev-cpp/glibmm/glibmm-2.57.1.recipe b/dev-cpp/glibmm/glibmm-2.66.0.recipe similarity index 50% rename from dev-cpp/glibmm/glibmm-2.57.1.recipe rename to dev-cpp/glibmm/glibmm-2.66.0.recipe index 13929054f..24339a37c 100644 --- a/dev-cpp/glibmm/glibmm-2.57.1.recipe +++ b/dev-cpp/glibmm/glibmm-2.66.0.recipe @@ -1,28 +1,28 @@ SUMMARY="C++ interface for glib2" DESCRIPTION="A C++ API for parts of glib that are useful for C++." HOMEPAGE="https://www.gtkmm.org/en/" -COPYRIGHT="2018 The gtkmm Development Team" +COPYRIGHT="2021 The gtkmm Development Team" LICENSE="GNU LGPL v2.1 GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/glibmm/${portVersion%.*}/glibmm-$portVersion.tar.xz" -CHECKSUM_SHA256="b98a9ea2ed5ea0a62d908182974e8a049fe7a890aad525b44a28bb5e44ca0d4c" +CHECKSUM_SHA256="9e1db7d43d2e2d4dfa2771354e21a69a6beec7c446b711619cf8c779e13a581e" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" libVersion="1.3.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" -portVers="2.58" +apiVers="2.4" PROVIDES=" glibmm$secondaryArchSuffix = $portVersion lib:libgiomm$secondaryArchSuffix = $libVersionCompat - lib:libgiomm_$portVers$secondaryArchSuffix = $libVersionCompat + lib:libgiomm_$apiVers$secondaryArchSuffix = $libVersionCompat lib:libglibmm$secondaryArchSuffix = $libVersionCompat - lib:libglibmm_$portVers$secondaryArchSuffix = $libVersionCompat + lib:libglibmm_$apiVers$secondaryArchSuffix = $libVersionCompat lib:libglibmm_generate_extra_defs$secondaryArchSuffix = $libVersionCompat - lib:libglibmm_generate_extra_defs_$portVers$secondaryArchSuffix = $libVersionCompat + lib:libglibmm_generate_extra_defs_$apiVers$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -30,21 +30,21 @@ REQUIRES=" lib:libgmodule_2.0$secondaryArchSuffix lib:libgobject_2.0$secondaryArchSuffix lib:libintl$secondaryArchSuffix - lib:libsigc_3.0$secondaryArchSuffix + lib:libsigc_2.0$secondaryArchSuffix " PROVIDES_devel=" glibmm${secondaryArchSuffix}_devel = $portVersion devel:libgiomm$secondaryArchSuffix = $libVersionCompat - devel:libgiomm_$portVers$secondaryArchSuffix = $libVersionCompat + devel:libgiomm_$apiVers$secondaryArchSuffix = $libVersionCompat devel:libglibmm$secondaryArchSuffix = $libVersionCompat - devel:libglibmm_$portVers$secondaryArchSuffix = $libVersionCompat + devel:libglibmm_$apiVers$secondaryArchSuffix = $libVersionCompat devel:libglibmm_generate_extra_defs$secondaryArchSuffix = $libVersionCompat - devel:libglibmm_generate_extra_defs_$portVers$secondaryArchSuffix = $libVersionCompat + devel:libglibmm_generate_extra_defs_$apiVers$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" glibmm$secondaryArchSuffix == $portVersion base - devel:libsigc_3.0$secondaryArchSuffix + devel:libsigc_2.0$secondaryArchSuffix " BUILD_REQUIRES=" @@ -53,58 +53,58 @@ BUILD_REQUIRES=" devel:libgmodule_2.0$secondaryArchSuffix devel:libgobject_2.0$secondaryArchSuffix devel:libintl$secondaryArchSuffix - devel:libsigc_3.0$secondaryArchSuffix + devel:libsigc_2.0$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:awk - cmd:dot - cmd:doxygen - cmd:find + cmd:cmake cmd:gcc$secondaryArchSuffix - cmd:grep - cmd:m4 - cmd:make - cmd:perl + cmd:meson + cmd:ninja cmd:pkg_config$secondaryArchSuffix - cmd:xsltproc " defineDebugInfoPackage glibmm$secondaryArchSuffix \ - "$libDir"/libgiomm-$portVers.so.$libVersion \ - "$libDir"/libglibmm-$portVers.so.$libVersion \ - "$libDir"/libglibmm_generate_extra_defs-$portVers.so.$libVersion + "$libDir"/libgiomm-$apiVers.so.$libVersion \ + "$libDir"/libglibmm-$apiVers.so.$libVersion \ + "$libDir"/libglibmm_generate_extra_defs-$apiVers.so.$libVersion BUILD() { - runConfigure ./configure - make $jobArgs + CFLAGS="-D_BSD_SOURCE" \ + LDFLAGS="-lbsd -lgnu -lnetwork" meson build \ + --prefix=$prefix --includedir=$includeDir \ + --libdir=$libDir --datadir=$dataDir --bindir=$binDir \ + -Dmaintainer-mode=false + + ninja $jobArgs -C build } INSTALL() { - make install + ninja -C build install + rm -rf $libDir/*.la - mkdir -p $developDocDir - mv $dataDir/* $developDocDir - rmdir $dataDir + mv $libDir/glibmm-$apiVers/include/*.h $includeDir/glibmm-$apiVers + mv $libDir/giomm-$apiVers/include/*.h $includeDir/giomm-$apiVers + rm -rf $libDir/{glibmm-$apiVers,giomm-$apiVers} - mv $libDir/*/include/*.h $includeDir - rmdir $libDir/*/include - - prepareInstalledDevelLibs libgiomm-$portVers \ - libglibmm-$portVers libglibmm_generate_extra_defs-$portVers + prepareInstalledDevelLibs libgiomm-$apiVers \ + libglibmm-$apiVers libglibmm_generate_extra_defs-$apiVers fixPkgconfig + sed -i -e 's|-I${libdir}/glibmm-2.4/include||' \ + $developLibDir/pkgconfig/glibmm-$apiVers.pc + sed -i -e 's|-I${libdir}/giomm-2.4/include||' \ + $developLibDir/pkgconfig/giomm-$apiVers.pc + # devel package packageEntries devel \ - "$developDir" \ - "$libDir"/glibmm-$portVers \ - "$libDir"/giomm-$portVers + $developDir } TEST() { - make check + ninja -C build test }