diff --git a/dev-python/pycairo/patches/pycairo-1.24.0.patchset b/dev-python/pycairo/patches/pycairo-1.24.0.patchset deleted file mode 100644 index ecc69bdc7..000000000 --- a/dev-python/pycairo/patches/pycairo-1.24.0.patchset +++ /dev/null @@ -1,33 +0,0 @@ -From e34815392264061a90515bec7abb880ff1dee15a Mon Sep 17 00:00:00 2001 -From: hfsfox -Date: Wed, 28 Jun 2023 15:41:57 +0000 -Subject: fix headers path - - -diff --git a/setup.py b/setup.py -old mode 100755 -new mode 100644 -index b91fb5c..40ea407 ---- a/setup.py -+++ b/setup.py -@@ -380,7 +380,7 @@ class install_pycairo_header(Command): - source = self.get_inputs()[0] - - # for things using get_include() -- lib_hdir = os.path.join(self.install_lib, "cairo", "include") -+ lib_hdir = os.path.join(self.install_lib, "cairo", "develop/headers") - self.mkpath(lib_hdir) - lib_header_path = os.path.join(lib_hdir, hname) - (out, _) = self.copy_file(source, lib_header_path) -@@ -394,7 +394,7 @@ class install_pycairo_header(Command): - return - - # for things using pkg-config -- data_hdir = os.path.join(self.install_data, "include", "pycairo") -+ data_hdir = os.path.join(self.install_data, "develop/headers", "pycairo") - self.mkpath(data_hdir) - header_path = os.path.join(data_hdir, hname) - (out, _) = self.copy_file(source, header_path) --- -2.37.3 - diff --git a/dev-python/pycairo/pycairo-1.24.0.recipe b/dev-python/pycairo/pycairo-1.24.0.recipe index 32cd43a46..9f7f61b18 100644 --- a/dev-python/pycairo/pycairo-1.24.0.recipe +++ b/dev-python/pycairo/pycairo-1.24.0.recipe @@ -4,10 +4,9 @@ and to deviate only in cases which are clearly better implemented in a more ‘P HOMEPAGE="https://pypi.org/project/pycairo/" COPYRIGHT="2023 pycairo developers" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/pygobject/pycairo/releases/download/v$portVersion/pycairo-$portVersion.tar.gz" CHECKSUM_SHA256="1444d52f1bb4cc79a4a0c0fe2ccec4bd78ff885ab01ebe1c0f637d8392bcafb6" -PATCHES="pycairo-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -17,9 +16,6 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libcairo$secondaryArchSuffix - lib:libcairo_gobject$secondaryArchSuffix - lib:libcairo_script_interpreter$secondaryArchSuffix " BUILD_REQUIRES=" @@ -29,14 +25,9 @@ BUILD_REQUIRES=" devel:libcairo_script_interpreter$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake cmd:gcc$secondaryArchSuffix - cmd:python$pythonVersion - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make + cmd:meson + cmd:ninja cmd:pkg_config$secondaryArchSuffix " @@ -56,15 +47,14 @@ for i in "${!PYTHON_PACKAGES[@]}"; do \"" fi eval "REQUIRES_$pythonPackage=\" - haiku - setuptools_$pythonPackage - toml_$pythonPackage - cmd:git + haiku$secondaryArchSuffix cmd:python$pythonVersion + lib:libcairo$secondaryArchSuffix + lib:libcairo_gobject$secondaryArchSuffix + lib:libcairo_script_interpreter$secondaryArchSuffix \"" - BUILD_REQUIRES="$BUILD_REQUIRES - packaging_$pythonPackage - setuptools_$pythonPackage + BUILD_PREREQUIRES+=" + cmd:python$pythonVersion " done @@ -79,10 +69,19 @@ INSTALL() export PYTHONPATH=$installLocation:$PYTHONPATH mkdir -p $installLocation rm -rf build - $python setup.py build install \ - --root=/ --prefix=$prefix + meson build --buildtype=release \ + --prefix=$prefix \ + --includedir=$includeDir \ + --libdir=$libDir \ + --localedir=$dataDir/locale \ + -Dpython=$python \ + -Dtests=false + ninja -C build install - packageEntries $pythonPackage \ - $prefix/lib/python* + fixPkgconfig + + packageEntries $pythonPackage \ + $developDir \ + $libDir done }