Balló György pushed to branch main at Arch Linux / Packaging / Packages / cinnamon
Commits: 4cdbee1b by Balló György at 2025-12-16T05:28:19+01:00 upgpkg: 6.6.0-3: Add conflict with caribou Caribou is no longer used by Cinnamon, and causes problems if it's still installed. See: https://bbs.archlinux.org/viewtopic.php?id=311018 - - - - - 2 changed files: - .SRCINFO - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = cinnamon pkgdesc = Linux desktop which provides advanced innovative features and a traditional user experience pkgver = 6.6.0 - pkgrel = 2 + pkgrel = 3 url = https://github.com/linuxmint/cinnamon arch = x86_64 license = GPL2 @@ -12,7 +12,6 @@ pkgbase = cinnamon makedepends = glib2-devel makedepends = python-libsass depends = accountsservice - depends = caribou depends = cinnamon-control-center depends = cinnamon-desktop depends = cinnamon-menus @@ -60,6 +59,7 @@ pkgbase = cinnamon optdepends = gnome-terminal: X terminal emulator optdepends = touchegg: touch gestures optdepends = switcheroo-control: GPU offloading + conflicts = caribou<=0.4.21+75+g8ad9883-8 options = !emptydirs source = git+https://github.com/linuxmint/cinnamon#tag=6.6.0 source = set_wheel.diff ===================================== PKGBUILD ===================================== @@ -7,12 +7,12 @@ pkgname=cinnamon pkgver=6.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=(x86_64) url="https://github.com/linuxmint/cinnamon"; license=(GPL2) -depends=(accountsservice caribou cinnamon-control-center cinnamon-desktop cinnamon-menus cinnamon-screensaver +depends=(accountsservice cinnamon-control-center cinnamon-desktop cinnamon-menus cinnamon-screensaver cinnamon-session cinnamon-settings-daemon cjs gcr gdk-pixbuf2 glib2 gnome-backgrounds gsound gstreamer gtk3 libibus libgnomekbd libkeybinder3 librsvg muffin network-manager-applet nemo pango polkit-gnome python python-cairo python-dbus @@ -28,6 +28,7 @@ optdepends=('blueman: Bluetooth support' 'touchegg: touch gestures' 'switcheroo-control: GPU offloading') makedepends=(git meson gobject-introspection intltool glib2-devel python-libsass) +conflicts=("caribou<=0.4.21+75+g8ad9883-8") options=('!emptydirs') source=(git+${url}#tag=$pkgver set_wheel.diff View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/cinnamon/-/commit/4cdbee1ba0cb66e4d6df8c2c0a494b6a6beb8cab -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/cinnamon/-/commit/4cdbee1ba0cb66e4d6df8c2c0a494b6a6beb8cab You're receiving this email because of your account on gitlab.archlinux.org.
