From 6fbcf8229eac9a5330c2a9b515a95fa8873b5224 Mon Sep 17 00:00:00 2001 From: cakarsu Date: Fri, 24 Nov 2023 17:06:16 +0300 Subject: [PATCH] =?UTF-8?q?24=20Kas=C4=B1m=20G=C3=BCncelleme=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/cinnamon-control-center/ympbuild | 14 ++++++----- cinnamon/base/cinnamon-desktop/ympbuild | 6 ++--- cinnamon/base/cinnamon-menus/ympbuild | 6 ++--- cinnamon/base/cinnamon-screensaver/ympbuild | 23 +++++++++++-------- cinnamon/base/cinnamon-session/ympbuild | 6 ++--- .../base/cinnamon-settings-daemon/ympbuild | 6 ++--- cinnamon/base/cinnamon-translations/ympbuild | 6 ++--- 7 files changed, 36 insertions(+), 31 deletions(-) diff --git a/cinnamon/base/cinnamon-control-center/ympbuild b/cinnamon/base/cinnamon-control-center/ympbuild index 7c8b407d..b27e6ab6 100644 --- a/cinnamon/base/cinnamon-control-center/ympbuild +++ b/cinnamon/base/cinnamon-control-center/ympbuild @@ -1,16 +1,16 @@ #!/usr/bin/env bash name='cinnamon-control-center' -release='1' -version='5.8.1' +release='3' +version='6.0.0' url='https://github.com/linuxmint/cinnamon-control-center' description='The Control Center for Cinnamon' email='akarsu@protonmail.com' maintainer='akarsu' license=('GPLv3') source=("https://github.com/linuxmint/cinnamon-control-center/archive/refs/tags/${version}.tar.gz") -depends=(cinnamon-settings-daemon cinnamon-menus colord libgnomekbd networkmanager libnma) -makedepends=(meson) -md5sums=('208a363e176ca65e96e170889b644618') +depends=(cinnamon-settings-daemon cinnamon-menus colord libgnomekbd) +makedepends=(meson ) +md5sums=('fcf3c538fc4b108b10a6e0685c5af308') group=(cinnamon.base) uses=() arch=('x86_64') @@ -29,7 +29,9 @@ build () { } package () { - ninja -C build install $jobs + DESTDIR=$DESTDIR ninja -C build install $jobs + #rm "${DESTDIR}"/usr/bin/cinnamon-control-center + #rm "${DESTDIR}"/usr/share/cinnamon-control-center/ui/shell.ui } diff --git a/cinnamon/base/cinnamon-desktop/ympbuild b/cinnamon/base/cinnamon-desktop/ympbuild index c0c8d89c..647e5bb3 100644 --- a/cinnamon/base/cinnamon-desktop/ympbuild +++ b/cinnamon/base/cinnamon-desktop/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='cinnamon-desktop' release='2' -version='5.8.0' +version='6.0.0' url='https://github.com/linuxmint/cinnamon-desktop' description='Library with common API for various Cinnamon modules' email='akarsu@protonmail.com' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://github.com/linuxmint/cinnamon-desktop/archive/$version/cinnamon-desktop-$version.tar.gz") depends=() makedepends=(libXinerama libxkbfile) -md5sums=('cde124596a427145f001b33a9d77f183') +md5sums=('265b69d5f57e9600c673c6be79ec20e0') group=(cinnamon.base) uses=() arch=('x86_64') @@ -19,7 +19,7 @@ cd $name-$version setup(){ meson setup build --prefix=/usr \ - --libdir=/usr/lib64/ + --libdir=/usr/lib64/ } build(){ diff --git a/cinnamon/base/cinnamon-menus/ympbuild b/cinnamon/base/cinnamon-menus/ympbuild index 48ca2c10..17f4954e 100644 --- a/cinnamon/base/cinnamon-menus/ympbuild +++ b/cinnamon/base/cinnamon-menus/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='cinnamon-menus' -release='1' -version='5.8.0' +release='2' +version='6.0.0' url='https://github.com/linuxmint/cinnamon' description='Linux desktop which provides advanced innovative features and a traditional user experience' email='akarsu@protonmail.com' @@ -10,7 +10,7 @@ license=('GPLv2') source=("https://github.com/linuxmint/cinnamon-menus/archive/refs/tags/${version}.tar.gz") depends=(glib) makedepends=(gobject-introspection meson) -md5sums=('d664458ee4469d1bbd8f971a2cd37ee6') +md5sums=('9e10b0e9839e83e3b1264366c565340b') group=(cinnamon.base) uses=() arch=('x86_64') diff --git a/cinnamon/base/cinnamon-screensaver/ympbuild b/cinnamon/base/cinnamon-screensaver/ympbuild index db373d32..04858cbe 100644 --- a/cinnamon/base/cinnamon-screensaver/ympbuild +++ b/cinnamon/base/cinnamon-screensaver/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='cinnamon-screensaver' -release='1' -version='5.8.0' +release='2' +version='6.0.0' url='https://github.com/linuxmint/cinnamon-screensaver' description='Screensaver designed to integrate well with the Cinnamon desktop.' email='akarsu@protonmail.com' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://github.com/linuxmint/cinnamon-screensaver/archive/refs/tags/${version}.tar.gz") depends=(accountsservice cinnamon-desktop libgnomekbd py3-cairo py3-pygobject py3-setproctitle py3-xapp xapp) makedepends=(gobject-introspection meson) -md5sums=('68130450b11eb482935f9aba45df7013') +md5sums=('5ed5b247b59c5400b073b7fbed811e82') group=(cinnamon.base) uses=() arch=('x86_64') @@ -19,7 +19,9 @@ cd $name-$version setup () { meson setup build --prefix=/usr \ - -Dlocking=false #$name-$version + --libdir=/usr/lib64/ \ + -Ddefault_library=both + #-Dlocking=false #$name-$version } build () { @@ -27,10 +29,11 @@ build () { } package () { - ninja -C build install $jobs - # fix symlinks - rm -f $DESTDIR/usr/bin/cinnamon-screensaver - rm -f $DESTDIR/usr/bin/cinnamon-screensaver-command - ln -s ../share/cinnamon-screensaver/cinnamon-screensaver-main.py $DESTDIR/usr/bin/cinnamon-screensaver - ln -s ../share/cinnamon-screensaver/cinnamon-screensaver-command.py $DESTDIR/usr/bin/cinnamon-screensaver-command + DESTDIR="${DESTDIR}" ninja -C build install $jobs + + rm -f ${DESTDIR}/usr/bin/cinnamon-screensaver-command + rm -f ${DESTDIR}/usr/bin/cinnamon-screensaver + + ln -s ../../usr/share/cinnamon-screensaver/cinnamon-screensaver-command.py ${DESTDIR}/usr/bin/cinnamon-screensaver-command + ln -s ../../usr/share/cinnamon-screensaver/cinnamon-screensaver-main.py ${DESTDIR}/usr/bin/cinnamon-screensaver } diff --git a/cinnamon/base/cinnamon-session/ympbuild b/cinnamon/base/cinnamon-session/ympbuild index 62648719..7756d537 100644 --- a/cinnamon/base/cinnamon-session/ympbuild +++ b/cinnamon/base/cinnamon-session/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='cinnamon-session' -release='1' -version='5.8.1' +release='2' +version='6.0.0' url='https://github.com/linuxmint/cinnamon-session' description='The Cinnamon Session Handler' email='akarsu@protonmail.com' @@ -10,7 +10,7 @@ license=('GPLv3' 'LGPL') source=("https://github.com/linuxmint/cinnamon-session/archive/refs/tags/${version}.tar.gz") depends=(cinnamon-desktop libSM libcanberra xapp libXtst) makedepends=(meson ninja xtrans) -md5sums=('710b9f81ef46bec92b941d36be42793d') +md5sums=('4890badbe5d16e82de2ab4266ed6fc3e') group=(cinnamon.base) uses=() arch=('x86_64') diff --git a/cinnamon/base/cinnamon-settings-daemon/ympbuild b/cinnamon/base/cinnamon-settings-daemon/ympbuild index 8a861e95..cbc4ed39 100644 --- a/cinnamon/base/cinnamon-settings-daemon/ympbuild +++ b/cinnamon/base/cinnamon-settings-daemon/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='cinnamon-settings-daemon' -release='1' -version='5.8.1' +release='2' +version='6.0.0' url='https://github.com/linuxmint/cinnamon-settings-daemon' description='The Cinnamon Settings daemon' email='akarsu@protonmail.com' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://github.com/linuxmint/cinnamon-settings-daemon/archive/refs/tags/${version}.tar.gz") depends=(cinnamon-desktop colord dbus-glib libcanberra cups libgnomekbd libgudev libnotify librsvg libwacom nss polkit upower) makedepends=(meson ninja xf86-input-wacom) -md5sums=('bb03d40c4c83297c3dcfe563ebdf9bd5') +md5sums=('2196db65d92eb9a768942c4491a8e292') group=(cinnamon.base) uses=() arch=('x86_64') diff --git a/cinnamon/base/cinnamon-translations/ympbuild b/cinnamon/base/cinnamon-translations/ympbuild index 0d82d6f3..974c6556 100644 --- a/cinnamon/base/cinnamon-translations/ympbuild +++ b/cinnamon/base/cinnamon-translations/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='cinnamon-translations' -release='1' -version='5.8.1' +release='2' +version='6.0.0' url='https://github.com/linuxmint/cinnamon-translations' description='Translations for Cinnamon and Nemo' email='akarsu@protonmail.com' @@ -10,7 +10,7 @@ license=('GPLv2') source=("https://github.com/linuxmint/cinnamon-translations/archive/refs/tags/${version}.tar.gz") depends=() makedepends=() -md5sums=('b9ea707443c81e4340b0cb219d289130') +md5sums=('c488e3efc6e7aef6cd8d75b3749bc7f2') group=(cinnamon.base) uses=() arch=('x86_64')