diff options
author | FabioLolix | 2023-01-27 22:11:42 +0100 |
---|---|---|
committer | FabioLolix | 2023-01-27 22:11:42 +0100 |
commit | 3902c6a34cd01fb8a60bde4663acccb6fd17e33a (patch) | |
tree | 3379dbbd5b079969b99e55d2f50c49eb8294053f | |
parent | 74967a0035ef1ff4d183ddc85bc7466cbaea0872 (diff) | |
download | aur-cinnamon-git.tar.gz |
revision
-rw-r--r-- | .SRCINFO | 23 | ||||
-rw-r--r-- | 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch | 38 | ||||
-rw-r--r-- | PKGBUILD | 110 | ||||
-rw-r--r-- | default-theme.patch | 20 |
4 files changed, 74 insertions, 117 deletions
@@ -1,14 +1,15 @@ pkgbase = cinnamon-git pkgdesc = Linux desktop which provides advanced innovative features and a traditional user experience - pkgver = 4.4.8.r70.g14e5ccee8 + pkgver = 5.6.7.r2.g4af7ab39c pkgrel = 1 url = https://github.com/linuxmint/cinnamon arch = x86_64 license = GPL2 makedepends = git - makedepends = intltool - makedepends = gtk-doc + makedepends = meson + makedepends = samurai makedepends = gobject-introspection + makedepends = intltool depends = accountsservice depends = caribou depends = cinnamon-control-center @@ -18,6 +19,7 @@ pkgbase = cinnamon-git depends = cinnamon-settings-daemon depends = cjs depends = gnome-backgrounds + depends = gsound depends = gnome-themes-extra depends = gstreamer depends = libcroco @@ -38,24 +40,23 @@ pkgbase = cinnamon-git depends = python-pytz depends = python-tinycss2 depends = python-xapp + depends = python-requests depends = timezonemap depends = xapps - optdepends = blueberry: Bluetooth support + optdepends = blueman: Bluetooth support optdepends = cinnamon-translations: i18n optdepends = gnome-panel: fallback mode optdepends = metacity: fallback mode optdepends = system-config-printer: printer settings - provides = cinnamon=4.4.8.r70.g14e5ccee8 + optdepends = wget: cover download support in audio applet + provides = cinnamon conflicts = cinnamon options = !emptydirs source = git+https://github.com/linuxmint/cinnamon.git - source = 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch source = set_wheel.diff source = default-theme.patch - sha256sums = SKIP - sha256sums = edb5c1cf43913da086aa11f303b0919bbea232d140afa33ceac52fe367d15fcf - sha256sums = 7517d651d440361947f9539fe8f42548d5eb43a09c28c9a11f51cfdfdefd042f - sha256sums = 566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5 + b2sums = SKIP + b2sums = 3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160 + b2sums = 86c3a29acd132ca321f08fd81dd5a45707accdc035b2aeec95bf358b29072ff1eedb77b2566cf48d7253d1d791599f0f44938c4600761d711cb18b59019f1c62 pkgname = cinnamon-git - diff --git a/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch b/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch deleted file mode 100644 index e3ddd3622e5f..000000000000 --- a/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ac4d2fc9fafb38ebb02615a41b23cceca304e73a Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz93@gmail.com> -Date: Tue, 20 Mar 2018 14:11:02 -0400 -Subject: [PATCH] cinnamon-settings: don't rely on the presence of - cinnamon-control-center - -The existence of the cinnamon-control-center binary does not even tell -us what control center libraries are available. So instead, do the same -thing we did for cinnamon-settings modules, and check if the library -exists. ---- - files/usr/bin/cinnamon-settings | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/files/usr/bin/cinnamon-settings b/files/usr/bin/cinnamon-settings -index 9fbdbecd2..98ca454a5 100755 ---- a/files/usr/bin/cinnamon-settings -+++ b/files/usr/bin/cinnamon-settings -@@ -58,6 +58,7 @@ Available types of sort, and corresponding numbers: - import getopt - import os - import sys -+import sysconfig - - def usage(): - print("""Usage: -@@ -119,7 +120,7 @@ if len(sys.argv) > 1: - os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) - elif os.path.exists("/usr/share/cinnamon/cinnamon-settings/modules/cs_%s.py" % module): - os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) -- elif os.path.exists("/usr/bin/cinnamon-control-center"): -+ elif os.path.exists(os.path.join(sysconfig.get_config_var("LIBDIR"), "cinnamon-control-center-1/panels/lib%s.so" % module)): - os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) - elif os.path.exists("/usr/bin/gnome-control-center"): - print ("Unknown module %s, calling gnome-control-center" % module) --- -2.22.0 - @@ -1,3 +1,4 @@ +# Maintainer: Fabio 'Lolix' Loli <lolix@disroot.org> # Maintainer: Eli Schwartz <eschwartz@archlinux.org> # Contributor: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 @@ -5,90 +6,83 @@ # Contributor: CReimer pkgname=cinnamon-git -pkgver=4.4.8.r70.g14e5ccee8 +pkgver=5.6.7.r2.g4af7ab39c pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" -arch=('x86_64') -url="https://github.com/linuxmint/${pkgname%-git}" -license=('GPL2') -depends=('accountsservice' 'caribou' 'cinnamon-control-center' 'cinnamon-menus' 'cinnamon-screensaver' - 'cinnamon-session' 'cinnamon-settings-daemon' 'cjs' 'gnome-backgrounds' - 'gnome-themes-extra' 'gstreamer' 'libcroco' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin' - 'network-manager-applet' 'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus' - 'python-gobject' 'python-pam' 'python-pexpect' 'python-pillow' 'python-pyinotify' - 'python-pytz' 'python-tinycss2' 'python-xapp' 'timezonemap' 'xapps') -optdepends=('blueberry: Bluetooth support' +arch=(x86_64) +url="https://github.com/linuxmint/cinnamon" +license=(GPL2) +depends=(accountsservice caribou cinnamon-control-center cinnamon-menus cinnamon-screensaver + cinnamon-session cinnamon-settings-daemon cjs gnome-backgrounds gsound + gnome-themes-extra gstreamer libcroco libgnomekbd libkeybinder3 librsvg muffin + network-manager-applet nemo polkit-gnome python-cairo python-dbus + python-gobject python-pam python-pexpect python-pillow python-pyinotify + python-pytz python-tinycss2 python-xapp python-requests timezonemap xapps) +optdepends=('blueman: Bluetooth support' 'cinnamon-translations: i18n' 'gnome-panel: fallback mode' 'metacity: fallback mode' - 'system-config-printer: printer settings') -provides=("${pkgname%-git}=${pkgver}") -conflicts=("${pkgname%-git}") -makedepends=('git' 'intltool' 'gtk-doc' 'gobject-introspection') + 'system-config-printer: printer settings' + 'wget: cover download support in audio applet') +makedepends=(git meson samurai gobject-introspection intltool) +provides=(cinnamon) +conflicts=(cinnamon) options=('!emptydirs') -source=("git+${url}.git" - "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch" +source=("git+https://github.com/linuxmint/cinnamon.git" "set_wheel.diff" "default-theme.patch") -sha256sums=('SKIP' - 'edb5c1cf43913da086aa11f303b0919bbea232d140afa33ceac52fe367d15fcf' - '7517d651d440361947f9539fe8f42548d5eb43a09c28c9a11f51cfdfdefd042f' - '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5') +b2sums=('SKIP' + '3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160' + '86c3a29acd132ca321f08fd81dd5a45707accdc035b2aeec95bf358b29072ff1eedb77b2566cf48d7253d1d791599f0f44938c4600761d711cb18b59019f1c62') pkgver() { - cd "${srcdir}"/${pkgname%-git} - - git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' + cd cinnamon + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { - cd "${srcdir}"/${pkgname%-git} - - # Check for the cc-panel module path, not for the irrelevant binary - # https://github.com/linuxmint/Cinnamon/pull/7382 - patch --no-backup-if-mismatch -p1 -i ../0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch + cd cinnamon - # Use wheel group instread of sudo (taken from Fedora) - patch -Np1 -i ../set_wheel.diff + # Use wheel group instread of sudo (taken from Fedora) + #patch -Np1 -i ../set_wheel.diff - # Set default theme to 'cinnamon' - patch -Np1 -i ../default-theme.patch + # Set default theme to 'cinnamon' + patch -Np1 -i ../default-theme.patch - # Replace MintInstall with GNOME Software - sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in + # Replace MintInstall with GNOME Software + sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml - # Add polkit agent to required components - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ - files/cinnamon*.session.in + # Add polkit agent to required components + sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ + cinnamon*.session.in - # https://github.com/linuxmint/Cinnamon/issues/3575#issuecomment-374887122 - # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead - sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \ - files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py + # https://github.com/linuxmint/Cinnamon/issues/3575#issuecomment-374887122 + # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead + sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \ + files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py - NOCONFIGURE=1 ./autogen.sh + [[ -d build ]] || mkdir build } build() { - cd "${srcdir}"/${pkgname%-git} + cd cinnamon/build - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/cinnamon \ - --localstatedir=/var \ - --disable-static \ - --disable-gtk-doc \ - --disable-schemas-compile \ - --enable-compile-warnings=yes + # fix -mfpu= flags that break a build e.g. for neon on armv7 due to + # basically makepkg.conf being "bad' with default CFLAGS having + # -mfpu=vfpv3-d16 + #export CFLAGS=`echo -n $CFLAGS | sed 's/-mfpu=vfpv3-d16/-mfpu=neon-vfpv4/g'` + #export CFLAGS="$CFLAGS -fvisibility=hidden" + #export CXXFLAGS="$CXXFLAGS -fvisibility=hidden" - # https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + meson --prefix=/usr \ + --libexecdir=lib/cinnamon \ + --buildtype=plain \ + .. - make + samu } package() { - cd "${srcdir}"/${pkgname%-git} - - make DESTDIR="${pkgdir}" install + cd cinnamon/build + DESTDIR="${pkgdir}" samu install } diff --git a/default-theme.patch b/default-theme.patch index 8817710f0ee4..cca9b0082331 100644 --- a/default-theme.patch +++ b/default-theme.patch @@ -1,25 +1,25 @@ -From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 +From b1f277d53ccd79bba9ba4cd1c0c2683d4f41068c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com> Date: Sat, 22 Nov 2014 22:39:39 +0100 Subject: [PATCH] Set default theme to 'cinnamon' --- - data/org.cinnamon.gschema.xml.in | 2 +- + data/org.cinnamon.gschema.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 91fa171..9f56e4c 100644 ---- a/data/org.cinnamon.gschema.xml.in -+++ b/data/org.cinnamon.gschema.xml.in -@@ -581,7 +581,7 @@ +diff --git a/data/org.cinnamon.gschema.xml b/data/org.cinnamon.gschema.xml +index 86b14e26c..93c3e14c5 100644 +--- a/data/org.cinnamon.gschema.xml ++++ b/data/org.cinnamon.gschema.xml +@@ -645,7 +645,7 @@ <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/" gettext-domain="@GETTEXT_PACKAGE@"> <key name="name" type="s"> - <default>""</default> + <default>"cinnamon"</default> - <_summary>Theme name</_summary> - <_description> + <summary>Theme name</summary> + <description> The name of the theme -- -2.1.3 +2.29.2 |