diff options
-rw-r--r-- | .AURINFO | 23 | ||||
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 62 | ||||
-rw-r--r-- | cinnamon-desktop-git.install | 11 | ||||
-rw-r--r-- | config.diff | 24 | ||||
-rw-r--r-- | fix_build.patch | 10 |
6 files changed, 64 insertions, 82 deletions
diff --git a/.AURINFO b/.AURINFO deleted file mode 100644 index ed6cd3175896..000000000000 --- a/.AURINFO +++ /dev/null @@ -1,23 +0,0 @@ -pkgbase = cinnamon-desktop-git - pkgdesc = Library with common API for various Cinnamon modules - pkgver = 103.f4ee205 - pkgrel = 1 - url = https://github.com/linuxmint/cinnamon-desktop - install = cinnamon-desktop-git.install - arch = i686 - arch = x86_64 - license = GPL - license = LGPL - makedepends = intltool - makedepends = gobject-introspection - makedepends = gnome-common - makedepends = git - depends = gtk3 - depends = libxkbfile - provides = cinnamon-desktop - conflicts = cinnamon-desktop - source = git+https://github.com/linuxmint/cinnamon-desktop.git - options = !emptydirs - -pkgname = cinnamon-desktop-git - @@ -1,27 +1,25 @@ pkgbase = cinnamon-desktop-git pkgdesc = Library with common API for various Cinnamon modules - pkgver = 174.15af3e9 + pkgver = 4.0.1.r0.g77b85b0 pkgrel = 1 url = https://github.com/linuxmint/cinnamon-desktop - install = cinnamon-desktop-git.install arch = i686 arch = x86_64 license = GPL license = LGPL - makedepends = intltool + makedepends = meson makedepends = gobject-introspection - makedepends = gnome-common - makedepends = git - makedepends = patch + makedepends = intltool + depends = accountsservice depends = gtk3 depends = libxkbfile + depends = libpulse provides = cinnamon-desktop conflicts = cinnamon-desktop - options = !emptydirs source = git+https://github.com/linuxmint/cinnamon-desktop.git - source = fix_build.patch + source = config.diff sha512sums = SKIP - sha512sums = 6a58333fc2bd637c637aeb3823fa50c0f60492022927df086257d47a4e39c9afaa12196da60623c817b1fccb5d9c3a2b819df7904e930055452ebe9e5ba8f326 + sha512sums = 556e5d3781d985a031f0b08dd4e972ebc37058e0862fec5935df7dfbf7dfecebeccd10e78136e75d9fa5f184b8201cb0bc90154fca419861d9d33ac9645cf983 pkgname = cinnamon-desktop-git @@ -1,44 +1,48 @@ -# $Id$ -# Maintainer: Realex -# Based on cinnamon-desktop PKGBUILD +# Maintainer: Eli Schwartz <eschwartz@archlinux.org> +# Contributor: Alexandre Filgueria <alexfilgueira@antergos.com> +# Contributor: Jan de Groot <jan@archlinux.org> -_pkgname=cinnamon-desktop -pkgname=${_pkgname}-git -pkgver=174.15af3e9 +pkgname=cinnamon-desktop-git +pkgver=4.0.1.r0.g77b85b0 pkgrel=1 pkgdesc="Library with common API for various Cinnamon modules" -arch=(i686 x86_64) -license=(GPL LGPL) -depends=('gtk3' 'libxkbfile') -makedepends=('intltool' 'gobject-introspection' 'gnome-common' 'git' 'patch') -url="https://github.com/linuxmint/cinnamon-desktop" -provides=("${_pkgname}") -conflicts=("${_pkgname}") -options=('!emptydirs') -source=("git+https://github.com/linuxmint/${_pkgname}.git" - "fix_build.patch") -sha512sums=("SKIP" - "6a58333fc2bd637c637aeb3823fa50c0f60492022927df086257d47a4e39c9afaa12196da60623c817b1fccb5d9c3a2b819df7904e930055452ebe9e5ba8f326") -install="${pkgname}.install" +arch=('i686' 'x86_64') +url="https://github.com/linuxmint/${pkgname%-git}" +license=('GPL' 'LGPL') +depends=('accountsservice' 'gtk3' 'libxkbfile' 'libpulse') +makedepends=('meson' 'gobject-introspection' 'intltool') +provides=("${pkgname%-git}") +conflicts=("${pkgname%-git}") +source=("git+${url}.git" + "config.diff") +sha512sums=('SKIP' + '556e5d3781d985a031f0b08dd4e972ebc37058e0862fec5935df7dfbf7dfecebeccd10e78136e75d9fa5f184b8201cb0bc90154fca419861d9d33ac9645cf983') pkgver() { - cd ${srcdir}/${_pkgname} - echo $(git rev-list --count master).$(git rev-parse --short master) + cd "${srcdir}"/${pkgname%-git} + + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { - cd ${srcdir}/cinnamon-desktop - patch -Np1 -i ../fix_build.patch + cd "${srcdir}"/${pkgname%-git} + + # Adjust configuration + patch -Np1 -i ../config.diff } build() { - cd ${srcdir}/${_pkgname} - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/${_pkgname} --disable-static - make + mkdir -p "${srcdir}"/${pkgname%-git}/build + cd "${srcdir}"/${pkgname%-git}/build + + meson --prefix=/usr --buildtype=plain .. + ninja } package() { - cd ${srcdir}/${_pkgname} - make DESTDIR="$pkgdir" install + cd "${srcdir}"/${pkgname%-git}/build + + DESTDIR="${pkgdir}" ninja install + # rm legacy migration script (cinnamon 2.4) and its package dependency on python + rm -rf "${pkgdir}"/usr/bin } diff --git a/cinnamon-desktop-git.install b/cinnamon-desktop-git.install deleted file mode 100644 index 6354524b64b0..000000000000 --- a/cinnamon-desktop-git.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/config.diff b/config.diff new file mode 100644 index 000000000000..44505eb83f6e --- /dev/null +++ b/config.diff @@ -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. diff --git a/fix_build.patch b/fix_build.patch deleted file mode 100644 index 0cf75661e182..000000000000 --- a/fix_build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2,7 +2,7 @@ - AC_CONFIG_SRCDIR(libcinnamon-desktop) - --AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar subdir-objects]) -+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - AC_CONFIG_HEADERS([config.h])
\ No newline at end of file |