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

---
 gnome/base/dconf/ympbuild            | 34 ++++++++++++++++++++
 media/fonts/cantarell-fonts/ympbuild | 36 +++++++++++++++++++++
 net/libs/libcloudproviders/ympbuild  |  3 +-
 python/dev/psautohint/ympbuild       | 26 +++++++++++++++
 x11/misc/colord/ympbuild             | 48 ++++++++++++++++++++++++++++
 5 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 gnome/base/dconf/ympbuild
 create mode 100644 media/fonts/cantarell-fonts/ympbuild
 create mode 100644 python/dev/psautohint/ympbuild
 create mode 100644 x11/misc/colord/ympbuild

diff --git a/gnome/base/dconf/ympbuild b/gnome/base/dconf/ympbuild
new file mode 100644
index 00000000..8c4cd23b
--- /dev/null
+++ b/gnome/base/dconf/ympbuild
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+name='dconf'
+release='1'
+version='0.40.0'
+url='https://gitlab.gnome.org/GNOME/dconf.git/'
+description=' Simple low-level configuration system '
+email='bayramk@gmail.com'
+maintainer='bk'
+license=('GPLv3')
+source=("https://gitlab.gnome.org/GNOME/dconf/-/archive/$version/dconf-$version.tar.gz")
+depends=()
+makedepends=()
+md5sums=('3413fbc4f50c4c68e6b8f7099b248c22')
+group=(gnome.base)
+uses=()
+arch=('x86_64')
+
+cd $name-$version
+
+setup(){
+    meson setup build --prefix=/usr \
+        --libdir=/usr/lib64/ \
+	-Dbash_completion=false \
+	-Dman=false
+}
+
+build(){
+    ninja -C build
+}
+
+package(){
+    ninja -C build install
+}
+
diff --git a/media/fonts/cantarell-fonts/ympbuild b/media/fonts/cantarell-fonts/ympbuild
new file mode 100644
index 00000000..016a777e
--- /dev/null
+++ b/media/fonts/cantarell-fonts/ympbuild
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+name='cantarell-fonts'
+release='1'
+version='0.303'
+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)
+makedepends=()
+md5sums=('acbc0d271b81be1415521396dcfcbbcd')
+group=(media.fonts)
+uses=()
+arch=('x86_64')
+
+cd $name-v$version
+
+setup(){
+    meson setup build --prefix=/usr \
+        --libdir=/usr/lib64/ \
+	-Duseprebuilt=false \
+	-Dbuildappstream=false \
+	-Dbuildstatics=false \
+	-Dbuildvf=false
+}
+
+build(){
+    ninja -C build
+}
+
+package(){
+    ninja -C build install
+}
+
diff --git a/net/libs/libcloudproviders/ympbuild b/net/libs/libcloudproviders/ympbuild
index 1edf7344..013ae8de 100644
--- a/net/libs/libcloudproviders/ympbuild
+++ b/net/libs/libcloudproviders/ympbuild
@@ -19,11 +19,12 @@ cd $name-$version
 
 setup(){
     meson setup build --prefix=/usr \
-        --libdir=/usr/lib64/ 
+        --libdir=/usr/lib64/
 }
 
 build(){
     ninja -C build
+        --libdir=/usr/lib64/
 }
 
 package(){
diff --git a/python/dev/psautohint/ympbuild b/python/dev/psautohint/ympbuild
new file mode 100644
index 00000000..e1d3376e
--- /dev/null
+++ b/python/dev/psautohint/ympbuild
@@ -0,0 +1,26 @@
+#!/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
+}
diff --git a/x11/misc/colord/ympbuild b/x11/misc/colord/ympbuild
new file mode 100644
index 00000000..64a6a7d5
--- /dev/null
+++ b/x11/misc/colord/ympbuild
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+name='colord'
+release='1'
+version='1.4.6'
+url='https://www.freedesktop.org/software/colord/'
+description='System service to accurately color manage input and output devices '
+email='bayramk@gmail.com'
+maintainer='bk'
+license=('GPLv3')
+source=("https://github.com/hughsie/colord/archive/refs/tags/$version.tar.gz")
+depends=(lcms2 libgusb libgudev)
+makedepends=()
+md5sums=('f895fa39bbb87fce8517675802865464')
+group=(x11.misc)
+uses=()
+arch=('x86_64')
+
+cd $name-$version
+
+setup(){
+    meson setup build --prefix=/usr \
+        --libdir=/usr/lib64/ \
+	-Ddaemon=false \
+	-Dsession_example=false \
+	-Dbash_completion=false \
+	-Dudev_rules=true \
+	-Dsystemd=false \
+	-Dbash_completion=false \
+	-Dlibcolordcompat=true \
+	-Dargyllcms_sensor=true \
+	-Dsane=false \
+	-Dintrospection=false \
+	-Dvapi=false \
+	-Dprint_profiles=false \
+	-Dtests=false \
+	-Dinstalled_tests=false \
+	-Dman=false \
+	-Ddocs=false
+}
+
+build(){
+    ninja -C build
+}
+
+package(){
+    ninja -C build install
+}
+