* [PR PATCH] Cinnamon: update to 4.2.x
@ 2019-09-26 17:59 voidlinux-github
2019-09-26 18:12 ` [WIP] cinnamon: " voidlinux-github
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-26 17:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
Cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 22022 bytes --]
From e49d62e1f516cd281eb5eb0645a469b0217d690a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/13] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..836d39bbcd4 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 65d07621d203191238f40aedfffd9012ce5473b9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/13] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From cf8adca887fe7db8696099b1ba3820b98e0bb45d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/13] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 3337d531c92aaf3fae84a478276cbbaac10c9f8c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/13] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..c02a8e1ae9c 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From d74f838e43c2ddaabfdcfc345549e19e9ec464d1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/13] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..fb54366acd1 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
short_desc="The Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
From e0ec0a8279a16ca2dd68305e0de3279ad34d9c42 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/13] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..21bb56de09e 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From be68b5d066c97e16aac1c8ac3cc92d277e480e8f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/13] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From 0afb52b4accde9c037c3a56d35dc468577afd1ad Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/13] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 6 +-
4 files changed, 3 insertions(+), 109 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..31a8d756827 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From ebcfa391fd3d5d63ebf48acedf167bf6d01277ae Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/13] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..a030854f8b3 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,7 +1,7 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From ada334aac08fd28c02b36cf6876530b221dc0e5a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/13] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From d839e133a67544d860d4073bd21896ef2528e499 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/13] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 62d839650a0dff5be31bc505960d37237ce85313 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/13] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..73ca3a10ed4 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
do_check() {
:
From 0206880beb31556ccbc2a5de276f4e6362e09e1d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/13] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..a635a69c8e9 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [WIP] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
@ 2019-09-26 18:12 ` voidlinux-github
2019-09-27 8:17 ` [PR PATCH] [Updated] " voidlinux-github
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-26 18:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/14745#issuecomment-535623977
Comment:
_cinnamon-settings_ needs [tinycss](https://pypi.org/project/tinycss/) - Ι will package it and add the commit to the PR.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
2019-09-26 18:12 ` [WIP] cinnamon: " voidlinux-github
2019-09-27 8:17 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-27 8:17 ` voidlinux-github
2019-09-27 9:18 ` voidlinux-github
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-27 8:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
[WIP] cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 23359 bytes --]
From 6c79e3db9e2d21f3b22d1e9fa8f207fc5cfa41a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/13] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 8d4611e797a3c19242c5061a6e82e67e8937b20a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/13] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From ef2068a118c190335c99e3c7fbc62df8d98d3fbf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/13] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 63fa9c34b8b670529b76a0ca253b54e67b339fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/13] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From 65a0e24a8d9e62b8b9a22ffc8d3e87aa01697f4f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/13] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..fb54366acd1 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
short_desc="The Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
From 9b4f517c42ce1fb1ebf0fd9a564d4e0056e41ad0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/13] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -10,13 +10,13 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From 4c886deb46ff26d01c71dd44a2271e91c5f8323a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/13] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From 810d777c830d8efc2cfd08d12b689c040a73233a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/13] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 6 +-
4 files changed, 3 insertions(+), 109 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..31a8d756827 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From 632e73508eb95b4fd2fd2204c49c7e78474b0eda Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/13] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..a030854f8b3 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,7 +1,7 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From 435e59d6286c369f26f7a3c13f88bb09033b43e4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/13] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From 5b2fd9a91472b09f78c597314bd0f68b535f3c8f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/13] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 9327f9c08539a9e0c1c6d1233894bb82a038ae52 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/13] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
do_check() {
:
From ae6d97127f96fa3139b7a967a528f3f5e62ebe8f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/13] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
2019-09-26 18:12 ` [WIP] cinnamon: " voidlinux-github
@ 2019-09-27 8:17 ` voidlinux-github
2019-09-27 8:17 ` voidlinux-github
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-27 8:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
[WIP] cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 23359 bytes --]
From 6c79e3db9e2d21f3b22d1e9fa8f207fc5cfa41a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/13] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 8d4611e797a3c19242c5061a6e82e67e8937b20a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/13] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From ef2068a118c190335c99e3c7fbc62df8d98d3fbf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/13] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 63fa9c34b8b670529b76a0ca253b54e67b339fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/13] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From 65a0e24a8d9e62b8b9a22ffc8d3e87aa01697f4f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/13] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..fb54366acd1 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
short_desc="The Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
From 9b4f517c42ce1fb1ebf0fd9a564d4e0056e41ad0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/13] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -10,13 +10,13 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From 4c886deb46ff26d01c71dd44a2271e91c5f8323a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/13] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From 810d777c830d8efc2cfd08d12b689c040a73233a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/13] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 6 +-
4 files changed, 3 insertions(+), 109 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..31a8d756827 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From 632e73508eb95b4fd2fd2204c49c7e78474b0eda Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/13] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..a030854f8b3 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,7 +1,7 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From 435e59d6286c369f26f7a3c13f88bb09033b43e4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/13] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From 5b2fd9a91472b09f78c597314bd0f68b535f3c8f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/13] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 9327f9c08539a9e0c1c6d1233894bb82a038ae52 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/13] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
do_check() {
:
From ae6d97127f96fa3139b7a967a528f3f5e62ebe8f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/13] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
` (2 preceding siblings ...)
2019-09-27 8:17 ` voidlinux-github
@ 2019-09-27 9:18 ` voidlinux-github
2019-09-27 9:18 ` voidlinux-github
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-27 9:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
[WIP] cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 26157 bytes --]
From 6c79e3db9e2d21f3b22d1e9fa8f207fc5cfa41a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/14] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 8d4611e797a3c19242c5061a6e82e67e8937b20a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/14] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From ef2068a118c190335c99e3c7fbc62df8d98d3fbf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/14] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 63fa9c34b8b670529b76a0ca253b54e67b339fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/14] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From 889596f79ce14e1f6fc176905d036f91a7bcf0aa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/14] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 6 +++---
srcpkgs/cinnamon-settings-daemon/template | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..fb54366acd1 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
short_desc="The Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..bf9391dad90 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -10,7 +10,7 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
From 08a1400da1155cc51471f6c9beed5c3fe6f92a18 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/14] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index bf9391dad90..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From 2c97ef4adf040e8229ee18d341090c53c31d9caf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/14] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From e55046a0ceeaf08102336f7a2dbf7abaeb0e7c0e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/14] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 9 +--
4 files changed, 5 insertions(+), 110 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..e67f8f5f296 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*}
cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
- python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From 2427d0a8c29cff7655833296b603090724b1129d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/14] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..f3214ff4219 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,11 +1,11 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel"
+ gobject-introspection glib-devel dbus"
makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection
gtk+3-devel"
short_desc="Javascript for Cinnamon"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From dd4b6ff347ddbe1f638a6e9326ed64cc243dd7ca Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/14] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From f062e48142742782f5e9444be7e5f40b3abc2e64 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/14] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 17d9245f02d4a9ca1379704bac19d9cf26c73263 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/14] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
do_check() {
:
From 3d6a384f16f0066e266012307e6f3bf6db9a191d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/14] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
From 8f55e01b1c1dbce1529c8015b43c5ebc2e783ce7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 27 Sep 2019 12:08:33 +0300
Subject: [PATCH 14/14] New package: python-tinycss-0.4
---
srcpkgs/python-tinycss/template | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/python-tinycss/template
diff --git a/srcpkgs/python-tinycss/template b/srcpkgs/python-tinycss/template
new file mode 100644
index 00000000000..0fce59dca2e
--- /dev/null
+++ b/srcpkgs/python-tinycss/template
@@ -0,0 +1,33 @@
+# Template file for 'python-tinycss'
+pkgname=python-tinycss
+version=0.4
+revision=1
+archs=noarch
+wrksrc=tinycss-${version}
+#create_wrksrc=yes
+#archs="i686 x86_64"
+build_style=python-module
+pycompile_module="tinycss"
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+depends="python"
+short_desc="Complete yet simple CSS parser for Python (Python2)"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://tinycss.readthedocs.io/en/latest/"
+distfiles="https://files.pythonhosted.org/packages/05/59/af583fff6236c7d2f94f8175c40ce501dcefb8d1b42e4bb7a2622dff689e/tinycss-${version}.tar.gz"
+checksum=12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e
+
+post_install() {
+ vlicense LICENSE
+}
+
+python3-tinycss_package() {
+ pycompile_module="tinycss"
+ depends="python3"
+ short_desc="${short_desc/Python2/Python3}"
+ pkg_install() {
+ vmove usr/lib/python3*
+ vlicense LICENSE
+ }
+}
\ No newline at end of file
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
` (3 preceding siblings ...)
2019-09-27 9:18 ` voidlinux-github
@ 2019-09-27 9:18 ` voidlinux-github
2019-09-27 9:53 ` voidlinux-github
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-27 9:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
[WIP] cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 26157 bytes --]
From 6c79e3db9e2d21f3b22d1e9fa8f207fc5cfa41a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/14] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 8d4611e797a3c19242c5061a6e82e67e8937b20a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/14] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From ef2068a118c190335c99e3c7fbc62df8d98d3fbf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/14] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 63fa9c34b8b670529b76a0ca253b54e67b339fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/14] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From 889596f79ce14e1f6fc176905d036f91a7bcf0aa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/14] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 6 +++---
srcpkgs/cinnamon-settings-daemon/template | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..fb54366acd1 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
short_desc="The Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..bf9391dad90 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -10,7 +10,7 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
From 08a1400da1155cc51471f6c9beed5c3fe6f92a18 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/14] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index bf9391dad90..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From 2c97ef4adf040e8229ee18d341090c53c31d9caf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/14] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From e55046a0ceeaf08102336f7a2dbf7abaeb0e7c0e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/14] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 9 +--
4 files changed, 5 insertions(+), 110 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..e67f8f5f296 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*}
cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
- python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From 2427d0a8c29cff7655833296b603090724b1129d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/14] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..f3214ff4219 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,11 +1,11 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel"
+ gobject-introspection glib-devel dbus"
makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection
gtk+3-devel"
short_desc="Javascript for Cinnamon"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From dd4b6ff347ddbe1f638a6e9326ed64cc243dd7ca Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/14] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From f062e48142742782f5e9444be7e5f40b3abc2e64 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/14] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 17d9245f02d4a9ca1379704bac19d9cf26c73263 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/14] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
do_check() {
:
From 3d6a384f16f0066e266012307e6f3bf6db9a191d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/14] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
From 8f55e01b1c1dbce1529c8015b43c5ebc2e783ce7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 27 Sep 2019 12:08:33 +0300
Subject: [PATCH 14/14] New package: python-tinycss-0.4
---
srcpkgs/python-tinycss/template | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/python-tinycss/template
diff --git a/srcpkgs/python-tinycss/template b/srcpkgs/python-tinycss/template
new file mode 100644
index 00000000000..0fce59dca2e
--- /dev/null
+++ b/srcpkgs/python-tinycss/template
@@ -0,0 +1,33 @@
+# Template file for 'python-tinycss'
+pkgname=python-tinycss
+version=0.4
+revision=1
+archs=noarch
+wrksrc=tinycss-${version}
+#create_wrksrc=yes
+#archs="i686 x86_64"
+build_style=python-module
+pycompile_module="tinycss"
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+depends="python"
+short_desc="Complete yet simple CSS parser for Python (Python2)"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://tinycss.readthedocs.io/en/latest/"
+distfiles="https://files.pythonhosted.org/packages/05/59/af583fff6236c7d2f94f8175c40ce501dcefb8d1b42e4bb7a2622dff689e/tinycss-${version}.tar.gz"
+checksum=12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e
+
+post_install() {
+ vlicense LICENSE
+}
+
+python3-tinycss_package() {
+ pycompile_module="tinycss"
+ depends="python3"
+ short_desc="${short_desc/Python2/Python3}"
+ pkg_install() {
+ vmove usr/lib/python3*
+ vlicense LICENSE
+ }
+}
\ No newline at end of file
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
` (4 preceding siblings ...)
2019-09-27 9:18 ` voidlinux-github
@ 2019-09-27 9:53 ` voidlinux-github
2019-09-27 9:53 ` voidlinux-github
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-27 9:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
[WIP] cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 26346 bytes --]
From 6c79e3db9e2d21f3b22d1e9fa8f207fc5cfa41a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/14] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 8d4611e797a3c19242c5061a6e82e67e8937b20a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/14] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From ef2068a118c190335c99e3c7fbc62df8d98d3fbf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/14] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 63fa9c34b8b670529b76a0ca253b54e67b339fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/14] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From dbae8e9847f4320d7fb389e56aebfa4a677493e2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/14] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 8 ++++----
srcpkgs/cinnamon-settings-daemon/template | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..58b88acc618 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
-short_desc="The Cinnamon session handler"
+short_desc="Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..bf9391dad90 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -10,7 +10,7 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
From ee4b9481bbc3af5640e644ffaf82c91c648b09cf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/14] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index bf9391dad90..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From da34735eed3768cc63c024517ce53c9c473291d8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/14] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From 407a87e80b52ba224304b28889db7cbcdb6aa113 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/14] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 9 +--
4 files changed, 5 insertions(+), 110 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..60b9e8be68b 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*}
cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
- python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From 7c822c08ac81b19f42cdcb36a0d368e2cf740f39 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/14] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..f3214ff4219 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,11 +1,11 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel"
+ gobject-introspection glib-devel dbus"
makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection
gtk+3-devel"
short_desc="Javascript for Cinnamon"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From 5d5a0b551eea210028ae69e335d81f11a15140bd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/14] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From 53cc6423c4b4ae17e245231e1e957f3a45eaa965 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/14] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 9e432cb7ebd953c10c0e6d1318171eaa35a4544f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/14] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
do_check() {
:
From 36923f5b262999c3f4cfa68fd25e00651fc2d60e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/14] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
From 34a63a97230df95856a32e808bd76d9e7a7fc47e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 27 Sep 2019 12:08:33 +0300
Subject: [PATCH 14/14] New package: python-tinycss-0.4
---
srcpkgs/python-tinycss/template | 32 ++++++++++++++++++++++++++++++++
srcpkgs/python3-tinycss | 1 +
2 files changed, 33 insertions(+)
create mode 100644 srcpkgs/python-tinycss/template
create mode 120000 srcpkgs/python3-tinycss
diff --git a/srcpkgs/python-tinycss/template b/srcpkgs/python-tinycss/template
new file mode 100644
index 00000000000..315539070f9
--- /dev/null
+++ b/srcpkgs/python-tinycss/template
@@ -0,0 +1,32 @@
+# Template file for 'python-tinycss'
+pkgname=python-tinycss
+version=0.4
+revision=1
+archs=noarch
+wrksrc=tinycss-${version}
+build_style=python-module
+pycompile_module="tinycss"
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+depends="python"
+short_desc="Complete yet simple CSS parser for Python (Python2)"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://tinycss.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/t/tinycss/tinycss-${version}.tar.gz"
+checksum=12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e
+
+post_install() {
+ vlicense LICENSE
+}
+
+python3-tinycss_package() {
+ pycompile_module="tinycss"
+ depends="python3"
+ short_desc="${short_desc/Python2/Python3}"
+ pkg_install() {
+ vmove usr/lib/python3*
+ vlicense LICENSE
+ }
+}
+
diff --git a/srcpkgs/python3-tinycss b/srcpkgs/python3-tinycss
new file mode 120000
index 00000000000..7edaf90e546
--- /dev/null
+++ b/srcpkgs/python3-tinycss
@@ -0,0 +1 @@
+python-tinycss
\ No newline at end of file
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
` (5 preceding siblings ...)
2019-09-27 9:53 ` voidlinux-github
@ 2019-09-27 9:53 ` voidlinux-github
2019-09-27 10:26 ` voidlinux-github
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-27 9:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
[WIP] cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 26346 bytes --]
From 6c79e3db9e2d21f3b22d1e9fa8f207fc5cfa41a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/14] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 8d4611e797a3c19242c5061a6e82e67e8937b20a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/14] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From ef2068a118c190335c99e3c7fbc62df8d98d3fbf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/14] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 63fa9c34b8b670529b76a0ca253b54e67b339fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/14] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From dbae8e9847f4320d7fb389e56aebfa4a677493e2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/14] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 8 ++++----
srcpkgs/cinnamon-settings-daemon/template | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..58b88acc618 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
-short_desc="The Cinnamon session handler"
+short_desc="Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..bf9391dad90 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -10,7 +10,7 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
From ee4b9481bbc3af5640e644ffaf82c91c648b09cf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/14] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index bf9391dad90..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From da34735eed3768cc63c024517ce53c9c473291d8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/14] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From 407a87e80b52ba224304b28889db7cbcdb6aa113 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/14] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 9 +--
4 files changed, 5 insertions(+), 110 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..60b9e8be68b 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*}
cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
- python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From 7c822c08ac81b19f42cdcb36a0d368e2cf740f39 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/14] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..f3214ff4219 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,11 +1,11 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel"
+ gobject-introspection glib-devel dbus"
makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection
gtk+3-devel"
short_desc="Javascript for Cinnamon"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From 5d5a0b551eea210028ae69e335d81f11a15140bd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/14] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From 53cc6423c4b4ae17e245231e1e957f3a45eaa965 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/14] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 9e432cb7ebd953c10c0e6d1318171eaa35a4544f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/14] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
do_check() {
:
From 36923f5b262999c3f4cfa68fd25e00651fc2d60e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/14] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
From 34a63a97230df95856a32e808bd76d9e7a7fc47e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 27 Sep 2019 12:08:33 +0300
Subject: [PATCH 14/14] New package: python-tinycss-0.4
---
srcpkgs/python-tinycss/template | 32 ++++++++++++++++++++++++++++++++
srcpkgs/python3-tinycss | 1 +
2 files changed, 33 insertions(+)
create mode 100644 srcpkgs/python-tinycss/template
create mode 120000 srcpkgs/python3-tinycss
diff --git a/srcpkgs/python-tinycss/template b/srcpkgs/python-tinycss/template
new file mode 100644
index 00000000000..315539070f9
--- /dev/null
+++ b/srcpkgs/python-tinycss/template
@@ -0,0 +1,32 @@
+# Template file for 'python-tinycss'
+pkgname=python-tinycss
+version=0.4
+revision=1
+archs=noarch
+wrksrc=tinycss-${version}
+build_style=python-module
+pycompile_module="tinycss"
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+depends="python"
+short_desc="Complete yet simple CSS parser for Python (Python2)"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://tinycss.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/t/tinycss/tinycss-${version}.tar.gz"
+checksum=12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e
+
+post_install() {
+ vlicense LICENSE
+}
+
+python3-tinycss_package() {
+ pycompile_module="tinycss"
+ depends="python3"
+ short_desc="${short_desc/Python2/Python3}"
+ pkg_install() {
+ vmove usr/lib/python3*
+ vlicense LICENSE
+ }
+}
+
diff --git a/srcpkgs/python3-tinycss b/srcpkgs/python3-tinycss
new file mode 120000
index 00000000000..7edaf90e546
--- /dev/null
+++ b/srcpkgs/python3-tinycss
@@ -0,0 +1 @@
+python-tinycss
\ No newline at end of file
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
` (7 preceding siblings ...)
2019-09-27 10:26 ` voidlinux-github
@ 2019-09-27 10:26 ` voidlinux-github
2019-09-30 18:49 ` [PR PATCH] [Updated] " voidlinux-github
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-27 10:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
[WIP] cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 26416 bytes --]
From 6c79e3db9e2d21f3b22d1e9fa8f207fc5cfa41a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/14] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 8d4611e797a3c19242c5061a6e82e67e8937b20a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/14] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From ef2068a118c190335c99e3c7fbc62df8d98d3fbf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/14] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 63fa9c34b8b670529b76a0ca253b54e67b339fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/14] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From dbae8e9847f4320d7fb389e56aebfa4a677493e2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/14] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 8 ++++----
srcpkgs/cinnamon-settings-daemon/template | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..58b88acc618 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
-short_desc="The Cinnamon session handler"
+short_desc="Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..bf9391dad90 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -10,7 +10,7 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
From ee4b9481bbc3af5640e644ffaf82c91c648b09cf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/14] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index bf9391dad90..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From da34735eed3768cc63c024517ce53c9c473291d8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/14] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From 407a87e80b52ba224304b28889db7cbcdb6aa113 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/14] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 9 +--
4 files changed, 5 insertions(+), 110 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..60b9e8be68b 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*}
cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
- python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From decca0f01238d4762068073673245bf72de28d78 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/14] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..5db9aa80efc 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,11 +1,11 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel"
+ gobject-introspection glib-devel dbus"
makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection
gtk+3-devel"
short_desc="Javascript for Cinnamon"
@@ -13,7 +13,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
+nocross="yes" # https://api.travis-ci.org/v3/job/590340360/log.txt
+
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From bfcae41417023f9a4ac05d20d5058dc14b89b1a3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/14] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From f0be52ec389611f903a2f099652aa8ec53468a84 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/14] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 0936107e16b3948651a0e163b7719d510198f6ef Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/14] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
do_check() {
:
From 81e553fed55f7ef26f33c2e907cfb4c1ce281c4d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/14] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
From cef7908a7c17cfecd1a2869b01aa3b9648df7f4d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 27 Sep 2019 12:08:33 +0300
Subject: [PATCH 14/14] New package: python-tinycss-0.4
---
srcpkgs/python-tinycss/template | 31 +++++++++++++++++++++++++++++++
srcpkgs/python3-tinycss | 1 +
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/python-tinycss/template
create mode 120000 srcpkgs/python3-tinycss
diff --git a/srcpkgs/python-tinycss/template b/srcpkgs/python-tinycss/template
new file mode 100644
index 00000000000..00272ff1628
--- /dev/null
+++ b/srcpkgs/python-tinycss/template
@@ -0,0 +1,31 @@
+# Template file for 'python-tinycss'
+pkgname=python-tinycss
+version=0.4
+revision=1
+archs=noarch
+wrksrc=tinycss-${version}
+build_style=python-module
+pycompile_module="tinycss"
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+depends="python"
+short_desc="Complete yet simple CSS parser for Python (Python2)"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://tinycss.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/t/tinycss/tinycss-${version}.tar.gz"
+checksum=12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e
+
+post_install() {
+ vlicense LICENSE
+}
+
+python3-tinycss_package() {
+ pycompile_module="tinycss"
+ depends="python3"
+ short_desc="${short_desc/Python2/Python3}"
+ pkg_install() {
+ vmove usr/lib/python3*
+ vlicense LICENSE
+ }
+}
diff --git a/srcpkgs/python3-tinycss b/srcpkgs/python3-tinycss
new file mode 120000
index 00000000000..7edaf90e546
--- /dev/null
+++ b/srcpkgs/python3-tinycss
@@ -0,0 +1 @@
+python-tinycss
\ No newline at end of file
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
` (6 preceding siblings ...)
2019-09-27 9:53 ` voidlinux-github
@ 2019-09-27 10:26 ` voidlinux-github
2019-09-27 10:26 ` voidlinux-github
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-27 10:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
[WIP] cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 26416 bytes --]
From 6c79e3db9e2d21f3b22d1e9fa8f207fc5cfa41a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/14] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 8d4611e797a3c19242c5061a6e82e67e8937b20a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/14] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From ef2068a118c190335c99e3c7fbc62df8d98d3fbf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/14] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 63fa9c34b8b670529b76a0ca253b54e67b339fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/14] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From dbae8e9847f4320d7fb389e56aebfa4a677493e2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/14] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 8 ++++----
srcpkgs/cinnamon-settings-daemon/template | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..58b88acc618 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
-short_desc="The Cinnamon session handler"
+short_desc="Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..bf9391dad90 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -10,7 +10,7 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
From ee4b9481bbc3af5640e644ffaf82c91c648b09cf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/14] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index bf9391dad90..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From da34735eed3768cc63c024517ce53c9c473291d8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/14] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From 407a87e80b52ba224304b28889db7cbcdb6aa113 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/14] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 9 +--
4 files changed, 5 insertions(+), 110 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..60b9e8be68b 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*}
cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
- python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From decca0f01238d4762068073673245bf72de28d78 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/14] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..5db9aa80efc 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,11 +1,11 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel"
+ gobject-introspection glib-devel dbus"
makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection
gtk+3-devel"
short_desc="Javascript for Cinnamon"
@@ -13,7 +13,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
+nocross="yes" # https://api.travis-ci.org/v3/job/590340360/log.txt
+
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From bfcae41417023f9a4ac05d20d5058dc14b89b1a3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/14] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From f0be52ec389611f903a2f099652aa8ec53468a84 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/14] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 0936107e16b3948651a0e163b7719d510198f6ef Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/14] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
do_check() {
:
From 81e553fed55f7ef26f33c2e907cfb4c1ce281c4d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/14] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
From cef7908a7c17cfecd1a2869b01aa3b9648df7f4d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 27 Sep 2019 12:08:33 +0300
Subject: [PATCH 14/14] New package: python-tinycss-0.4
---
srcpkgs/python-tinycss/template | 31 +++++++++++++++++++++++++++++++
srcpkgs/python3-tinycss | 1 +
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/python-tinycss/template
create mode 120000 srcpkgs/python3-tinycss
diff --git a/srcpkgs/python-tinycss/template b/srcpkgs/python-tinycss/template
new file mode 100644
index 00000000000..00272ff1628
--- /dev/null
+++ b/srcpkgs/python-tinycss/template
@@ -0,0 +1,31 @@
+# Template file for 'python-tinycss'
+pkgname=python-tinycss
+version=0.4
+revision=1
+archs=noarch
+wrksrc=tinycss-${version}
+build_style=python-module
+pycompile_module="tinycss"
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel"
+depends="python"
+short_desc="Complete yet simple CSS parser for Python (Python2)"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://tinycss.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/t/tinycss/tinycss-${version}.tar.gz"
+checksum=12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e
+
+post_install() {
+ vlicense LICENSE
+}
+
+python3-tinycss_package() {
+ pycompile_module="tinycss"
+ depends="python3"
+ short_desc="${short_desc/Python2/Python3}"
+ pkg_install() {
+ vmove usr/lib/python3*
+ vlicense LICENSE
+ }
+}
diff --git a/srcpkgs/python3-tinycss b/srcpkgs/python3-tinycss
new file mode 120000
index 00000000000..7edaf90e546
--- /dev/null
+++ b/srcpkgs/python3-tinycss
@@ -0,0 +1 @@
+python-tinycss
\ No newline at end of file
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
` (9 preceding siblings ...)
2019-09-30 18:49 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-30 18:49 ` voidlinux-github
2019-09-30 19:29 ` [PR PATCH] [Merged]: " voidlinux-github
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-30 18:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 25877 bytes --]
From 6c79e3db9e2d21f3b22d1e9fa8f207fc5cfa41a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/14] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 8d4611e797a3c19242c5061a6e82e67e8937b20a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/14] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From ef2068a118c190335c99e3c7fbc62df8d98d3fbf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/14] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 63fa9c34b8b670529b76a0ca253b54e67b339fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/14] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From dbae8e9847f4320d7fb389e56aebfa4a677493e2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/14] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 8 ++++----
srcpkgs/cinnamon-settings-daemon/template | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..58b88acc618 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
-short_desc="The Cinnamon session handler"
+short_desc="Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..bf9391dad90 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -10,7 +10,7 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
From ee4b9481bbc3af5640e644ffaf82c91c648b09cf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/14] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index bf9391dad90..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From da34735eed3768cc63c024517ce53c9c473291d8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/14] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From 407a87e80b52ba224304b28889db7cbcdb6aa113 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/14] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 9 +--
4 files changed, 5 insertions(+), 110 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..60b9e8be68b 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*}
cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
- python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From decca0f01238d4762068073673245bf72de28d78 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/14] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..5db9aa80efc 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,11 +1,11 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel"
+ gobject-introspection glib-devel dbus"
makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection
gtk+3-devel"
short_desc="Javascript for Cinnamon"
@@ -13,7 +13,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
+nocross="yes" # https://api.travis-ci.org/v3/job/590340360/log.txt
+
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From bfcae41417023f9a4ac05d20d5058dc14b89b1a3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/14] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From f0be52ec389611f903a2f099652aa8ec53468a84 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/14] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 0936107e16b3948651a0e163b7719d510198f6ef Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/14] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
do_check() {
:
From 81e553fed55f7ef26f33c2e907cfb4c1ce281c4d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/14] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
From 1e378bce71cee0ef6367dd59e9beadcae5d9a5b2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 27 Sep 2019 12:08:33 +0300
Subject: [PATCH 14/14] New package: python3-tinycss-0.4
---
srcpkgs/python3-tinycss/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-tinycss/template
diff --git a/srcpkgs/python3-tinycss/template b/srcpkgs/python3-tinycss/template
new file mode 100644
index 00000000000..91fda6f808d
--- /dev/null
+++ b/srcpkgs/python3-tinycss/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-tinycss'
+pkgname=python3-tinycss
+version=0.4
+revision=1
+archs=noarch
+wrksrc=tinycss-${version}
+build_style=python3-module
+pycompile_module="tinycss"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Complete yet simple CSS parser for Python"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://tinycss.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/t/tinycss/tinycss-${version}.tar.gz"
+checksum=12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
` (8 preceding siblings ...)
2019-09-27 10:26 ` voidlinux-github
@ 2019-09-30 18:49 ` voidlinux-github
2019-09-30 18:49 ` voidlinux-github
2019-09-30 19:29 ` [PR PATCH] [Merged]: " voidlinux-github
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-30 18:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.2
https://github.com/void-linux/void-packages/pull/14745
cinnamon: update to 4.2.x
A patch file from https://github.com/void-linux/void-packages/pull/14745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.2-14745.patch --]
[-- Type: text/x-diff, Size: 25877 bytes --]
From 6c79e3db9e2d21f3b22d1e9fa8f207fc5cfa41a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:49:33 +0300
Subject: [PATCH 01/14] cinnamon-control-center: update to 4.2.2
---
srcpkgs/cinnamon-control-center/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 63027ef5197..5e6a1ab71d5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.0.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-update-mimedb --disable-systemd"
@@ -13,12 +13,12 @@ makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
pulseaudio-devel tzdata upower-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Control Center"
+short_desc="Cinnamon Control Center"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=130663817d55a6f37f6f5a51b2aa71b7b2ec7c684ef358f16b5a47e1b133ff76
+checksum=0cd334e9fc36165664362d2bef7953879ec1f1d1becdbce21ef0557ea34618d7
nocross="gobject-introspection"
do_check() {
From 8d4611e797a3c19242c5061a6e82e67e8937b20a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:01 +0300
Subject: [PATCH 02/14] cinnamon-desktop: update to 4.2.0
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 10cf9698c70..926e292256d 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.0.1
-revision=4
+version=4.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=72d4a8c78e42cf9d000f553551f3f3645df77c3c23973c989d7d269acd659100
+checksum=e7e6e9aa6e5c5c04a8320cb97ef545700826d04fc34e0f50d140d2efa41941a1
case "$XBPS_TARGET_MACHINE" in
aarch64-musl) broken="Expat.c: loadable library and perl binaries are mismatched (got handshake key 0xce00080, needed 0xc800080)" ;;
From ef2068a118c190335c99e3c7fbc62df8d98d3fbf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:50:30 +0300
Subject: [PATCH 03/14] cinnamon-menus: update to 4.2.0
---
srcpkgs/cinnamon-menus/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index affa413fa12..eedb8cbf29f 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,9 +1,8 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.0.0
+version=4.2.0
revision=1
-build_style=gnu-configure
-configure_args=" --disable-static"
+build_style=meson
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
pkg-config"
makedepends="libglib-devel gobject-introspection"
@@ -12,12 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e42c642a6fcb3b8e53d6b8f389cca617c8988baaa6e85ac236b61edc38efc3a5
+checksum=331bd599d7a863fa92329483637de159c25c57467305691f9768e675cd63f7c2
nocross="gobject-introspection"
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 63fa9c34b8b670529b76a0ca253b54e67b339fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:07 +0300
Subject: [PATCH 04/14] cinnamon-screensaver: update to 4.2.0
---
srcpkgs/cinnamon-screensaver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 71f8a8ee026..9d39f32709a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.0.3
+version=4.2.0
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,12 +11,12 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel
depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
-short_desc="The Cinnamon screensaver"
+short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0835111cf01b25447076177944a977cebfe995b5ce3dcfe0fba841141ebbdaca
+checksum=8dee253e12cbd2f30f2c5112a8e5fba62b651733cb56aa327ede939506adf6a0
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio
pycompile_version="$py3_ver"
From dbae8e9847f4320d7fb389e56aebfa4a677493e2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:51:50 +0300
Subject: [PATCH 05/14] cinnamon-session: update to 4.2.1
---
srcpkgs/cinnamon-session/template | 8 ++++----
srcpkgs/cinnamon-settings-daemon/template | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 04b89cbbab2..58b88acc618 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.0.0
+version=4.2.1
revision=1
build_style=meson
configure_args="-Dwith-gconf=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config gobject-introspection
gettext-devel dbus-glib-devel glib-devel intltool xmlto"
makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapps-devel GConf-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
-short_desc="The Cinnamon session handler"
+short_desc="Cinnamon session handler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=cfd6d71ff4000f463b36ffa97ab415557d627776eefbe2720d8d954319a5bdc5
+checksum=bff38239942dc990ccb57c35bde43c19ebc8708284410de53c100e12c7005663
nocross="gobject-introspection from cinnamon-desktop-devel"
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 854aa640076..bf9391dad90 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -10,7 +10,7 @@ makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="The Cinnamon Settings Daemon"
+short_desc="Cinnamon Settings Daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
From ee4b9481bbc3af5640e644ffaf82c91c648b09cf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:12 +0300
Subject: [PATCH 06/14] cinnamon-settings: update to 4.2.2
---
srcpkgs/cinnamon-settings-daemon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index bf9391dad90..3641a1df2f0 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.0.3
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args=" --disable-static --disable-schemas-compile"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=2b2530c089cf4d1f52510d00b38abc8f037776f61cb02942f3a3bbf242239c4f
+checksum=d5b1ff8b5777174a45ebf2906eb1690e79a241c1adeb56cd70f9f273674901f9
nocross="gobject-introspection"
pre_configure() {
From da34735eed3768cc63c024517ce53c9c473291d8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:52:39 +0300
Subject: [PATCH 07/14] cinnamon-translations: update to 4.2.2
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2eb1ad70d50..69e35cdf682 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.0.2
+version=4.2.2
revision=1
archs=noarch
build_style=gnu-makefile
@@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=07efa3d387aa91813dcc480e81237ae1daf1c8f817178ef7cbb2377ce8fba37d
+checksum=0bfcca02894dcff4644a77560515ea33d4beed1365210cf17ea66b04bf52ee1d
do_install() {
vmkdir /usr/share/locale
From 407a87e80b52ba224304b28889db7cbcdb6aa113 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:53:23 +0300
Subject: [PATCH 08/14] cinnamon: update to 4.2.4
---
...78cf57b80b977401460a147602832157b303.patch | 64 -------------------
srcpkgs/cinnamon/patches/default-theme.patch | 25 --------
srcpkgs/cinnamon/patches/set_wheel.patch | 17 -----
srcpkgs/cinnamon/template | 9 +--
4 files changed, 5 insertions(+), 110 deletions(-)
delete mode 100644 srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
delete mode 100644 srcpkgs/cinnamon/patches/default-theme.patch
delete mode 100644 srcpkgs/cinnamon/patches/set_wheel.patch
diff --git a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch b/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
deleted file mode 100644
index 0e2bf8c54ba..00000000000
--- a/srcpkgs/cinnamon/patches/595178cf57b80b977401460a147602832157b303.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 5 Apr 2019 11:28:45 -0400
-Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
-
-The Image.VERSION variable was deprecated some time ago and is now gone
-entirely. But its only use was to determine whether we were using at
-least the latest version of PIL, or any version of its fork, Pillow. And
-PIL was last developed in 2009 and does not support python3 at all, so
-we are guaranteed to be using Pillow.
-
-Moreover, the check does not really matter, as Pillow is guaranteed to
-load any image it opens, without the user doing so manually.
-
-Fixes #8495
----
- .../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
- 1 file changed, 1 insertion(+), 26 deletions(-)
-
-diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-index 05605001f7..c386fe3847 100644
---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
-@@ -620,31 +620,6 @@ def has_transparency(image):
- has_alpha(image)
-
-
--if Image.VERSION == '1.1.7':
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- image.load()
-- return image.split()
--else:
--
-- def split(image):
-- """Work around for bug in Pil 1.1.7
--
-- :param image: input image
-- :type image: PIL image object
-- :returns: the different color bands of the image (eg R, G, B)
-- :rtype: tuple
-- """
-- return image.split()
--
--
- def get_alpha(image):
- """Gets the image alpha band. Can handles P mode images with transpareny.
- Returns a band with all values set to 255 if no alpha band exists.
-@@ -655,7 +630,7 @@ def get_alpha(image):
- :rtype: single band image object
- """
- if has_alpha(image):
-- return split(image)[-1]
-+ return image.split()[-1]
- if image.mode == 'P' and 'transparency' in image.info:
- return image.convert('RGBA').split()[-1]
- # No alpha layer, create one.
diff --git a/srcpkgs/cinnamon/patches/default-theme.patch b/srcpkgs/cinnamon/patches/default-theme.patch
deleted file mode 100644
index f18623acb57..00000000000
--- a/srcpkgs/cinnamon/patches/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad 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 +-
- 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
---- data/org.cinnamon.gschema.xml.in
-+++ data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,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>
- The name of the theme
---
-2.1.3
-
diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
deleted file mode 100644
index 86228d1895d..00000000000
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2017-12-18 13:53:18.000000000 +0100
-+++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2017-12-21 22:15:03.058109278 +0100
-@@ -839,11 +833,11 @@
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bdf374cea82..60b9e8be68b 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.0.10
-revision=2
+version=4.2.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--enable-compile-warnings=no --disable-gtk-doc"
@@ -18,14 +18,15 @@ depends=" accountsservice caribou cinnamon-settings-daemon>=${version%.*}
cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
- python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify"
+ python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
+ python3-tinycss"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=50e07fa014eeecb380e840a3be0f09c8af0ad368c64c6b8ce6c30b1f78a2bf66
+checksum=4329b03e08a82316b6890b761174132c18a349508387f005748c32436f6364fd
nocross="gobject-introspection"
pycompile_version="$py3_ver"
From decca0f01238d4762068073673245bf72de28d78 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:00 +0300
Subject: [PATCH 09/14] cjs: update to 4.2.0
---
srcpkgs/cjs/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index a6584d1923b..5db9aa80efc 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,11 +1,11 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.0.0
-revision=2
+version=4.2.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-profiler"
hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel"
+ gobject-introspection glib-devel dbus"
makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection
gtk+3-devel"
short_desc="Javascript for Cinnamon"
@@ -13,7 +13,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=acd520a503399753ecb0bfa71aa3d932d22ac6a72162043085ea48519a59d3f5
+checksum=77d1b9f0290135939ad03b60ac64ac637f05e886ba5b777b97f6742ee75af260
+nocross="yes" # https://api.travis-ci.org/v3/job/590340360/log.txt
+
pre_configure() {
cp ${FILESDIR}/ax_code_coverage.m4 m4/
From bfcae41417023f9a4ac05d20d5058dc14b89b1a3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:54:28 +0300
Subject: [PATCH 10/14] muffin: update to 4.2.2
---
srcpkgs/muffin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index a64694bcb74..bbcec2ae72f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.0.7
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e515c5d396c258b6b6c43c3b819cb170f057c90874ece943e31cb8c8f4ba3d10
+checksum=08c64a7a951fc526d96b4e3b6b53997328904ae2430aad4c2611a4f130a5bd16
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
nocross="gobject-introspection"
From f0be52ec389611f903a2f099652aa8ec53468a84 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:02 +0300
Subject: [PATCH 11/14] nemo-fileroller: update to 4.2.0
---
srcpkgs/nemo-fileroller/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 850332497f5..430b2ce3241 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.0.0
+version=4.2.0
revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=4bee7336554fd3c6e87371bc4683e5bee989a67030582b89a050aad5874a04de
+checksum=8ee8698c6058762965635d8233c18a4019437f73752e2085087d812aa46c0fe5
pre_configure() {
autoreconf -fi
From 0936107e16b3948651a0e163b7719d510198f6ef Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:21 +0300
Subject: [PATCH 12/14] nemo: update to 4.2.3
---
srcpkgs/nemo/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b88a4f404c5..8f5d8fa7247 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.0.6
-revision=2
+version=4.2.3
+revision=1
build_style=meson
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
@@ -14,7 +14,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=9e7305955d1e420f85c944c921e2d622cd799785ea271ed488888e910a097e47
+checksum=f7876862340d9823f30e3b6b87bf97578089e448d57eeb7c6e41b0a2b69995f9
+nocross="ninja stops when compiling libnemo-private/eaa6409@@nemo-private@sta/nemo-file-undo-manager.c.o"
+
do_check() {
:
From 81e553fed55f7ef26f33c2e907cfb4c1ce281c4d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 26 Sep 2019 20:55:46 +0300
Subject: [PATCH 13/14] xapps: update to 1.4.9
---
srcpkgs/xapps/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 955199a35be..80bc0bd7cbf 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.4.8
+version=1.4.9
revision=1
build_style=meson
build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=6f6c37c568e58ea1644fecc3513708877d358eb3911ff138a992c5078e4b0c73
+checksum=c2122c8c0616b07aca0654c86810549545363733ad36ec6f27451345083c80ca
xapps-devel_package() {
short_desc+=" - development files"
@@ -24,5 +24,7 @@ xapps-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
From 1e378bce71cee0ef6367dd59e9beadcae5d9a5b2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 27 Sep 2019 12:08:33 +0300
Subject: [PATCH 14/14] New package: python3-tinycss-0.4
---
srcpkgs/python3-tinycss/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-tinycss/template
diff --git a/srcpkgs/python3-tinycss/template b/srcpkgs/python3-tinycss/template
new file mode 100644
index 00000000000..91fda6f808d
--- /dev/null
+++ b/srcpkgs/python3-tinycss/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-tinycss'
+pkgname=python3-tinycss
+version=0.4
+revision=1
+archs=noarch
+wrksrc=tinycss-${version}
+build_style=python3-module
+pycompile_module="tinycss"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Complete yet simple CSS parser for Python"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="BSD-3-Clause"
+homepage="https://tinycss.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/t/tinycss/tinycss-${version}.tar.gz"
+checksum=12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: cinnamon: update to 4.2.x
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
` (10 preceding siblings ...)
2019-09-30 18:49 ` voidlinux-github
@ 2019-09-30 19:29 ` voidlinux-github
11 siblings, 0 replies; 13+ messages in thread
From: voidlinux-github @ 2019-09-30 19:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
There's a merged pull request on the void-packages repository
cinnamon: update to 4.2.x
https://github.com/void-linux/void-packages/pull/14745
Description:
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-09-30 19:29 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-26 17:59 [PR PATCH] Cinnamon: update to 4.2.x voidlinux-github
2019-09-26 18:12 ` [WIP] cinnamon: " voidlinux-github
2019-09-27 8:17 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-27 8:17 ` voidlinux-github
2019-09-27 9:18 ` voidlinux-github
2019-09-27 9:18 ` voidlinux-github
2019-09-27 9:53 ` voidlinux-github
2019-09-27 9:53 ` voidlinux-github
2019-09-27 10:26 ` voidlinux-github
2019-09-27 10:26 ` voidlinux-github
2019-09-30 18:49 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-30 18:49 ` voidlinux-github
2019-09-30 19:29 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).