From 377f739f2f74dacab3766398240418aef92991ae Mon Sep 17 00:00:00 2001
From: aliriza <aliriza.keskin@pardus.org.tr>
Date: Thu, 9 Mar 2023 06:47:57 +0000
Subject: [PATCH] resolve conflict

---
 dev/libs/libgusb/ympbuild               |  2 +-
 dev/python/py3-distutils-extra/ympbuild | 27 +++++++++++++++++++++++++
 dev/python/py3-wheel/ympbuild           | 27 +++++++++++++++++++++++++
 media/fonts/cantarell-fonts/ympbuild    | 15 ++++++--------
 python/dev/psautohint/ympbuild          | 26 ------------------------
 5 files changed, 61 insertions(+), 36 deletions(-)
 create mode 100644 dev/python/py3-distutils-extra/ympbuild
 create mode 100644 dev/python/py3-wheel/ympbuild
 delete mode 100644 python/dev/psautohint/ympbuild

diff --git a/dev/libs/libgusb/ympbuild b/dev/libs/libgusb/ympbuild
index cfd4586e..512e9a9a 100644
--- a/dev/libs/libgusb/ympbuild
+++ b/dev/libs/libgusb/ympbuild
@@ -8,7 +8,7 @@ email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
 source=("https://github.com/hughsie/libgusb/archive/refs/tags/$version.tar.gz")
-depends=(vala gi-docgen mesa libusb)
+depends=(vala gi-docgen mesa libusb json-glib)
 makedepends=()
 md5sums=('08929299006546c3e2d6ea6bd9997fa2')
 group=(dev.libs)
diff --git a/dev/python/py3-distutils-extra/ympbuild b/dev/python/py3-distutils-extra/ympbuild
new file mode 100644
index 00000000..c13abb2e
--- /dev/null
+++ b/dev/python/py3-distutils-extra/ympbuild
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+name='py3-distutils-extra'
+release='1'
+version='2.39'
+url='https://launchpad.net/python-distutils-extra'
+description='Enhancements to the Python build system'
+email='aliriza.keskin@pardus.org.tr'
+maintainer='aliriza'
+license=('GPLv3')
+source=("https://launchpad.net/python-distutils-extra/trunk/$version/+download/python-distutils-extra-$version.tar.gz")
+depends=(python)
+makedepends=()
+md5sums=('16e06db0ef73a35b4bff4b9eed5699b5')
+group=(dev.python)
+uses=()
+arch=('x86_64')
+
+cd python-distutils-extra-$version
+
+build(){
+    python3 setup.py build
+}
+
+package(){
+    python3 setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build
+}
+
diff --git a/dev/python/py3-wheel/ympbuild b/dev/python/py3-wheel/ympbuild
new file mode 100644
index 00000000..ef60d1da
--- /dev/null
+++ b/dev/python/py3-wheel/ympbuild
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+name='py3-wheel'
+release='1'
+version='0.38.4'
+url='https://pypi.org/project/wheel/'
+description='A built-package format for Python'
+email='parduscix@yandex.ru'
+maintainer='sulincix'
+license=('GPLv3')
+source=("https://files.pythonhosted.org/packages/a2/b8/6a06ff0f13a00fc3c3e7d222a995526cbca26c1ad107691b6b1badbbabf1/wheel-$version.tar.gz")
+depends=(python)
+makedepends=()
+md5sums=('83bb4e7bd4d687d398733f341a64ab91')
+group=(dev.python)
+uses=()
+arch=('x86_64')
+
+cd wheel-$version
+
+build(){
+    python3 setup.py build
+}
+
+package(){
+    python3 setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build
+}
+
diff --git a/media/fonts/cantarell-fonts/ympbuild b/media/fonts/cantarell-fonts/ympbuild
index 016a777e..86973488 100644
--- a/media/fonts/cantarell-fonts/ympbuild
+++ b/media/fonts/cantarell-fonts/ympbuild
@@ -1,29 +1,26 @@
 #!/usr/bin/env bash
 name='cantarell-fonts'
 release='1'
-version='0.303'
+version='0.303.1'
 url='https://gitlab.gnome.org/GNOME/cantarell-fonts.git/'
 description='Default fontset for GNOME Shell '
 email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
-source=("https://gitlab.gnome.org/GNOME/cantarell-fonts/-/archive/v$version/cantarell-fonts-v$version.tar.gz")
-depends=(psautohint)
+source=("https://download.gnome.org/sources/cantarell-fonts/${version:0:5}/cantarell-fonts-${version}.tar.xz")
+depends=()
 makedepends=()
-md5sums=('acbc0d271b81be1415521396dcfcbbcd')
+md5sums=('a9be59ddb29204dcfd3357f201949b8c')
 group=(media.fonts)
 uses=()
 arch=('x86_64')
 
-cd $name-v$version
+cd $name-$version
 
 setup(){
     meson setup build --prefix=/usr \
         --libdir=/usr/lib64/ \
-	-Duseprebuilt=false \
-	-Dbuildappstream=false \
-	-Dbuildstatics=false \
-	-Dbuildvf=false
+	-Duseprebuilt=true
 }
 
 build(){
diff --git a/python/dev/psautohint/ympbuild b/python/dev/psautohint/ympbuild
deleted file mode 100644
index e1d3376e..00000000
--- a/python/dev/psautohint/ympbuild
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-name='psautohint'
-release='1'
-version='2.4.0'
-url='https://github.com/adobe-type-tools/psautohint'
-description='ASCII quote-dot-dash to HTML entity converter'
-email='bayramk@gmail.com'
-maintainer='bk'
-license=('GPLv3')
-source=("https://github.com/adobe-type-tools/psautohint/archive/refs/tags/v$version.tar.gz")
-depends=(python)
-makedepends=()
-md5sums=('8cf07baebbc5fc631b01e977209b162e')
-group=(dev.python)
-uses=()
-arch=('x86_64')
-
-cd $name-$version
-
-build(){
-    python3 setup.py build
-}
-
-package(){
-    python3 setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build
-}