From 262a80dffd8954d1a8f271400744482851ec68ef Mon Sep 17 00:00:00 2001 From: aliriza Date: Fri, 23 Jun 2023 08:07:18 +0000 Subject: [PATCH] fixes --- .../base/cinnamon-control-center/ympbuild | 8 ++- cinnamon/base/cinnamon-screensaver/ympbuild | 7 ++- {x11/wm => cinnamon/base}/muffin/ympbuild | 4 +- gnome/extra/zenity/ympbuild | 7 +-- net/misc/libmm-glib/modemmanager.initd | 11 ----- net/misc/libmm-glib/modemmanager.rules | 19 ------- net/misc/libmm-glib/ympbuild | 49 ------------------- sys/apps/xdg-desktop-portal/ympbuild | 4 +- x11/misc/xdotool/ympbuild | 4 +- 9 files changed, 20 insertions(+), 93 deletions(-) rename {x11/wm => cinnamon/base}/muffin/ympbuild (92%) delete mode 100644 net/misc/libmm-glib/modemmanager.initd delete mode 100644 net/misc/libmm-glib/modemmanager.rules delete mode 100644 net/misc/libmm-glib/ympbuild diff --git a/cinnamon/base/cinnamon-control-center/ympbuild b/cinnamon/base/cinnamon-control-center/ympbuild index db2eaf18..7c8b407d 100644 --- a/cinnamon/base/cinnamon-control-center/ympbuild +++ b/cinnamon/base/cinnamon-control-center/ympbuild @@ -8,8 +8,8 @@ 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) -makedepends=(meson ) +depends=(cinnamon-settings-daemon cinnamon-menus colord libgnomekbd networkmanager libnma) +makedepends=(meson) md5sums=('208a363e176ca65e96e170889b644618') group=(cinnamon.base) uses=() @@ -29,9 +29,7 @@ build () { } package () { - ninja -C build DESTDIR=$DESTDIR install $jobs - rm "${DESTDIR}"/usr/bin/cinnamon-control-center - rm "${DESTDIR}"/usr/share/cinnamon-control-center/ui/shell.ui + ninja -C build install $jobs } diff --git a/cinnamon/base/cinnamon-screensaver/ympbuild b/cinnamon/base/cinnamon-screensaver/ympbuild index 82824bb6..db373d32 100644 --- a/cinnamon/base/cinnamon-screensaver/ympbuild +++ b/cinnamon/base/cinnamon-screensaver/ympbuild @@ -27,5 +27,10 @@ build () { } package () { - ninja -C build install DESTDIR="${DESTDIR}" $jobs + 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 } diff --git a/x11/wm/muffin/ympbuild b/cinnamon/base/muffin/ympbuild similarity index 92% rename from x11/wm/muffin/ympbuild rename to cinnamon/base/muffin/ympbuild index cdb3cc5a..9a371124 100644 --- a/x11/wm/muffin/ympbuild +++ b/cinnamon/base/muffin/ympbuild @@ -12,14 +12,14 @@ depends=(cinnamon-desktop gobject-introspection libcanberra libinput libSM libxkbcommon startup-notification zenity graphene pipewire) makedepends=(meson intltool gobject-introspection) md5sums=('9bc750e05279cd1df74bfb28079addbf') -group=(x11.wm) +group=(cinnamon.base) uses=() arch=('x86_64') cd $name-$version setup(){ - meson setup build + meson setup build --prefix=/usr } build(){ diff --git a/gnome/extra/zenity/ympbuild b/gnome/extra/zenity/ympbuild index bda18f5a..dbd87668 100644 --- a/gnome/extra/zenity/ympbuild +++ b/gnome/extra/zenity/ympbuild @@ -18,9 +18,10 @@ arch=('x86_64') cd $name-$version setup(){ - meson setup build\ - -Db_lto=true \ - -Dlibnotify=true + meson setup build \ + --prefix=/usr \ + -Db_lto=true \ + -Dlibnotify=true } build(){ diff --git a/net/misc/libmm-glib/modemmanager.initd b/net/misc/libmm-glib/modemmanager.initd deleted file mode 100644 index b78061fc..00000000 --- a/net/misc/libmm-glib/modemmanager.initd +++ /dev/null @@ -1,11 +0,0 @@ -#!/sbin/openrc-run - -supervisor=supervise-daemon -command=/usr/sbin/ModemManager -command_args="${modemmanager_opts}" - -description="ModemManager Daemon" - -depend() { - need dbus -} \ No newline at end of file diff --git a/net/misc/libmm-glib/modemmanager.rules b/net/misc/libmm-glib/modemmanager.rules deleted file mode 100644 index 072132a8..00000000 --- a/net/misc/libmm-glib/modemmanager.rules +++ /dev/null @@ -1,19 +0,0 @@ -// Let users in plugdev group modify ModemManager -polkit.addRule(function(action, subject) { - if ((action.id == "org.freedesktop.ModemManager1.Device.Control" || - action.id == "org.freedesktop.ModemManager1.Contacts" || - action.id == "org.freedesktop.ModemManager1.Messaging" || - action.id == "org.freedesktop.ModemManager1.Location") && - subject.isInGroup("plugdev") && subject.active) { - return "yes"; - } -}); - -// Let geoclue modify ModemManager for location gathering -polkit.addRule(function(action, subject) { - if ((action.id == "org.freedesktop.ModemManager1.Device.Control" || - action.id == "org.freedesktop.ModemManager1.Location") && - subject.isInGroup("geoclue")) { - return "yes"; - } -}); \ No newline at end of file diff --git a/net/misc/libmm-glib/ympbuild b/net/misc/libmm-glib/ympbuild deleted file mode 100644 index cf629699..00000000 --- a/net/misc/libmm-glib/ympbuild +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -name='libmm-glib' -release='1' -version='1.20.6' -url='https://www.freedesktop.org/wiki/Software/ModemManager' -description='ModemManager library' -email='akarsu@protonmail.com' -maintainer='akarsu' -license=('GPLv3') -#source=("https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/${version}/ModemManager-${version}.tar.gz" -source=("https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/1.20.6/ModemManager-1.20.6.tar.gz" -"modemmanager.rules" "modemmanager.initd") -depends=(dbus polkit ) -makedepends=(bash-completion elogind gobject-introspection gtk-doc libgudev linux-headers meson) -md5sums=('6bedca29d590d90815b2c9a732fc31f9' 'SKIP' 'SKIP') -group=(net.misc) -uses=() -arch=('x86_64') - -cd "ModemManager"-$version - -setup () { - meson setup build --prefix=/usr \ - --libdir=/usr/lib64/ \ - -Db_lto=true \ - -Dsystemdsystemunitdir=no \ - -Ddbus_policy_dir=/usr/share/dbus-1/system.d \ - -Dgtk_doc=true \ - -Dpolkit=permissive \ - -Dsystemd_journal=false \ - -Dsystemd_suspend_resume=true \ - -Dvapi=true \ - -Dmbim=false \ - -Dqmi=false \ - -Dqrtr=false -} - -build () { - ninja -C build $jobs -} - -package () { - ninja -C build install $jobs - install -m644 -D "../modemmanager.rules" "$DESTDIR/usr/share/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - install -m755 -D "../modemmanager.initd" "$DESTDIR/etc/init.d/$name" -} - -#libmbim -#libqmi diff --git a/sys/apps/xdg-desktop-portal/ympbuild b/sys/apps/xdg-desktop-portal/ympbuild index 46bb7bcd..b2a4b007 100644 --- a/sys/apps/xdg-desktop-portal/ympbuild +++ b/sys/apps/xdg-desktop-portal/ympbuild @@ -8,8 +8,8 @@ email='akarsu@protonmail.com' maintainer='akarsu' license=('LGPL') source=("https://github.com/flatpak/xdg-desktop-portal/releases/download/${version}/xdg-desktop-portal-${version}.tar.xz") -depends=(fuse gdk-pixbuf glib pipewire) -makedepends=(docbook-xsl flatpak git meson xmlto) +depends=(fuse gdk-pixbuf glib pipewire bubblewrap ) +makedepends=(docbook-xsl git meson xmlto) md5sums=('3312781f8f0ed772c52c05c010690283') group=(sys.apps) uses=() diff --git a/x11/misc/xdotool/ympbuild b/x11/misc/xdotool/ympbuild index 0b274e2e..30fd2fb1 100644 --- a/x11/misc/xdotool/ympbuild +++ b/x11/misc/xdotool/ympbuild @@ -18,11 +18,13 @@ arch=('x86_64') cd $name-$version +export PATH=$PATH:/usr/bin/core_perl + build() { make #WITHOUT_RPATH_FIX=1 } package () { - make install DESTDIR="$DESTDIR" PREFIX=/usr/local INSTALLMAN=/usr/share/man install + make install DESTDIR="$DESTDIR" PREFIX=/usr INSTALLMAN=/usr/share/man install }