Date: Thursday, April 19, 2018 @ 19:00:43 Author: eschwartz Revision: 317063
archrelease: copy trunk to community-x86_64 Added: cinnamon-desktop/repos/community-x86_64/PKGBUILD (from rev 317062, cinnamon-desktop/trunk/PKGBUILD) cinnamon-desktop/repos/community-x86_64/config.patch (from rev 317062, cinnamon-desktop/trunk/config.patch) Deleted: cinnamon-desktop/repos/community-x86_64/PKGBUILD cinnamon-desktop/repos/community-x86_64/config.patch --------------+ PKGBUILD | 79 ++++++++++++++++++++++++++++----------------------------- config.patch | 48 +++++++++++++++++----------------- 2 files changed, 64 insertions(+), 63 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-04-19 19:00:27 UTC (rev 317062) +++ PKGBUILD 2018-04-19 19:00:43 UTC (rev 317063) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Alexandre Filgueria <alexfilgue...@antergos.com> -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgname=cinnamon-desktop -pkgver=3.6.2 -pkgrel=1 -pkgdesc="Library with common API for various Cinnamon modules" -arch=(i686 x86_64) -license=(GPL LGPL) -depends=(accountsservice gtk3 libxkbfile python libpulse) -makedepends=(intltool gobject-introspection gnome-common python2) -url="https://github.com/linuxmint/cinnamon-desktop" -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz" - "config.patch") -sha256sums=('76b053eea02c61df22d35ccec6ba83de25246b794cbc024dce636dcb1e74c812' - '45f403e6fe4ec701a0f3d16e990bb36598dd4a58fac5a374f85ccecdf74dd98a') - -prepare() { - cd $pkgname-$pkgver - # Adjust configuration - patch -Np1 -i ../config.patch -} - -build() { - cd $pkgname-$pkgver - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/$pkgname --disable-static - - #https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: cinnamon-desktop/repos/community-x86_64/PKGBUILD (from rev 317062, cinnamon-desktop/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-04-19 19:00:43 UTC (rev 317063) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Eli Schwartz <eschwa...@archlinux.org> +# Contributor: Alexandre Filgueria <alexfilgue...@antergos.com> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgname=cinnamon-desktop +pkgver=3.8.0 +pkgrel=1 +pkgdesc="Library with common API for various Cinnamon modules" +arch=('x86_64') +url="https://github.com/linuxmint/${pkgname}" +license=('GPL' 'LGPL') +depends=('accountsservice' 'gtk3' 'libxkbfile' 'libpulse') +makedepends=('meson' 'gobject-introspection' 'intltool') +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" + "config.patch") +sha256sums=('83f31043a758224a2de6dc7015b75461f29bc48091cd1bbb3b99e7e683e73524' + '45f403e6fe4ec701a0f3d16e990bb36598dd4a58fac5a374f85ccecdf74dd98a') + +prepare() { + cd "${srcdir}"/${pkgname}-${pkgver} + # Adjust configuration + patch -Np1 -i ../config.patch +} + +build() { + mkdir -p "${srcdir}"/${pkgname}-${pkgver}/build + cd "${srcdir}"/${pkgname}-${pkgver}/build + + meson --prefix=/usr --buildtype=plain .. + ninja +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver}/build + + DESTDIR="${pkgdir}" ninja install + # rm legacy migration script (cinnamon 2.4) and its package dependency on python + rm -rf "${pkgdir}"/usr/bin +} Deleted: config.patch =================================================================== --- config.patch 2018-04-19 19:00:27 UTC (rev 317062) +++ config.patch 2018-04-19 19:00:43 UTC (rev 317063) @@ -1,24 +0,0 @@ -diff -Naur cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.background.gschema.xml.in.in cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.background.gschema.xml.in.in ---- cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.background.gschema.xml.in.in 2015-10-16 13:00:30.000000000 +0000 -+++ cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.background.gschema.xml.in.in 2015-11-20 19:04:16.543027956 +0000 -@@ -10,7 +10,7 @@ - </_description> - </key> - <key name="picture-uri" type="s"> -- <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default> -+ <default>'file://@datadir@/backgrounds/gnome/adwaita-timed.xml'</default> - <_summary>Picture URI</_summary> - <_description> - URI to use for the background image. Not that the backend only supports -diff -Naur cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in ---- cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2015-10-16 13:00:30.000000000 +0000 -+++ cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2015-11-20 19:04:16.543027956 +0000 -@@ -97,7 +97,7 @@ - </_description> - </key> - <key name="icon-theme" type="s"> -- <default>'gnome'</default> -+ <default>'Adwaita'</default> - <_summary>Icon Theme</_summary> - <_description> - Icon theme to use for the panel, nautilus etc. Copied: cinnamon-desktop/repos/community-x86_64/config.patch (from rev 317062, cinnamon-desktop/trunk/config.patch) =================================================================== --- config.patch (rev 0) +++ config.patch 2018-04-19 19:00:43 UTC (rev 317063) @@ -0,0 +1,24 @@ +diff -Naur cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.background.gschema.xml.in.in cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.background.gschema.xml.in.in +--- cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.background.gschema.xml.in.in 2015-10-16 13:00:30.000000000 +0000 ++++ cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.background.gschema.xml.in.in 2015-11-20 19:04:16.543027956 +0000 +@@ -10,7 +10,7 @@ + </_description> + </key> + <key name="picture-uri" type="s"> +- <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default> ++ <default>'file://@datadir@/backgrounds/gnome/adwaita-timed.xml'</default> + <_summary>Picture URI</_summary> + <_description> + URI to use for the background image. Not that the backend only supports +diff -Naur cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in +--- cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2015-10-16 13:00:30.000000000 +0000 ++++ cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2015-11-20 19:04:16.543027956 +0000 +@@ -97,7 +97,7 @@ + </_description> + </key> + <key name="icon-theme" type="s"> +- <default>'gnome'</default> ++ <default>'Adwaita'</default> + <_summary>Icon Theme</_summary> + <_description> + Icon theme to use for the panel, nautilus etc.