* Re: [PR PATCH] [Updated] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
@ 2020-12-05 14:41 ` mobinmob
2020-12-05 20:05 ` [PR REVIEW] " ericonr
` (34 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-05 14:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.8
https://github.com/void-linux/void-packages/pull/26965
Cinnamon: update to 4.8.
Includes changes from https://github.com/void-linux/void-packages/pull/26778 by @ndowens .
A patch file from https://github.com/void-linux/void-packages/pull/26965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.8-26965.patch --]
[-- Type: text/x-diff, Size: 23038 bytes --]
From e2a068293a10cfcb1cb8273a83f7bc08b39c87b6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:23:04 +0200
Subject: [PATCH 01/13] cinnamon-control-center: update to 4.8.0.
---
.../patches/disable-timezone-tests.patch | 13 -----------
srcpkgs/cinnamon-control-center/template | 22 +++++--------------
2 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
diff --git a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch b/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
deleted file mode 100644
index 964fb8c1612..00000000000
--- a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- panels/datetime/Makefile.am.orig 2015-05-30 08:26:46.499494572 +0200
-+++ panels/datetime/Makefile.am 2015-05-30 08:26:56.890603931 +0200
-@@ -132,8 +132,8 @@ test_endianess_CFLAGS = $(DATETIME_PANEL
- all-local: check-local
-
- check-local: test-timezone-gfx test-endianess test-timezone
-- $(builddir)/test-timezone-gfx $(srcdir)/data
-- $(builddir)/test-endianess
-+# $(builddir)/test-timezone-gfx $(srcdir)/data
-+# $(builddir)/test-endianess
- # $(builddir)/test-timezone
-
- ccpanelsdir = $(PANELS_DIR)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 9da17ca74f3..71cab345d06 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,11 +1,10 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.6.2
-revision=3
-build_style=gnu-configure
+version=4.8.0
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-update-mimedb --disable-systemd"
-hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
+hostmakedepends="gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config libxslt"
makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
@@ -19,23 +18,12 @@ 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=f887d7e185f8ff1ee6f9789219231cba8be820c706b316d35ee5118d2fd898eb
+checksum=c419b7ce59c24492543ba95bd7dbb5fcc4b5338d2596b14820d80ec26d98fdd3
do_check() {
:
}
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
- # Remove unused stuff
- make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
- rm -R "$DESTDIR/usr/share/applications"
- rm -R "$DESTDIR/etc"
-}
-
libcinnamon-control-center_package() {
short_desc+=" - runtime library"
pkg_install() {
From 8c8a92a88b6178b8d200217107491f7a2acb13b1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:23:48 +0200
Subject: [PATCH 02/13] cinnamon-desktop: update to 4.8.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 77dfab737b6..36c523d4c7b 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.6.4
-revision=2
+version=4.8.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://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-desktop"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=8b0f69c4acbeabca723a95ec80905601eec8d563c96ad88a9de3ddac56925ef6
+checksum=99db3b15f3d267f1e88320030020506c34953e2b9d9ec621ed59c0eb12f64d9b
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From 4e03e9805012a80b882a715cd3dabb18dbbdac6a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:24:14 +0200
Subject: [PATCH 03/13] cinnamon-menus: update to 4.8.1.
---
srcpkgs/cinnamon-menus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 7b2451c7ee9..61c16a97ec8 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.6.1
-revision=2
+version=4.8.1
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-menus"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=534cf3e15fed812e1affb544811e10823edbc56360b52a80ffbabc006c467dc6
+checksum=a6070591b1e9eaed8b9a332e7e2ecb9fcd90de5565f7e4dc97cd7aeb89a6cc19
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From f9374d663cdd7889c8c8a4ac7bf3121d29c14911 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:24:40 +0200
Subject: [PATCH 04/13] cinnamon-screensaver: update to 4.8.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 76df8da77bf..2991c39b31d 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.6.0
-revision=2
+version=4.8.0
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-screensaver"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e93349521a24f2b49c8a293ee15798ba341ae8e9b000cf3da5311a162ce8cb60
+checksum=d8d977e8a013fd5cf4dddb308c5fdffb7e1340e9c1496c6fc012de4ca420f202
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 80aef94ca168c897275dc6fd0a2c709f75fed3a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:25:03 +0200
Subject: [PATCH 05/13] cinnamon-session: update to 4.8.0.
---
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 bd9d618653c..c27272b802a 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.6.2
-revision=2
+version=4.8.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dgconf=false"
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-session"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0d4793d8fb828ce8ec6dbedc67a5d244e56d4182b83030d10029eadc0c6723e6
+checksum=66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4
From a3020e14b415af6562cfffadc1887d7d3e93c912 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:25:39 +0200
Subject: [PATCH 06/13] cinnamon-settings-daemon: update to 4.8.2.
---
srcpkgs/cinnamon-settings-daemon/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 70f76130dd2..a71edcbd606 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,10 +1,9 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.6.4
-revision=2
-build_style=gnu-configure
+version=4.8.2
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config"
makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
@@ -16,11 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
-
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
+checksum=e8d6aaf2c5be5b1e12f12b5ca069e682c65f2057ae9133c7dfe271aebebca259
do_check() {
:
From 7f285d20f74db9f4d4237e9e463a97013aef8ccd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:26:07 +0200
Subject: [PATCH 07/13] cinnamon-translations: update to 4.8.0.
---
srcpkgs/cinnamon-translations/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 7c31bd54a00..16f61a09a1a 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.6.2
-revision=2
+version=4.8.0
+revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
short_desc="Translations for Cinnamon and Nemo"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://translations.launchpad.net/linuxmint/latest/"
distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=f79b818c3339dec395a8739ebfdb9079e236eeb9608768d76fecfe77dc231cb4
+checksum=6e2667b83cb7c76a2315f7bacee2a7363a5758213d9016d360fdb3b671852efb
do_install() {
vmkdir usr
From 6c2a64b11834fb6315a5a495105e7b9944814c61 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:38:40 +0200
Subject: [PATCH 08/13] cinnamon: update to 4.8.0.
---
...3592fdb9e3d02210880776e9109f74a84a4cd.diff | 30 +++++++++++++++++++
srcpkgs/cinnamon/template | 18 +++++------
2 files changed, 38 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
diff --git a/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff b/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
new file mode 100644
index 00000000000..812315aad6c
--- /dev/null
+++ b/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
@@ -0,0 +1,30 @@
+diff --git a/src/meson.build b/src/meson.build
+index 710202d6db..b4f9b3c883 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -115,7 +115,7 @@ endif
+
+ libcinnamon = library(
+ 'cinnamon',
+- [cinnamon_sources, non_gir, tray_sources],
++ [cinnamon_sources, non_gir, tray_sources, st_enum_types[1]],
+ c_args: '-DG_LOG_DOMAIN="notification_area"',
+ include_directories: [include_root, include_directories('st', 'tray')],
+ install_rpath: join_paths(prefix, pkglibdir),
+diff --git a/src/st/meson.build b/src/st/meson.build
+index 2867cd09d8..026a359c07 100644
+--- a/src/st/meson.build
++++ b/src/st/meson.build
+@@ -134,10 +134,11 @@ st_gir_sources = [
+ st_headers,
+ ]
+
+-st_gir_sources += gnome.mkenums_simple(
++st_enum_types = gnome.mkenums_simple(
+ 'st-enum-types',
+ sources: st_headers,
+ )
++st_gir_sources += st_enum_types
+
+ st_sources = [
+ st_gir_sources,
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index c495532ae6b..97e2378e227 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,13 +1,11 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.6.7
+version=4.8.0
revision=1
build_helper=gir
-build_style=gnu-configure
-configure_args="--disable-static --disable-schemas-compile
- --enable-compile-warnings=no --disable-gtk-doc"
-hostmakedepends="automake libtool pkg-config gobject-introspection gettext
- gettext-devel glib-devel intltool xmlto autoconf-archive gtk-doc"
+build_style=meson
+hostmakedepends="libtool pkg-config gobject-introspection gettext
+ gettext-devel glib-devel intltool xmlto gtk-doc"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel
@@ -27,7 +25,9 @@ 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=fcc6182a074b15d599dd53014086bb77b0bdceb3e667627e9125331f5ad0195e
+checksum=78b3e9716bbe78a85f723b17c15d6e405c8b7b80b06ebae052b03cb66bafdd71
+patch_args=" -Np1" # upstream fix (originally from archlinux):
+# https://github.com/linuxmint/cinnamon/pull/9725
python_version=3
pycompile_dirs="
@@ -45,7 +45,7 @@ pycompile_dirs="
pre_configure() {
# Add polkit agent to required components
vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \
- -i files/cinnamon2d.session.in files/cinnamon.session.in
+ -i cinnamon2d.session.in cinnamon.session.in
# Check for the cc-panel path, not for the unneeded binary
vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
@@ -56,6 +56,4 @@ pre_configure() {
# Remove broken symlink
rm -f files/etc/xdg/menus/cinnamon-applications-merged
-
- NOCONFIGURE=1 ./autogen.sh
}
From 4090f8a0c48f1bb9cd3951134e522a2ca3f41536 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:38:54 +0200
Subject: [PATCH 09/13] cjs: update to 4.8.0.
---
srcpkgs/cjs/template | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 309dab47438..e4de9436247 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,27 +1,29 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.6.0
+version=4.8.0
revision=1
-build_style=gnu-configure
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-profiler"
-hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel dbus mozjs52-devel"
+configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
+ -Dprofiler=disabled -Dinstalled_tests=false" # Disable tests because they need dbus, X and GTK, same as gjs.
+hostmakedepends="libtool gnome-common pkg-config
+ gobject-introspection glib-devel dbus mozjs78-devel"
makedepends="dbus-glib-devel readline-devel gobject-introspection
- gtk+3-devel mozjs52 mozjs52-devel"
+ gtk+3-devel mozjs78 mozjs78-devel"
short_desc="Javascript for Cinnamon"
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=47f8abb867881594766fec1398d1b9117012826c5e72ecafb3153a0c8226bf81
+checksum=6f07defa6b21efcc4332ba46f286ed303a05af8805d47a9ff4bfa40cdf45b40b
-
-pre_configure() {
- cp ${FILESDIR}/ax_code_coverage.m4 m4/
-
- NOCONFIGURE=1 ./autogen.sh
-}
+if [ "$CROSS_BUILD" ]; then
+ # The deleted lines in meson.build try to build and run a simple program,
+ # and that does not work when cross-compiling.
+ pre_configure() {
+ sed -i '235,254d' meson.build
+ }
+fi
cjs-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From d6a0f48bf2abbe262f35a732ffd27c5590c08639 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:39:07 +0200
Subject: [PATCH 10/13] muffin: update to 4.8.0.
---
srcpkgs/muffin/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 2a014dd6d82..b8660280740 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.6.3
+version=4.8.0
revision=1
build_style=gnu-configure
build_helper=gir
@@ -16,7 +16,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=e634209f1a1dfec7efc7c741e65014903ea937926070dba3793cac595df3d5a3
+checksum=a4f1cb9ed80b7ea1e51d30b97ea3ae2f196b06fc9fd56c0283e64c9ee1322c18
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
@@ -24,6 +24,10 @@ pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+pre_build() {
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+}
+
post_install() {
vmkdir usr/share/gir-1.0
mv ${DESTDIR}/usr/lib/muffin/*.gir ${DESTDIR}/usr/share/gir-1.0
@@ -35,7 +39,6 @@ muffin-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/lib/*.so"
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gir-1.0
From 11bd079dd6b3b3d8bc8e768367488d85f8c9b489 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:39:18 +0200
Subject: [PATCH 11/13] nemo-fileroller: update to 4.8.0.
---
srcpkgs/nemo-fileroller/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index e33cba72c74..62f53f6365d 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,7 +1,7 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.6.0
-revision=2
+version=4.8.0
+revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
build_style=gnu-configure
@@ -13,7 +13,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=f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd
+checksum=1b7b85b41c659fe0f93a9b83fadb81a7934c7e7cb2df9eda4a03413b7f5d05c4
pre_configure() {
autoreconf -fi
From 3c0b2b75c0997decc53e386c11cbfbee5ad64bb1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:39:30 +0200
Subject: [PATCH 12/13] nemo: update to 4.8.0, changes by @ndowens.
---
srcpkgs/nemo/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b01069a1631..90ef01f919c 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,12 +1,11 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.6.5
+version=4.8.0
revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
-hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
- gobject-introspection"
+hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
libexif-devel libnotify-devel tracker-devel xapps-devel"
depends="cinnamon-translations dconf gvfs"
@@ -15,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=35f18063c4e9e0f94997454482553f48296eb97afe13bcbd56e99a87ea8eb78e
+checksum=47fec60b3221f2243df1036bb297fbd602947ee3873d05c768e805246a634f52
python_version=3
@@ -27,7 +26,7 @@ do_check() {
pre_configure() {
# Rename 'Files' app name to avoid having the same as nautilus
- sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
+ vsed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
}
post_install() {
From aea90d033d3bc63f3ce720a3ed984e7aef154863 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:40:09 +0200
Subject: [PATCH 13/13] xapps: update to 2.0.0, changes by @ndowens.
---
srcpkgs/xapps/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 1589440927e..8faf7bd5c0c 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,26 +1,26 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.8.10
+version=2.0.0
revision=1
wrksrc="xapp-${version}"
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gnome-common pkg-config vala python3 gettext"
-makedepends="gettext-devel gobject-introspection libgnomekbd-devel
- python3-gobject-devel libdbusmenu-gtk3-devel"
+makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel
+ libdbusmenu-gtk3-devel"
depends="gist inxi xfconf"
short_desc="Cross-desktop libraries and common resources from Linux Mint"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
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"
+changelog="https://raw.githubusercontent.com/linuxmint/xapp/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=a0d542de6dc4d6a318bdf1fad88447db270ab2dd0582f0c6f28008cc77337672
+checksum=cc33dea39cc1092e77280ba290b94adf991125d922b285dc20c5a62cc41dac29
xapps-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision} libgnomekbd-devel libglib-devel
- gdk-pixbuf-devel"
+ gdk-pixbuf-devel"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
2020-12-05 14:41 ` [PR PATCH] [Updated] " mobinmob
@ 2020-12-05 20:05 ` ericonr
2020-12-05 20:06 ` ericonr
` (33 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2020-12-05 20:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536883702
Comment:
I think it's best to use a patch here, since any changes to the file can change the line positions.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
2020-12-05 14:41 ` [PR PATCH] [Updated] " mobinmob
2020-12-05 20:05 ` [PR REVIEW] " ericonr
@ 2020-12-05 20:06 ` ericonr
2020-12-05 20:06 ` ericonr
` (32 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2020-12-05 20:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536883373
Comment:
This information should go in the patch.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (2 preceding siblings ...)
2020-12-05 20:06 ` ericonr
@ 2020-12-05 20:06 ` ericonr
2020-12-05 20:06 ` ericonr
` (31 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2020-12-05 20:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536883765
Comment:
`vsed`
Why is it necessary?
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (3 preceding siblings ...)
2020-12-05 20:06 ` ericonr
@ 2020-12-05 20:06 ` ericonr
2020-12-05 23:38 ` mobinmob
` (30 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2020-12-05 20:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536883495
Comment:
```suggestion
# Disable tests because they need dbus, X and GTK, same as gjs.
configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
-Dprofiler=disabled -Dinstalled_tests=false"
```
That said, for tests that depend on dbus you should use `checkdepends="dbus"` and run them with `dbus-run-session ninja check`. For X, you can add `xvfb-run` into the mix.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (4 preceding siblings ...)
2020-12-05 20:06 ` ericonr
@ 2020-12-05 23:38 ` mobinmob
2020-12-05 23:38 ` mobinmob
` (29 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-05 23:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536914537
Comment:
Yes, it should be possible, but I am not going to do that.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (5 preceding siblings ...)
2020-12-05 23:38 ` mobinmob
@ 2020-12-05 23:38 ` mobinmob
2020-12-05 23:40 ` mobinmob
` (28 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-05 23:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536914616
Comment:
Ok, I will add it as a comment, thank you.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (6 preceding siblings ...)
2020-12-05 23:38 ` mobinmob
@ 2020-12-05 23:40 ` mobinmob
2020-12-05 23:42 ` mobinmob
` (27 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-05 23:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536914835
Comment:
It is not. It is an optimisation, originated in gnome and used in the archlinux PKGBUILD. Ι can remove it.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (7 preceding siblings ...)
2020-12-05 23:40 ` mobinmob
@ 2020-12-05 23:42 ` mobinmob
2020-12-05 23:44 ` mobinmob
` (26 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-05 23:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536915138
Comment:
I am not making a patch just to remove lines, sorry.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (8 preceding siblings ...)
2020-12-05 23:42 ` mobinmob
@ 2020-12-05 23:44 ` mobinmob
2020-12-05 23:51 ` sgn
` (25 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-05 23:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536915138
Comment:
I am not making a patch just to remove a range of lines, sorry.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (9 preceding siblings ...)
2020-12-05 23:44 ` mobinmob
@ 2020-12-05 23:51 ` sgn
2020-12-05 23:53 ` ericonr
` (24 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: sgn @ 2020-12-05 23:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536916339
Comment:
Either
```sed
/Check if a minimal SpiderMonkey program compiles/,/^endif/d
```
or `build_helper=qemu`
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (10 preceding siblings ...)
2020-12-05 23:51 ` sgn
@ 2020-12-05 23:53 ` ericonr
2020-12-05 23:54 ` [PR PATCH] [Updated] " mobinmob
` (23 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2020-12-05 23:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536916567
Comment:
I think it's ok to leave it, just leave a comment on top.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR PATCH] [Updated] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (11 preceding siblings ...)
2020-12-05 23:53 ` ericonr
@ 2020-12-05 23:54 ` mobinmob
2020-12-05 23:55 ` [PR REVIEW] " mobinmob
` (22 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-05 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.8
https://github.com/void-linux/void-packages/pull/26965
Cinnamon: update to 4.8.
Includes changes from https://github.com/void-linux/void-packages/pull/26778 by @ndowens .
A patch file from https://github.com/void-linux/void-packages/pull/26965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.8-26965.patch --]
[-- Type: text/x-diff, Size: 22775 bytes --]
From e2a068293a10cfcb1cb8273a83f7bc08b39c87b6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:23:04 +0200
Subject: [PATCH 01/13] cinnamon-control-center: update to 4.8.0.
---
.../patches/disable-timezone-tests.patch | 13 -----------
srcpkgs/cinnamon-control-center/template | 22 +++++--------------
2 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
diff --git a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch b/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
deleted file mode 100644
index 964fb8c1612..00000000000
--- a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- panels/datetime/Makefile.am.orig 2015-05-30 08:26:46.499494572 +0200
-+++ panels/datetime/Makefile.am 2015-05-30 08:26:56.890603931 +0200
-@@ -132,8 +132,8 @@ test_endianess_CFLAGS = $(DATETIME_PANEL
- all-local: check-local
-
- check-local: test-timezone-gfx test-endianess test-timezone
-- $(builddir)/test-timezone-gfx $(srcdir)/data
-- $(builddir)/test-endianess
-+# $(builddir)/test-timezone-gfx $(srcdir)/data
-+# $(builddir)/test-endianess
- # $(builddir)/test-timezone
-
- ccpanelsdir = $(PANELS_DIR)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 9da17ca74f3..71cab345d06 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,11 +1,10 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.6.2
-revision=3
-build_style=gnu-configure
+version=4.8.0
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-update-mimedb --disable-systemd"
-hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
+hostmakedepends="gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config libxslt"
makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
@@ -19,23 +18,12 @@ 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=f887d7e185f8ff1ee6f9789219231cba8be820c706b316d35ee5118d2fd898eb
+checksum=c419b7ce59c24492543ba95bd7dbb5fcc4b5338d2596b14820d80ec26d98fdd3
do_check() {
:
}
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
- # Remove unused stuff
- make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
- rm -R "$DESTDIR/usr/share/applications"
- rm -R "$DESTDIR/etc"
-}
-
libcinnamon-control-center_package() {
short_desc+=" - runtime library"
pkg_install() {
From 8c8a92a88b6178b8d200217107491f7a2acb13b1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:23:48 +0200
Subject: [PATCH 02/13] cinnamon-desktop: update to 4.8.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 77dfab737b6..36c523d4c7b 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.6.4
-revision=2
+version=4.8.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://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-desktop"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=8b0f69c4acbeabca723a95ec80905601eec8d563c96ad88a9de3ddac56925ef6
+checksum=99db3b15f3d267f1e88320030020506c34953e2b9d9ec621ed59c0eb12f64d9b
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From 4e03e9805012a80b882a715cd3dabb18dbbdac6a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:24:14 +0200
Subject: [PATCH 03/13] cinnamon-menus: update to 4.8.1.
---
srcpkgs/cinnamon-menus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 7b2451c7ee9..61c16a97ec8 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.6.1
-revision=2
+version=4.8.1
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-menus"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=534cf3e15fed812e1affb544811e10823edbc56360b52a80ffbabc006c467dc6
+checksum=a6070591b1e9eaed8b9a332e7e2ecb9fcd90de5565f7e4dc97cd7aeb89a6cc19
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From f9374d663cdd7889c8c8a4ac7bf3121d29c14911 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:24:40 +0200
Subject: [PATCH 04/13] cinnamon-screensaver: update to 4.8.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 76df8da77bf..2991c39b31d 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.6.0
-revision=2
+version=4.8.0
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-screensaver"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e93349521a24f2b49c8a293ee15798ba341ae8e9b000cf3da5311a162ce8cb60
+checksum=d8d977e8a013fd5cf4dddb308c5fdffb7e1340e9c1496c6fc012de4ca420f202
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 80aef94ca168c897275dc6fd0a2c709f75fed3a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:25:03 +0200
Subject: [PATCH 05/13] cinnamon-session: update to 4.8.0.
---
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 bd9d618653c..c27272b802a 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.6.2
-revision=2
+version=4.8.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dgconf=false"
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-session"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0d4793d8fb828ce8ec6dbedc67a5d244e56d4182b83030d10029eadc0c6723e6
+checksum=66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4
From a3020e14b415af6562cfffadc1887d7d3e93c912 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:25:39 +0200
Subject: [PATCH 06/13] cinnamon-settings-daemon: update to 4.8.2.
---
srcpkgs/cinnamon-settings-daemon/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 70f76130dd2..a71edcbd606 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,10 +1,9 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.6.4
-revision=2
-build_style=gnu-configure
+version=4.8.2
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config"
makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
@@ -16,11 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
-
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
+checksum=e8d6aaf2c5be5b1e12f12b5ca069e682c65f2057ae9133c7dfe271aebebca259
do_check() {
:
From 7f285d20f74db9f4d4237e9e463a97013aef8ccd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Dec 2020 16:26:07 +0200
Subject: [PATCH 07/13] cinnamon-translations: update to 4.8.0.
---
srcpkgs/cinnamon-translations/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 7c31bd54a00..16f61a09a1a 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.6.2
-revision=2
+version=4.8.0
+revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
short_desc="Translations for Cinnamon and Nemo"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://translations.launchpad.net/linuxmint/latest/"
distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=f79b818c3339dec395a8739ebfdb9079e236eeb9608768d76fecfe77dc231cb4
+checksum=6e2667b83cb7c76a2315f7bacee2a7363a5758213d9016d360fdb3b671852efb
do_install() {
vmkdir usr
From 90b3167956436d44eda2425467f9fe2f1ccd4a72 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 6 Dec 2020 01:51:03 +0200
Subject: [PATCH 08/13] cinnamon: update to 4.8.0.
---
...3592fdb9e3d02210880776e9109f74a84a4cd.diff | 33 +++++++++++++++++++
srcpkgs/cinnamon/template | 17 ++++------
2 files changed, 40 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
diff --git a/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff b/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
new file mode 100644
index 00000000000..ccabd972e56
--- /dev/null
+++ b/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
@@ -0,0 +1,33 @@
+# upstream fix (originally from archlinux):
+# https://github.com/linuxmint/cinnamon/pull/9725
+
+diff --git a/src/meson.build b/src/meson.build
+index 710202d6db..b4f9b3c883 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -115,7 +115,7 @@ endif
+
+ libcinnamon = library(
+ 'cinnamon',
+- [cinnamon_sources, non_gir, tray_sources],
++ [cinnamon_sources, non_gir, tray_sources, st_enum_types[1]],
+ c_args: '-DG_LOG_DOMAIN="notification_area"',
+ include_directories: [include_root, include_directories('st', 'tray')],
+ install_rpath: join_paths(prefix, pkglibdir),
+diff --git a/src/st/meson.build b/src/st/meson.build
+index 2867cd09d8..026a359c07 100644
+--- a/src/st/meson.build
++++ b/src/st/meson.build
+@@ -134,10 +134,11 @@ st_gir_sources = [
+ st_headers,
+ ]
+
+-st_gir_sources += gnome.mkenums_simple(
++st_enum_types = gnome.mkenums_simple(
+ 'st-enum-types',
+ sources: st_headers,
+ )
++st_gir_sources += st_enum_types
+
+ st_sources = [
+ st_gir_sources,
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index c495532ae6b..5edc44e4dc7 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,13 +1,11 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.6.7
+version=4.8.0
revision=1
build_helper=gir
-build_style=gnu-configure
-configure_args="--disable-static --disable-schemas-compile
- --enable-compile-warnings=no --disable-gtk-doc"
-hostmakedepends="automake libtool pkg-config gobject-introspection gettext
- gettext-devel glib-devel intltool xmlto autoconf-archive gtk-doc"
+build_style=meson
+hostmakedepends="libtool pkg-config gobject-introspection gettext
+ gettext-devel glib-devel intltool xmlto gtk-doc"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel
@@ -27,7 +25,8 @@ 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=fcc6182a074b15d599dd53014086bb77b0bdceb3e667627e9125331f5ad0195e
+checksum=78b3e9716bbe78a85f723b17c15d6e405c8b7b80b06ebae052b03cb66bafdd71
+patch_args=" -Np1"
python_version=3
pycompile_dirs="
@@ -45,7 +44,7 @@ pycompile_dirs="
pre_configure() {
# Add polkit agent to required components
vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \
- -i files/cinnamon2d.session.in files/cinnamon.session.in
+ -i cinnamon2d.session.in cinnamon.session.in
# Check for the cc-panel path, not for the unneeded binary
vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
@@ -56,6 +55,4 @@ pre_configure() {
# Remove broken symlink
rm -f files/etc/xdg/menus/cinnamon-applications-merged
-
- NOCONFIGURE=1 ./autogen.sh
}
From 18d405c605eb052fa4f47b616e8b2bb7f40485f3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 6 Dec 2020 01:51:12 +0200
Subject: [PATCH 09/13] cjs: update to 4.8.0.
---
srcpkgs/cjs/template | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 309dab47438..e4de9436247 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,27 +1,29 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.6.0
+version=4.8.0
revision=1
-build_style=gnu-configure
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-profiler"
-hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel dbus mozjs52-devel"
+configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
+ -Dprofiler=disabled -Dinstalled_tests=false" # Disable tests because they need dbus, X and GTK, same as gjs.
+hostmakedepends="libtool gnome-common pkg-config
+ gobject-introspection glib-devel dbus mozjs78-devel"
makedepends="dbus-glib-devel readline-devel gobject-introspection
- gtk+3-devel mozjs52 mozjs52-devel"
+ gtk+3-devel mozjs78 mozjs78-devel"
short_desc="Javascript for Cinnamon"
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=47f8abb867881594766fec1398d1b9117012826c5e72ecafb3153a0c8226bf81
+checksum=6f07defa6b21efcc4332ba46f286ed303a05af8805d47a9ff4bfa40cdf45b40b
-
-pre_configure() {
- cp ${FILESDIR}/ax_code_coverage.m4 m4/
-
- NOCONFIGURE=1 ./autogen.sh
-}
+if [ "$CROSS_BUILD" ]; then
+ # The deleted lines in meson.build try to build and run a simple program,
+ # and that does not work when cross-compiling.
+ pre_configure() {
+ sed -i '235,254d' meson.build
+ }
+fi
cjs-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 568b087ef2155eef1a6758b5ff0ce6e81db0245a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 6 Dec 2020 01:51:19 +0200
Subject: [PATCH 10/13] muffin: update to 4.8.0.
---
srcpkgs/muffin/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 2a014dd6d82..30888d636a5 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.6.3
+version=4.8.0
revision=1
build_style=gnu-configure
build_helper=gir
@@ -16,7 +16,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=e634209f1a1dfec7efc7c741e65014903ea937926070dba3793cac595df3d5a3
+checksum=a4f1cb9ed80b7ea1e51d30b97ea3ae2f196b06fc9fd56c0283e64c9ee1322c18
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
@@ -35,7 +35,6 @@ muffin-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/lib/*.so"
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gir-1.0
From a4ec3a30d37e51a4a503d31a5e9ab45db5a4e018 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 6 Dec 2020 01:51:31 +0200
Subject: [PATCH 11/13] nemo-fileroller: update to 4.8.0.
---
srcpkgs/nemo-fileroller/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index e33cba72c74..62f53f6365d 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,7 +1,7 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.6.0
-revision=2
+version=4.8.0
+revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
build_style=gnu-configure
@@ -13,7 +13,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=f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd
+checksum=1b7b85b41c659fe0f93a9b83fadb81a7934c7e7cb2df9eda4a03413b7f5d05c4
pre_configure() {
autoreconf -fi
From 5c68ea56358ec9344eeb1456afac64e83106d1e7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 6 Dec 2020 01:51:35 +0200
Subject: [PATCH 12/13] nemo: update to 4.8.0, changes by @ndowens.
---
srcpkgs/nemo/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b01069a1631..90ef01f919c 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,12 +1,11 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.6.5
+version=4.8.0
revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
-hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
- gobject-introspection"
+hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
libexif-devel libnotify-devel tracker-devel xapps-devel"
depends="cinnamon-translations dconf gvfs"
@@ -15,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=35f18063c4e9e0f94997454482553f48296eb97afe13bcbd56e99a87ea8eb78e
+checksum=47fec60b3221f2243df1036bb297fbd602947ee3873d05c768e805246a634f52
python_version=3
@@ -27,7 +26,7 @@ do_check() {
pre_configure() {
# Rename 'Files' app name to avoid having the same as nautilus
- sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
+ vsed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
}
post_install() {
From 77f31019905dd6f1698885a856591cff89e6bc6e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 6 Dec 2020 01:51:40 +0200
Subject: [PATCH 13/13] xapps: update to 2.0.0, changes by @ndowens.
---
srcpkgs/xapps/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 1589440927e..8faf7bd5c0c 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,26 +1,26 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.8.10
+version=2.0.0
revision=1
wrksrc="xapp-${version}"
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gnome-common pkg-config vala python3 gettext"
-makedepends="gettext-devel gobject-introspection libgnomekbd-devel
- python3-gobject-devel libdbusmenu-gtk3-devel"
+makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel
+ libdbusmenu-gtk3-devel"
depends="gist inxi xfconf"
short_desc="Cross-desktop libraries and common resources from Linux Mint"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
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"
+changelog="https://raw.githubusercontent.com/linuxmint/xapp/${version}/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=a0d542de6dc4d6a318bdf1fad88447db270ab2dd0582f0c6f28008cc77337672
+checksum=cc33dea39cc1092e77280ba290b94adf991125d922b285dc20c5a62cc41dac29
xapps-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision} libgnomekbd-devel libglib-devel
- gdk-pixbuf-devel"
+ gdk-pixbuf-devel"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (12 preceding siblings ...)
2020-12-05 23:54 ` [PR PATCH] [Updated] " mobinmob
@ 2020-12-05 23:55 ` mobinmob
2020-12-05 23:55 ` mobinmob
` (21 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-05 23:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536916812
Comment:
Done, thank you!
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (13 preceding siblings ...)
2020-12-05 23:55 ` [PR REVIEW] " mobinmob
@ 2020-12-05 23:55 ` mobinmob
2020-12-06 0:04 ` mobinmob
` (20 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-05 23:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536916873
Comment:
I removed it. Thanks for the review.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (14 preceding siblings ...)
2020-12-05 23:55 ` mobinmob
@ 2020-12-06 0:04 ` mobinmob
2020-12-06 0:08 ` sgn
` (19 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-06 0:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536918029
Comment:
I do not think the test makes much sense in this case, so I do not think using a build helper is the right thing to do.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (15 preceding siblings ...)
2020-12-06 0:04 ` mobinmob
@ 2020-12-06 0:08 ` sgn
2020-12-06 0:09 ` sgn
` (18 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: sgn @ 2020-12-06 0:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536918511
Comment:
I don't care if you decide to use helper or not, but sed to delete with 2 numbers is NOT cool.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (16 preceding siblings ...)
2020-12-06 0:08 ` sgn
@ 2020-12-06 0:09 ` sgn
2020-12-09 18:27 ` ericonr
` (17 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: sgn @ 2020-12-06 0:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r536918511
Comment:
I don't care if you decide to use helper or not, but sed to delete with 2 numbers is NOT cool.
EDIT: And I wrote down how to delete it without 2 magic numbers.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (17 preceding siblings ...)
2020-12-06 0:09 ` sgn
@ 2020-12-09 18:27 ` ericonr
2020-12-09 18:27 ` ericonr
` (16 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2020-12-09 18:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r539544320
Comment:
```suggestion
vsed -e '/Check if a minimal SpiderMonkey program compiles/,/^endif/d' -i meson.build
```
And I don't think this needs to be avoided only for cross if you want to remove the conditional.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (18 preceding siblings ...)
2020-12-09 18:27 ` ericonr
@ 2020-12-09 18:27 ` ericonr
2020-12-18 22:11 ` mobinmob
` (15 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2020-12-09 18:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r539542955
Comment:
```suggestion
# XXX: disable tests because they need dbus, X and GTK, same as gjs
configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
-Dprofiler=disabled -Dinstalled_tests=false"
```
So someone else who touches the template knows this is something to be improved.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (19 preceding siblings ...)
2020-12-09 18:27 ` ericonr
@ 2020-12-18 22:11 ` mobinmob
2020-12-21 19:06 ` [PR PATCH] [Updated] " mobinmob
` (14 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-18 22:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#issuecomment-748344327
Comment:
@ericonr I will update the components to the latest version in the following days and test all changes. Cinnamon 4.8.x runs really nice here :)
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR PATCH] [Updated] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (20 preceding siblings ...)
2020-12-18 22:11 ` mobinmob
@ 2020-12-21 19:06 ` mobinmob
2020-12-21 19:07 ` [PR REVIEW] " mobinmob
` (13 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-21 19:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.8
https://github.com/void-linux/void-packages/pull/26965
Cinnamon: update to 4.8.
Includes changes from https://github.com/void-linux/void-packages/pull/26778 by @ndowens .
A patch file from https://github.com/void-linux/void-packages/pull/26965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.8-26965.patch --]
[-- Type: text/x-diff, Size: 21001 bytes --]
From 1c4d2c65d6549fac51d49e9f329328a5c11bfefa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:00 +0200
Subject: [PATCH 01/12] cinnamon-control-center: update to 4.8.1.
---
.../patches/disable-timezone-tests.patch | 13 -----------
srcpkgs/cinnamon-control-center/template | 22 +++++--------------
2 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
diff --git a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch b/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
deleted file mode 100644
index 964fb8c1612..00000000000
--- a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- panels/datetime/Makefile.am.orig 2015-05-30 08:26:46.499494572 +0200
-+++ panels/datetime/Makefile.am 2015-05-30 08:26:56.890603931 +0200
-@@ -132,8 +132,8 @@ test_endianess_CFLAGS = $(DATETIME_PANEL
- all-local: check-local
-
- check-local: test-timezone-gfx test-endianess test-timezone
-- $(builddir)/test-timezone-gfx $(srcdir)/data
-- $(builddir)/test-endianess
-+# $(builddir)/test-timezone-gfx $(srcdir)/data
-+# $(builddir)/test-endianess
- # $(builddir)/test-timezone
-
- ccpanelsdir = $(PANELS_DIR)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 9da17ca74f3..cbb78d5bf8d 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,11 +1,10 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.6.2
-revision=3
-build_style=gnu-configure
+version=4.8.1
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-update-mimedb --disable-systemd"
-hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
+hostmakedepends="gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config libxslt"
makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
@@ -19,23 +18,12 @@ 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=f887d7e185f8ff1ee6f9789219231cba8be820c706b316d35ee5118d2fd898eb
+checksum=ef908035b2d09ecf67dc18770e242035c6ff1e7f7ea1fa3e8b4843fa12d3ebd1
do_check() {
:
}
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
- # Remove unused stuff
- make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
- rm -R "$DESTDIR/usr/share/applications"
- rm -R "$DESTDIR/etc"
-}
-
libcinnamon-control-center_package() {
short_desc+=" - runtime library"
pkg_install() {
From 6b58a4df7aa1c103a3885b45ceefa17bc3af2048 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:13 +0200
Subject: [PATCH 02/12] cinnamon-desktop: update to 4.8.1.
---
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 77dfab737b6..985e05ed492 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.6.4
-revision=2
+version=4.8.1
+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://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-desktop"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=8b0f69c4acbeabca723a95ec80905601eec8d563c96ad88a9de3ddac56925ef6
+checksum=cb9aeff385764ba33cf4f7ee2bb5cb7308960670e8fa9f3be38a1d431b20436d
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From 91dc8f33119b2cb5794ac0077eb124f70cc51c4e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:21 +0200
Subject: [PATCH 03/12] cinnamon-menus: update to 4.8.2.
---
srcpkgs/cinnamon-menus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 7b2451c7ee9..f1126567511 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.6.1
-revision=2
+version=4.8.2
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-menus"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=534cf3e15fed812e1affb544811e10823edbc56360b52a80ffbabc006c467dc6
+checksum=6c19ebcea0d35a7a65cd70f1cdca2c5c739467ac6d2c2a1c38a5d580296707bd
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From f0dc95818ff86236e7fc6902819c49320da0dd57 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:28 +0200
Subject: [PATCH 04/12] cinnamon-screensaver: update to 4.8.1.
---
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 76df8da77bf..c140fee3777 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.6.0
-revision=2
+version=4.8.1
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-screensaver"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e93349521a24f2b49c8a293ee15798ba341ae8e9b000cf3da5311a162ce8cb60
+checksum=e06a9f28cba55c38d1464d02917eb374de941fd09007608c239a348e7653b675
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From d6a323e7afbe7d97c5aec569ac7c8983495b642d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:36 +0200
Subject: [PATCH 05/12] cinnamon-session: update to 4.8.0.
---
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 bd9d618653c..c27272b802a 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.6.2
-revision=2
+version=4.8.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dgconf=false"
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-session"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0d4793d8fb828ce8ec6dbedc67a5d244e56d4182b83030d10029eadc0c6723e6
+checksum=66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4
From 592fe85971e846da1b318761bc403fb0e49ee638 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:42 +0200
Subject: [PATCH 06/12] cinnamon-settings-daemon: update to 4.8.2.
---
srcpkgs/cinnamon-settings-daemon/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 70f76130dd2..a71edcbd606 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,10 +1,9 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.6.4
-revision=2
-build_style=gnu-configure
+version=4.8.2
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config"
makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
@@ -16,11 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
-
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
+checksum=e8d6aaf2c5be5b1e12f12b5ca069e682c65f2057ae9133c7dfe271aebebca259
do_check() {
:
From 0aaf9e1eff2c34ff18933d42ba59c00a4d03ee73 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:50 +0200
Subject: [PATCH 07/12] cinnamon-translations: update to 4.8.2.
---
srcpkgs/cinnamon-translations/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 7c31bd54a00..ac2d839fe45 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.6.2
-revision=2
+version=4.8.2
+revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
short_desc="Translations for Cinnamon and Nemo"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://translations.launchpad.net/linuxmint/latest/"
distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=f79b818c3339dec395a8739ebfdb9079e236eeb9608768d76fecfe77dc231cb4
+checksum=483bc894dbebb01a4cde1609f77a673068244393370febd66540a0fe65545c2e
do_install() {
vmkdir usr
From b2e8fdddb04861efe60f9ff0e8951ccaa7dad95b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:02:00 +0200
Subject: [PATCH 08/12] cinnamon: update to 4.8.3.
---
...3592fdb9e3d02210880776e9109f74a84a4cd.diff | 33 +++++++++++++++++++
srcpkgs/cinnamon/template | 17 ++++------
2 files changed, 40 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
diff --git a/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff b/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
new file mode 100644
index 00000000000..ccabd972e56
--- /dev/null
+++ b/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
@@ -0,0 +1,33 @@
+# upstream fix (originally from archlinux):
+# https://github.com/linuxmint/cinnamon/pull/9725
+
+diff --git a/src/meson.build b/src/meson.build
+index 710202d6db..b4f9b3c883 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -115,7 +115,7 @@ endif
+
+ libcinnamon = library(
+ 'cinnamon',
+- [cinnamon_sources, non_gir, tray_sources],
++ [cinnamon_sources, non_gir, tray_sources, st_enum_types[1]],
+ c_args: '-DG_LOG_DOMAIN="notification_area"',
+ include_directories: [include_root, include_directories('st', 'tray')],
+ install_rpath: join_paths(prefix, pkglibdir),
+diff --git a/src/st/meson.build b/src/st/meson.build
+index 2867cd09d8..026a359c07 100644
+--- a/src/st/meson.build
++++ b/src/st/meson.build
+@@ -134,10 +134,11 @@ st_gir_sources = [
+ st_headers,
+ ]
+
+-st_gir_sources += gnome.mkenums_simple(
++st_enum_types = gnome.mkenums_simple(
+ 'st-enum-types',
+ sources: st_headers,
+ )
++st_gir_sources += st_enum_types
+
+ st_sources = [
+ st_gir_sources,
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index c495532ae6b..414ef93adbe 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,13 +1,11 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.6.7
+version=4.8.3
revision=1
build_helper=gir
-build_style=gnu-configure
-configure_args="--disable-static --disable-schemas-compile
- --enable-compile-warnings=no --disable-gtk-doc"
-hostmakedepends="automake libtool pkg-config gobject-introspection gettext
- gettext-devel glib-devel intltool xmlto autoconf-archive gtk-doc"
+build_style=meson
+hostmakedepends="libtool pkg-config gobject-introspection gettext
+ gettext-devel glib-devel intltool xmlto gtk-doc"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel
@@ -27,7 +25,8 @@ 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=fcc6182a074b15d599dd53014086bb77b0bdceb3e667627e9125331f5ad0195e
+checksum=1b563f2ce12404cf744d8c3c2c161281246aa442188eb5307c4c96393ba0917e
+patch_args=" -Np1"
python_version=3
pycompile_dirs="
@@ -45,7 +44,7 @@ pycompile_dirs="
pre_configure() {
# Add polkit agent to required components
vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \
- -i files/cinnamon2d.session.in files/cinnamon.session.in
+ -i cinnamon2d.session.in cinnamon.session.in
# Check for the cc-panel path, not for the unneeded binary
vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
@@ -56,6 +55,4 @@ pre_configure() {
# Remove broken symlink
rm -f files/etc/xdg/menus/cinnamon-applications-merged
-
- NOCONFIGURE=1 ./autogen.sh
}
From 67767019e046ec4ce1f20809483ed51a2c389077 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:02:05 +0200
Subject: [PATCH 09/12] cjs: update to 4.8.1.
---
srcpkgs/cjs/template | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 309dab47438..90c2c71dc47 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,28 +1,30 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.6.0
+version=4.8.1
revision=1
-build_style=gnu-configure
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-profiler"
-hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel dbus mozjs52-devel"
+# XXX: disable tests because they need dbus, X and GTK, same as gjs
+configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
+ -Dprofiler=disabled -Dinstalled_tests=false"
+hostmakedepends="libtool gnome-common pkg-config
+ gobject-introspection glib-devel dbus mozjs78-devel"
makedepends="dbus-glib-devel readline-devel gobject-introspection
- gtk+3-devel mozjs52 mozjs52-devel"
+ gtk+3-devel mozjs78 mozjs78-devel"
short_desc="Javascript for Cinnamon"
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=47f8abb867881594766fec1398d1b9117012826c5e72ecafb3153a0c8226bf81
-
+checksum=20a117f77917896088273f3ee670d43bee1c115a351c2f688840494b15a8613d
+# The deleted lines in meson.build try to build and run a simple program,
+# and that does not work when cross-compiling.
pre_configure() {
- cp ${FILESDIR}/ax_code_coverage.m4 m4/
-
- NOCONFIGURE=1 ./autogen.sh
+ vsed -e '/Check if a minimal SpiderMonkey program compiles/,/^endif/d' -i meson.build
}
+
cjs-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From a42fcd16c81d54a5424d7d6127d564f7b9782921 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:02:16 +0200
Subject: [PATCH 10/12] muffin: update to 4.8.0.
---
srcpkgs/muffin/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 2a014dd6d82..30888d636a5 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.6.3
+version=4.8.0
revision=1
build_style=gnu-configure
build_helper=gir
@@ -16,7 +16,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=e634209f1a1dfec7efc7c741e65014903ea937926070dba3793cac595df3d5a3
+checksum=a4f1cb9ed80b7ea1e51d30b97ea3ae2f196b06fc9fd56c0283e64c9ee1322c18
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
@@ -35,7 +35,6 @@ muffin-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/lib/*.so"
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gir-1.0
From 33e022330e7914488f76bf089860656257a4b878 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:02:29 +0200
Subject: [PATCH 11/12] nemo: update to 4.8.2, include changes by @ndowens.
---
srcpkgs/nemo/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b01069a1631..deb08370f5d 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,12 +1,11 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.6.5
+version=4.8.2
revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
-hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
- gobject-introspection"
+hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
libexif-devel libnotify-devel tracker-devel xapps-devel"
depends="cinnamon-translations dconf gvfs"
@@ -15,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=35f18063c4e9e0f94997454482553f48296eb97afe13bcbd56e99a87ea8eb78e
+checksum=e4225b7c4736abe49e106595c770f2c2ea137b15f0b09c9f9ae05c1556fb42a4
python_version=3
@@ -27,7 +26,7 @@ do_check() {
pre_configure() {
# Rename 'Files' app name to avoid having the same as nautilus
- sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
+ vsed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
}
post_install() {
From 1186150831613fbcc9bb4872a2cf00b3f8ede7f3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:05:05 +0200
Subject: [PATCH 12/12] nemo-fileroller: update to 4.8.0.
---
srcpkgs/nemo-fileroller/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index e33cba72c74..62f53f6365d 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,7 +1,7 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.6.0
-revision=2
+version=4.8.0
+revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
build_style=gnu-configure
@@ -13,7 +13,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=f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd
+checksum=1b7b85b41c659fe0f93a9b83fadb81a7934c7e7cb2df9eda4a03413b7f5d05c4
pre_configure() {
autoreconf -fi
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (21 preceding siblings ...)
2020-12-21 19:06 ` [PR PATCH] [Updated] " mobinmob
@ 2020-12-21 19:07 ` mobinmob
2020-12-21 19:08 ` mobinmob
` (12 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-21 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r546879065
Comment:
I also removed the conditional, thank you!
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR REVIEW] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (22 preceding siblings ...)
2020-12-21 19:07 ` [PR REVIEW] " mobinmob
@ 2020-12-21 19:08 ` mobinmob
2020-12-21 19:21 ` [PR PATCH] [Updated] " mobinmob
` (11 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-21 19:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New review comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#discussion_r546879218
Comment:
Done, thank you!
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR PATCH] [Updated] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (23 preceding siblings ...)
2020-12-21 19:08 ` mobinmob
@ 2020-12-21 19:21 ` mobinmob
2020-12-21 20:05 ` mobinmob
` (10 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-21 19:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.8
https://github.com/void-linux/void-packages/pull/26965
Cinnamon: update to 4.8.
Includes changes from https://github.com/void-linux/void-packages/pull/26778 by @ndowens .
A patch file from https://github.com/void-linux/void-packages/pull/26965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.8-26965.patch --]
[-- Type: text/x-diff, Size: 22767 bytes --]
From 1c4d2c65d6549fac51d49e9f329328a5c11bfefa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:00 +0200
Subject: [PATCH 01/13] cinnamon-control-center: update to 4.8.1.
---
.../patches/disable-timezone-tests.patch | 13 -----------
srcpkgs/cinnamon-control-center/template | 22 +++++--------------
2 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
diff --git a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch b/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
deleted file mode 100644
index 964fb8c1612..00000000000
--- a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- panels/datetime/Makefile.am.orig 2015-05-30 08:26:46.499494572 +0200
-+++ panels/datetime/Makefile.am 2015-05-30 08:26:56.890603931 +0200
-@@ -132,8 +132,8 @@ test_endianess_CFLAGS = $(DATETIME_PANEL
- all-local: check-local
-
- check-local: test-timezone-gfx test-endianess test-timezone
-- $(builddir)/test-timezone-gfx $(srcdir)/data
-- $(builddir)/test-endianess
-+# $(builddir)/test-timezone-gfx $(srcdir)/data
-+# $(builddir)/test-endianess
- # $(builddir)/test-timezone
-
- ccpanelsdir = $(PANELS_DIR)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 9da17ca74f3..cbb78d5bf8d 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,11 +1,10 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.6.2
-revision=3
-build_style=gnu-configure
+version=4.8.1
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-update-mimedb --disable-systemd"
-hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
+hostmakedepends="gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config libxslt"
makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
@@ -19,23 +18,12 @@ 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=f887d7e185f8ff1ee6f9789219231cba8be820c706b316d35ee5118d2fd898eb
+checksum=ef908035b2d09ecf67dc18770e242035c6ff1e7f7ea1fa3e8b4843fa12d3ebd1
do_check() {
:
}
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
- # Remove unused stuff
- make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
- rm -R "$DESTDIR/usr/share/applications"
- rm -R "$DESTDIR/etc"
-}
-
libcinnamon-control-center_package() {
short_desc+=" - runtime library"
pkg_install() {
From 6b58a4df7aa1c103a3885b45ceefa17bc3af2048 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:13 +0200
Subject: [PATCH 02/13] cinnamon-desktop: update to 4.8.1.
---
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 77dfab737b6..985e05ed492 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.6.4
-revision=2
+version=4.8.1
+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://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-desktop"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=8b0f69c4acbeabca723a95ec80905601eec8d563c96ad88a9de3ddac56925ef6
+checksum=cb9aeff385764ba33cf4f7ee2bb5cb7308960670e8fa9f3be38a1d431b20436d
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From 91dc8f33119b2cb5794ac0077eb124f70cc51c4e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:21 +0200
Subject: [PATCH 03/13] cinnamon-menus: update to 4.8.2.
---
srcpkgs/cinnamon-menus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 7b2451c7ee9..f1126567511 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.6.1
-revision=2
+version=4.8.2
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-menus"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=534cf3e15fed812e1affb544811e10823edbc56360b52a80ffbabc006c467dc6
+checksum=6c19ebcea0d35a7a65cd70f1cdca2c5c739467ac6d2c2a1c38a5d580296707bd
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From f0dc95818ff86236e7fc6902819c49320da0dd57 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:28 +0200
Subject: [PATCH 04/13] cinnamon-screensaver: update to 4.8.1.
---
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 76df8da77bf..c140fee3777 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.6.0
-revision=2
+version=4.8.1
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-screensaver"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e93349521a24f2b49c8a293ee15798ba341ae8e9b000cf3da5311a162ce8cb60
+checksum=e06a9f28cba55c38d1464d02917eb374de941fd09007608c239a348e7653b675
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From d6a323e7afbe7d97c5aec569ac7c8983495b642d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:36 +0200
Subject: [PATCH 05/13] cinnamon-session: update to 4.8.0.
---
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 bd9d618653c..c27272b802a 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.6.2
-revision=2
+version=4.8.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dgconf=false"
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-session"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0d4793d8fb828ce8ec6dbedc67a5d244e56d4182b83030d10029eadc0c6723e6
+checksum=66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4
From 592fe85971e846da1b318761bc403fb0e49ee638 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:42 +0200
Subject: [PATCH 06/13] cinnamon-settings-daemon: update to 4.8.2.
---
srcpkgs/cinnamon-settings-daemon/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 70f76130dd2..a71edcbd606 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,10 +1,9 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.6.4
-revision=2
-build_style=gnu-configure
+version=4.8.2
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config"
makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
@@ -16,11 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
-
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
+checksum=e8d6aaf2c5be5b1e12f12b5ca069e682c65f2057ae9133c7dfe271aebebca259
do_check() {
:
From 0aaf9e1eff2c34ff18933d42ba59c00a4d03ee73 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:50 +0200
Subject: [PATCH 07/13] cinnamon-translations: update to 4.8.2.
---
srcpkgs/cinnamon-translations/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 7c31bd54a00..ac2d839fe45 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.6.2
-revision=2
+version=4.8.2
+revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
short_desc="Translations for Cinnamon and Nemo"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://translations.launchpad.net/linuxmint/latest/"
distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=f79b818c3339dec395a8739ebfdb9079e236eeb9608768d76fecfe77dc231cb4
+checksum=483bc894dbebb01a4cde1609f77a673068244393370febd66540a0fe65545c2e
do_install() {
vmkdir usr
From b2e8fdddb04861efe60f9ff0e8951ccaa7dad95b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:02:00 +0200
Subject: [PATCH 08/13] cinnamon: update to 4.8.3.
---
...3592fdb9e3d02210880776e9109f74a84a4cd.diff | 33 +++++++++++++++++++
srcpkgs/cinnamon/template | 17 ++++------
2 files changed, 40 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
diff --git a/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff b/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
new file mode 100644
index 00000000000..ccabd972e56
--- /dev/null
+++ b/srcpkgs/cinnamon/patches/8793592fdb9e3d02210880776e9109f74a84a4cd.diff
@@ -0,0 +1,33 @@
+# upstream fix (originally from archlinux):
+# https://github.com/linuxmint/cinnamon/pull/9725
+
+diff --git a/src/meson.build b/src/meson.build
+index 710202d6db..b4f9b3c883 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -115,7 +115,7 @@ endif
+
+ libcinnamon = library(
+ 'cinnamon',
+- [cinnamon_sources, non_gir, tray_sources],
++ [cinnamon_sources, non_gir, tray_sources, st_enum_types[1]],
+ c_args: '-DG_LOG_DOMAIN="notification_area"',
+ include_directories: [include_root, include_directories('st', 'tray')],
+ install_rpath: join_paths(prefix, pkglibdir),
+diff --git a/src/st/meson.build b/src/st/meson.build
+index 2867cd09d8..026a359c07 100644
+--- a/src/st/meson.build
++++ b/src/st/meson.build
+@@ -134,10 +134,11 @@ st_gir_sources = [
+ st_headers,
+ ]
+
+-st_gir_sources += gnome.mkenums_simple(
++st_enum_types = gnome.mkenums_simple(
+ 'st-enum-types',
+ sources: st_headers,
+ )
++st_gir_sources += st_enum_types
+
+ st_sources = [
+ st_gir_sources,
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index c495532ae6b..414ef93adbe 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,13 +1,11 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.6.7
+version=4.8.3
revision=1
build_helper=gir
-build_style=gnu-configure
-configure_args="--disable-static --disable-schemas-compile
- --enable-compile-warnings=no --disable-gtk-doc"
-hostmakedepends="automake libtool pkg-config gobject-introspection gettext
- gettext-devel glib-devel intltool xmlto autoconf-archive gtk-doc"
+build_style=meson
+hostmakedepends="libtool pkg-config gobject-introspection gettext
+ gettext-devel glib-devel intltool xmlto gtk-doc"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel
@@ -27,7 +25,8 @@ 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=fcc6182a074b15d599dd53014086bb77b0bdceb3e667627e9125331f5ad0195e
+checksum=1b563f2ce12404cf744d8c3c2c161281246aa442188eb5307c4c96393ba0917e
+patch_args=" -Np1"
python_version=3
pycompile_dirs="
@@ -45,7 +44,7 @@ pycompile_dirs="
pre_configure() {
# Add polkit agent to required components
vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \
- -i files/cinnamon2d.session.in files/cinnamon.session.in
+ -i cinnamon2d.session.in cinnamon.session.in
# Check for the cc-panel path, not for the unneeded binary
vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
@@ -56,6 +55,4 @@ pre_configure() {
# Remove broken symlink
rm -f files/etc/xdg/menus/cinnamon-applications-merged
-
- NOCONFIGURE=1 ./autogen.sh
}
From 67767019e046ec4ce1f20809483ed51a2c389077 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:02:05 +0200
Subject: [PATCH 09/13] cjs: update to 4.8.1.
---
srcpkgs/cjs/template | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 309dab47438..90c2c71dc47 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,28 +1,30 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.6.0
+version=4.8.1
revision=1
-build_style=gnu-configure
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-profiler"
-hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel dbus mozjs52-devel"
+# XXX: disable tests because they need dbus, X and GTK, same as gjs
+configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
+ -Dprofiler=disabled -Dinstalled_tests=false"
+hostmakedepends="libtool gnome-common pkg-config
+ gobject-introspection glib-devel dbus mozjs78-devel"
makedepends="dbus-glib-devel readline-devel gobject-introspection
- gtk+3-devel mozjs52 mozjs52-devel"
+ gtk+3-devel mozjs78 mozjs78-devel"
short_desc="Javascript for Cinnamon"
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=47f8abb867881594766fec1398d1b9117012826c5e72ecafb3153a0c8226bf81
-
+checksum=20a117f77917896088273f3ee670d43bee1c115a351c2f688840494b15a8613d
+# The deleted lines in meson.build try to build and run a simple program,
+# and that does not work when cross-compiling.
pre_configure() {
- cp ${FILESDIR}/ax_code_coverage.m4 m4/
-
- NOCONFIGURE=1 ./autogen.sh
+ vsed -e '/Check if a minimal SpiderMonkey program compiles/,/^endif/d' -i meson.build
}
+
cjs-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From a42fcd16c81d54a5424d7d6127d564f7b9782921 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:02:16 +0200
Subject: [PATCH 10/13] muffin: update to 4.8.0.
---
srcpkgs/muffin/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 2a014dd6d82..30888d636a5 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.6.3
+version=4.8.0
revision=1
build_style=gnu-configure
build_helper=gir
@@ -16,7 +16,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=e634209f1a1dfec7efc7c741e65014903ea937926070dba3793cac595df3d5a3
+checksum=a4f1cb9ed80b7ea1e51d30b97ea3ae2f196b06fc9fd56c0283e64c9ee1322c18
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
@@ -35,7 +35,6 @@ muffin-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/lib/*.so"
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gir-1.0
From 33e022330e7914488f76bf089860656257a4b878 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:02:29 +0200
Subject: [PATCH 11/13] nemo: update to 4.8.2, include changes by @ndowens.
---
srcpkgs/nemo/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b01069a1631..deb08370f5d 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,12 +1,11 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.6.5
+version=4.8.2
revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
-hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
- gobject-introspection"
+hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
libexif-devel libnotify-devel tracker-devel xapps-devel"
depends="cinnamon-translations dconf gvfs"
@@ -15,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=35f18063c4e9e0f94997454482553f48296eb97afe13bcbd56e99a87ea8eb78e
+checksum=e4225b7c4736abe49e106595c770f2c2ea137b15f0b09c9f9ae05c1556fb42a4
python_version=3
@@ -27,7 +26,7 @@ do_check() {
pre_configure() {
# Rename 'Files' app name to avoid having the same as nautilus
- sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
+ vsed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
}
post_install() {
From 1186150831613fbcc9bb4872a2cf00b3f8ede7f3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:05:05 +0200
Subject: [PATCH 12/13] nemo-fileroller: update to 4.8.0.
---
srcpkgs/nemo-fileroller/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index e33cba72c74..62f53f6365d 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,7 +1,7 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.6.0
-revision=2
+version=4.8.0
+revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
build_style=gnu-configure
@@ -13,7 +13,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=f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd
+checksum=1b7b85b41c659fe0f93a9b83fadb81a7934c7e7cb2df9eda4a03413b7f5d05c4
pre_configure() {
autoreconf -fi
From c4a993fb3ddcb4299f55cf55025e162eff68860f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:20:45 +0200
Subject: [PATCH 13/13] xapps: update to 2.0.4, include changes by @ndowens.
---
srcpkgs/xapps/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 1589440927e..b3f670511e2 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,13 +1,13 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.8.10
+version=2.0.4
revision=1
wrksrc="xapp-${version}"
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gnome-common pkg-config vala python3 gettext"
-makedepends="gettext-devel gobject-introspection libgnomekbd-devel
- python3-gobject-devel libdbusmenu-gtk3-devel"
+makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel
+ libdbusmenu-gtk3-devel"
depends="gist inxi xfconf"
short_desc="Cross-desktop libraries and common resources from Linux Mint"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -15,12 +15,12 @@ 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=a0d542de6dc4d6a318bdf1fad88447db270ab2dd0582f0c6f28008cc77337672
+checksum=99d77bffc39cace6a283c3fe8f63ece3e1cf5d136eae7830d53674f50967e5ee
xapps-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision} libgnomekbd-devel libglib-devel
- gdk-pixbuf-devel"
+ gdk-pixbuf-devel"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR PATCH] [Updated] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (24 preceding siblings ...)
2020-12-21 19:21 ` [PR PATCH] [Updated] " mobinmob
@ 2020-12-21 20:05 ` mobinmob
2020-12-24 4:42 ` ericonr
` (9 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-21 20:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.8
https://github.com/void-linux/void-packages/pull/26965
Cinnamon: update to 4.8.
Includes changes from https://github.com/void-linux/void-packages/pull/26778 by @ndowens .
A patch file from https://github.com/void-linux/void-packages/pull/26965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.8-26965.patch --]
[-- Type: text/x-diff, Size: 21250 bytes --]
From 1c4d2c65d6549fac51d49e9f329328a5c11bfefa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:00 +0200
Subject: [PATCH 01/13] cinnamon-control-center: update to 4.8.1.
---
.../patches/disable-timezone-tests.patch | 13 -----------
srcpkgs/cinnamon-control-center/template | 22 +++++--------------
2 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
diff --git a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch b/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
deleted file mode 100644
index 964fb8c1612..00000000000
--- a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- panels/datetime/Makefile.am.orig 2015-05-30 08:26:46.499494572 +0200
-+++ panels/datetime/Makefile.am 2015-05-30 08:26:56.890603931 +0200
-@@ -132,8 +132,8 @@ test_endianess_CFLAGS = $(DATETIME_PANEL
- all-local: check-local
-
- check-local: test-timezone-gfx test-endianess test-timezone
-- $(builddir)/test-timezone-gfx $(srcdir)/data
-- $(builddir)/test-endianess
-+# $(builddir)/test-timezone-gfx $(srcdir)/data
-+# $(builddir)/test-endianess
- # $(builddir)/test-timezone
-
- ccpanelsdir = $(PANELS_DIR)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 9da17ca74f3..cbb78d5bf8d 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,11 +1,10 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.6.2
-revision=3
-build_style=gnu-configure
+version=4.8.1
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-update-mimedb --disable-systemd"
-hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
+hostmakedepends="gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config libxslt"
makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
@@ -19,23 +18,12 @@ 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=f887d7e185f8ff1ee6f9789219231cba8be820c706b316d35ee5118d2fd898eb
+checksum=ef908035b2d09ecf67dc18770e242035c6ff1e7f7ea1fa3e8b4843fa12d3ebd1
do_check() {
:
}
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
- # Remove unused stuff
- make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
- rm -R "$DESTDIR/usr/share/applications"
- rm -R "$DESTDIR/etc"
-}
-
libcinnamon-control-center_package() {
short_desc+=" - runtime library"
pkg_install() {
From 6b58a4df7aa1c103a3885b45ceefa17bc3af2048 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:13 +0200
Subject: [PATCH 02/13] cinnamon-desktop: update to 4.8.1.
---
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 77dfab737b6..985e05ed492 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.6.4
-revision=2
+version=4.8.1
+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://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-desktop"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=8b0f69c4acbeabca723a95ec80905601eec8d563c96ad88a9de3ddac56925ef6
+checksum=cb9aeff385764ba33cf4f7ee2bb5cb7308960670e8fa9f3be38a1d431b20436d
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From 91dc8f33119b2cb5794ac0077eb124f70cc51c4e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:21 +0200
Subject: [PATCH 03/13] cinnamon-menus: update to 4.8.2.
---
srcpkgs/cinnamon-menus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 7b2451c7ee9..f1126567511 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.6.1
-revision=2
+version=4.8.2
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-menus"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=534cf3e15fed812e1affb544811e10823edbc56360b52a80ffbabc006c467dc6
+checksum=6c19ebcea0d35a7a65cd70f1cdca2c5c739467ac6d2c2a1c38a5d580296707bd
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From f0dc95818ff86236e7fc6902819c49320da0dd57 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:28 +0200
Subject: [PATCH 04/13] cinnamon-screensaver: update to 4.8.1.
---
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 76df8da77bf..c140fee3777 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.6.0
-revision=2
+version=4.8.1
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-screensaver"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e93349521a24f2b49c8a293ee15798ba341ae8e9b000cf3da5311a162ce8cb60
+checksum=e06a9f28cba55c38d1464d02917eb374de941fd09007608c239a348e7653b675
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From d6a323e7afbe7d97c5aec569ac7c8983495b642d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:36 +0200
Subject: [PATCH 05/13] cinnamon-session: update to 4.8.0.
---
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 bd9d618653c..c27272b802a 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.6.2
-revision=2
+version=4.8.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dgconf=false"
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-session"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0d4793d8fb828ce8ec6dbedc67a5d244e56d4182b83030d10029eadc0c6723e6
+checksum=66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4
From 592fe85971e846da1b318761bc403fb0e49ee638 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:42 +0200
Subject: [PATCH 06/13] cinnamon-settings-daemon: update to 4.8.2.
---
srcpkgs/cinnamon-settings-daemon/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 70f76130dd2..a71edcbd606 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,10 +1,9 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.6.4
-revision=2
-build_style=gnu-configure
+version=4.8.2
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config"
makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
@@ -16,11 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
-
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
+checksum=e8d6aaf2c5be5b1e12f12b5ca069e682c65f2057ae9133c7dfe271aebebca259
do_check() {
:
From 0aaf9e1eff2c34ff18933d42ba59c00a4d03ee73 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:50 +0200
Subject: [PATCH 07/13] cinnamon-translations: update to 4.8.2.
---
srcpkgs/cinnamon-translations/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 7c31bd54a00..ac2d839fe45 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.6.2
-revision=2
+version=4.8.2
+revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
short_desc="Translations for Cinnamon and Nemo"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://translations.launchpad.net/linuxmint/latest/"
distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=f79b818c3339dec395a8739ebfdb9079e236eeb9608768d76fecfe77dc231cb4
+checksum=483bc894dbebb01a4cde1609f77a673068244393370febd66540a0fe65545c2e
do_install() {
vmkdir usr
From 0d74613097b0f8be7dba4be0f908fc9ef26b5560 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:39 +0200
Subject: [PATCH 08/13] cinnamon: update to 4.8.3.
---
srcpkgs/cinnamon/template | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index c495532ae6b..414ef93adbe 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,13 +1,11 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.6.7
+version=4.8.3
revision=1
build_helper=gir
-build_style=gnu-configure
-configure_args="--disable-static --disable-schemas-compile
- --enable-compile-warnings=no --disable-gtk-doc"
-hostmakedepends="automake libtool pkg-config gobject-introspection gettext
- gettext-devel glib-devel intltool xmlto autoconf-archive gtk-doc"
+build_style=meson
+hostmakedepends="libtool pkg-config gobject-introspection gettext
+ gettext-devel glib-devel intltool xmlto gtk-doc"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel
@@ -27,7 +25,8 @@ 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=fcc6182a074b15d599dd53014086bb77b0bdceb3e667627e9125331f5ad0195e
+checksum=1b563f2ce12404cf744d8c3c2c161281246aa442188eb5307c4c96393ba0917e
+patch_args=" -Np1"
python_version=3
pycompile_dirs="
@@ -45,7 +44,7 @@ pycompile_dirs="
pre_configure() {
# Add polkit agent to required components
vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \
- -i files/cinnamon2d.session.in files/cinnamon.session.in
+ -i cinnamon2d.session.in cinnamon.session.in
# Check for the cc-panel path, not for the unneeded binary
vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
@@ -56,6 +55,4 @@ pre_configure() {
# Remove broken symlink
rm -f files/etc/xdg/menus/cinnamon-applications-merged
-
- NOCONFIGURE=1 ./autogen.sh
}
From 5a8afe3ccca6721dcf5fcef096ed2ee9c0ad09ad Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:48 +0200
Subject: [PATCH 09/13] cjs: update to 4.8.1.
---
srcpkgs/cjs/template | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 309dab47438..90c2c71dc47 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,28 +1,30 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.6.0
+version=4.8.1
revision=1
-build_style=gnu-configure
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-profiler"
-hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel dbus mozjs52-devel"
+# XXX: disable tests because they need dbus, X and GTK, same as gjs
+configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
+ -Dprofiler=disabled -Dinstalled_tests=false"
+hostmakedepends="libtool gnome-common pkg-config
+ gobject-introspection glib-devel dbus mozjs78-devel"
makedepends="dbus-glib-devel readline-devel gobject-introspection
- gtk+3-devel mozjs52 mozjs52-devel"
+ gtk+3-devel mozjs78 mozjs78-devel"
short_desc="Javascript for Cinnamon"
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=47f8abb867881594766fec1398d1b9117012826c5e72ecafb3153a0c8226bf81
-
+checksum=20a117f77917896088273f3ee670d43bee1c115a351c2f688840494b15a8613d
+# The deleted lines in meson.build try to build and run a simple program,
+# and that does not work when cross-compiling.
pre_configure() {
- cp ${FILESDIR}/ax_code_coverage.m4 m4/
-
- NOCONFIGURE=1 ./autogen.sh
+ vsed -e '/Check if a minimal SpiderMonkey program compiles/,/^endif/d' -i meson.build
}
+
cjs-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 064fff297bdb47804681d1ca3d558299029f14f4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:58 +0200
Subject: [PATCH 10/13] muffin: update to 4.8.0.
---
srcpkgs/muffin/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 2a014dd6d82..30888d636a5 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.6.3
+version=4.8.0
revision=1
build_style=gnu-configure
build_helper=gir
@@ -16,7 +16,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=e634209f1a1dfec7efc7c741e65014903ea937926070dba3793cac595df3d5a3
+checksum=a4f1cb9ed80b7ea1e51d30b97ea3ae2f196b06fc9fd56c0283e64c9ee1322c18
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
@@ -35,7 +35,6 @@ muffin-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/lib/*.so"
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gir-1.0
From 9ad19a6610f60c8dae95312011ec57933afd99e4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:15 +0200
Subject: [PATCH 11/13] nemo: update to 4.8.2, include changes by @ndowens.
---
srcpkgs/nemo/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b01069a1631..deb08370f5d 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,12 +1,11 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.6.5
+version=4.8.2
revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
-hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
- gobject-introspection"
+hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
libexif-devel libnotify-devel tracker-devel xapps-devel"
depends="cinnamon-translations dconf gvfs"
@@ -15,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=35f18063c4e9e0f94997454482553f48296eb97afe13bcbd56e99a87ea8eb78e
+checksum=e4225b7c4736abe49e106595c770f2c2ea137b15f0b09c9f9ae05c1556fb42a4
python_version=3
@@ -27,7 +26,7 @@ do_check() {
pre_configure() {
# Rename 'Files' app name to avoid having the same as nautilus
- sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
+ vsed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
}
post_install() {
From 05e7105195ae2b0ef92dd1d36dd5b28e3b34d46d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:20 +0200
Subject: [PATCH 12/13] nemo-fileroller: update to 4.8.0.
---
srcpkgs/nemo-fileroller/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index e33cba72c74..62f53f6365d 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,7 +1,7 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.6.0
-revision=2
+version=4.8.0
+revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
build_style=gnu-configure
@@ -13,7 +13,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=f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd
+checksum=1b7b85b41c659fe0f93a9b83fadb81a7934c7e7cb2df9eda4a03413b7f5d05c4
pre_configure() {
autoreconf -fi
From 252c994626fbc199ae786594f7c425546d3c2828 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:27 +0200
Subject: [PATCH 13/13] xapps: update to 2.0.4, include changes by @ndowens.
---
srcpkgs/xapps/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 1589440927e..b3f670511e2 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,13 +1,13 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.8.10
+version=2.0.4
revision=1
wrksrc="xapp-${version}"
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gnome-common pkg-config vala python3 gettext"
-makedepends="gettext-devel gobject-introspection libgnomekbd-devel
- python3-gobject-devel libdbusmenu-gtk3-devel"
+makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel
+ libdbusmenu-gtk3-devel"
depends="gist inxi xfconf"
short_desc="Cross-desktop libraries and common resources from Linux Mint"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -15,12 +15,12 @@ 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=a0d542de6dc4d6a318bdf1fad88447db270ab2dd0582f0c6f28008cc77337672
+checksum=99d77bffc39cace6a283c3fe8f63ece3e1cf5d136eae7830d53674f50967e5ee
xapps-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision} libgnomekbd-devel libglib-devel
- gdk-pixbuf-devel"
+ gdk-pixbuf-devel"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (25 preceding siblings ...)
2020-12-21 20:05 ` mobinmob
@ 2020-12-24 4:42 ` ericonr
2020-12-24 5:49 ` ericonr
` (8 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2020-12-24 4:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1961 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#issuecomment-750737788
Comment:
Please apply
```diff
diff --git a/srcpkgs/nemo/patches/meson.patch b/srcpkgs/nemo/patches/meson.patch
new file mode 100644
index 0000000000..d6d43a09c4
--- /dev/null
+++ b/srcpkgs/nemo/patches/meson.patch
@@ -0,0 +1,15 @@
+diff --git libnemo-extension/meson.build libnemo-extension/meson.build
+index 31a1618..84a6cf7 100644
+--- libnemo-extension/meson.build
++++ libnemo-extension/meson.build
+@@ -61,7 +61,9 @@ nemo_extension = declare_dependency(
+ dependencies: nemo_extension_deps,
+ )
+
+-typelibdir = go_intr.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', get_option('libdir')])
++typelibdir = go_intr.get_pkgconfig_variable('typelibdir',
++ define_variable: ['libdir', join_paths(get_option('prefix'), get_option('libdir'))]
++)
+
+ gnome.generate_gir(nemo_extension_lib,
+ sources: nemo_extension_sources + nemo_extension_headers,
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index deb08370f5..61b22d1eca 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -20,8 +20,8 @@ python_version=3
do_check() {
:
- # requires a display
- # Gtk-WARNING **: 18:34:08.533: cannot open display:
+ # Requires xvfb-run and dbus-run-session;
+ # can't be run inside chroot due to fusermount3
}
pre_configure() {
@@ -29,12 +29,6 @@ pre_configure() {
vsed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
}
-post_install() {
- if [ -d "$DESTDIR"/lib/girepository-1.0 ]; then
- mv ${DESTDIR}/lib/girepository-1.0 ${DESTDIR}/usr/lib/
- fi
-}
-
libnemo_package() {
short_desc+=" - runtime library"
pkg_install() {
```
And please don't do tricks like that `post_install` again, I spent a lot of time chasing my own tail trying to figure out why the build was complaining about files in `/lib64`.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (26 preceding siblings ...)
2020-12-24 4:42 ` ericonr
@ 2020-12-24 5:49 ` ericonr
2020-12-26 11:12 ` mobinmob
` (7 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2020-12-24 5:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2213 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#issuecomment-750737788
Comment:
Please apply
```diff
diff --git a/srcpkgs/nemo/patches/meson.patch b/srcpkgs/nemo/patches/meson.patch
new file mode 100644
index 0000000000..d6d43a09c4
--- /dev/null
+++ b/srcpkgs/nemo/patches/meson.patch
@@ -0,0 +1,15 @@
+diff --git libnemo-extension/meson.build libnemo-extension/meson.build
+index 31a1618..84a6cf7 100644
+--- libnemo-extension/meson.build
++++ libnemo-extension/meson.build
+@@ -61,7 +61,9 @@ nemo_extension = declare_dependency(
+ dependencies: nemo_extension_deps,
+ )
+
+-typelibdir = go_intr.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', get_option('libdir')])
++typelibdir = go_intr.get_pkgconfig_variable('typelibdir',
++ define_variable: ['libdir', join_paths(get_option('prefix'), get_option('libdir'))]
++)
+
+ gnome.generate_gir(nemo_extension_lib,
+ sources: nemo_extension_sources + nemo_extension_headers,
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index deb08370f5..abb5f5886c 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -17,22 +17,15 @@ distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=e4225b7c4736abe49e106595c770f2c2ea137b15f0b09c9f9ae05c1556fb42a4
python_version=3
-
do_check() {
:
- # requires a display
- # Gtk-WARNING **: 18:34:08.533: cannot open display:
+ # Requires xvfb-run and dbus-run-session;
+ # can't be run inside chroot due to fusermount3
}
-pre_configure() {
+post_patch() {
# Rename 'Files' app name to avoid having the same as nautilus
- vsed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
-}
-
-post_install() {
- if [ -d "$DESTDIR"/lib/girepository-1.0 ]; then
- mv ${DESTDIR}/lib/girepository-1.0 ${DESTDIR}/usr/lib/
- fi
+ vsed -i 's/^Name.*=.*/& - Nemo/' data/nemo.desktop.in
}
libnemo_package() {
```
And please don't do tricks like that `post_install` again, I spent a lot of time chasing my own tail trying to figure out why the build was complaining about files in `/lib64`.
EDIT: fixed the patch to do more stuff
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (27 preceding siblings ...)
2020-12-24 5:49 ` ericonr
@ 2020-12-26 11:12 ` mobinmob
2020-12-26 11:18 ` mobinmob
` (6 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-26 11:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2432 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#issuecomment-751345457
Comment:
> Please apply
>
> ```diff
> diff --git a/srcpkgs/nemo/patches/meson.patch b/srcpkgs/nemo/patches/meson.patch
> new file mode 100644
> index 0000000000..d6d43a09c4
> --- /dev/null
> +++ b/srcpkgs/nemo/patches/meson.patch
> @@ -0,0 +1,15 @@
> +diff --git libnemo-extension/meson.build libnemo-extension/meson.build
> +index 31a1618..84a6cf7 100644
> +--- libnemo-extension/meson.build
> ++++ libnemo-extension/meson.build
> +@@ -61,7 +61,9 @@ nemo_extension = declare_dependency(
> + dependencies: nemo_extension_deps,
> + )
> +
> +-typelibdir = go_intr.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', get_option('libdir')])
> ++typelibdir = go_intr.get_pkgconfig_variable('typelibdir',
> ++ define_variable: ['libdir', join_paths(get_option('prefix'), get_option('libdir'))]
> ++)
> +
> + gnome.generate_gir(nemo_extension_lib,
> + sources: nemo_extension_sources + nemo_extension_headers,
> diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
> index deb08370f5..abb5f5886c 100644
> --- a/srcpkgs/nemo/template
> +++ b/srcpkgs/nemo/template
> @@ -17,22 +17,15 @@ distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
> checksum=e4225b7c4736abe49e106595c770f2c2ea137b15f0b09c9f9ae05c1556fb42a4
> python_version=3
>
> -
> do_check() {
> :
> - # requires a display
> - # Gtk-WARNING **: 18:34:08.533: cannot open display:
> + # Requires xvfb-run and dbus-run-session;
> + # can't be run inside chroot due to fusermount3
> }
>
> -pre_configure() {
> +post_patch() {
> # Rename 'Files' app name to avoid having the same as nautilus
> - vsed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
> -}
> -
> -post_install() {
> - if [ -d "$DESTDIR"/lib/girepository-1.0 ]; then
> - mv ${DESTDIR}/lib/girepository-1.0 ${DESTDIR}/usr/lib/
> - fi
> + vsed -i 's/^Name.*=.*/& - Nemo/' data/nemo.desktop.in
> }
>
> libnemo_package() {
> ```
Thank you for the patch, it is much cleaner. Once I have the time to do complete rebuild I will push with the changes.
> And please don't do tricks like that `post_install` again, I spent a lot of time chasing my own tail trying to figure out why the build was complaining about files in `/lib64`.
Please check git blame.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (28 preceding siblings ...)
2020-12-26 11:12 ` mobinmob
@ 2020-12-26 11:18 ` mobinmob
2020-12-27 23:47 ` [PR PATCH] [Updated] " mobinmob
` (5 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-26 11:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#issuecomment-751345457
Comment:
Thank you for the patch, it is much cleaner. Once I have the time to do complete rebuild I will push with the changes.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR PATCH] [Updated] Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (29 preceding siblings ...)
2020-12-26 11:18 ` mobinmob
@ 2020-12-27 23:47 ` mobinmob
2020-12-28 8:01 ` mobinmob
` (4 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-27 23:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages cinnamon4.8
https://github.com/void-linux/void-packages/pull/26965
Cinnamon: update to 4.8.
Includes changes from https://github.com/void-linux/void-packages/pull/26778 by @ndowens .
A patch file from https://github.com/void-linux/void-packages/pull/26965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon4.8-26965.patch --]
[-- Type: text/x-diff, Size: 22487 bytes --]
From ce86b93a11eb7f41ffc12a1dbe12eede4010b5f4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:00 +0200
Subject: [PATCH 01/13] cinnamon-control-center: update to 4.8.1.
---
.../patches/disable-timezone-tests.patch | 13 -----------
srcpkgs/cinnamon-control-center/template | 22 +++++--------------
2 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
diff --git a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch b/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
deleted file mode 100644
index 964fb8c1612..00000000000
--- a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- panels/datetime/Makefile.am.orig 2015-05-30 08:26:46.499494572 +0200
-+++ panels/datetime/Makefile.am 2015-05-30 08:26:56.890603931 +0200
-@@ -132,8 +132,8 @@ test_endianess_CFLAGS = $(DATETIME_PANEL
- all-local: check-local
-
- check-local: test-timezone-gfx test-endianess test-timezone
-- $(builddir)/test-timezone-gfx $(srcdir)/data
-- $(builddir)/test-endianess
-+# $(builddir)/test-timezone-gfx $(srcdir)/data
-+# $(builddir)/test-endianess
- # $(builddir)/test-timezone
-
- ccpanelsdir = $(PANELS_DIR)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 9da17ca74f3..cbb78d5bf8d 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,11 +1,10 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.6.2
-revision=3
-build_style=gnu-configure
+version=4.8.1
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-update-mimedb --disable-systemd"
-hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common
+hostmakedepends="gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config libxslt"
makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
@@ -19,23 +18,12 @@ 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=f887d7e185f8ff1ee6f9789219231cba8be820c706b316d35ee5118d2fd898eb
+checksum=ef908035b2d09ecf67dc18770e242035c6ff1e7f7ea1fa3e8b4843fa12d3ebd1
do_check() {
:
}
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
- # Remove unused stuff
- make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
- rm -R "$DESTDIR/usr/share/applications"
- rm -R "$DESTDIR/etc"
-}
-
libcinnamon-control-center_package() {
short_desc+=" - runtime library"
pkg_install() {
From 6e885a5f3171d18ddb38a629f8a8b0159800f3fb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:13 +0200
Subject: [PATCH 02/13] cinnamon-desktop: update to 4.8.1.
---
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 77dfab737b6..985e05ed492 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.6.4
-revision=2
+version=4.8.1
+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://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-desktop"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=8b0f69c4acbeabca723a95ec80905601eec8d563c96ad88a9de3ddac56925ef6
+checksum=cb9aeff385764ba33cf4f7ee2bb5cb7308960670e8fa9f3be38a1d431b20436d
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From b1039ae45f623d7d24a909ede2a283686094bfa0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:21 +0200
Subject: [PATCH 03/13] cinnamon-menus: update to 4.8.2.
---
srcpkgs/cinnamon-menus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 7b2451c7ee9..f1126567511 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.6.1
-revision=2
+version=4.8.2
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="glib-devel gnome-common gobject-introspection intltool libtool
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-menus"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=534cf3e15fed812e1affb544811e10823edbc56360b52a80ffbabc006c467dc6
+checksum=6c19ebcea0d35a7a65cd70f1cdca2c5c739467ac6d2c2a1c38a5d580296707bd
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From f5753b4d8e4f280307ce1b7b11c0459cc8a4f2a1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:28 +0200
Subject: [PATCH 04/13] cinnamon-screensaver: update to 4.8.1.
---
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 76df8da77bf..c140fee3777 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.6.0
-revision=2
+version=4.8.1
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-screensaver"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e93349521a24f2b49c8a293ee15798ba341ae8e9b000cf3da5311a162ce8cb60
+checksum=e06a9f28cba55c38d1464d02917eb374de941fd09007608c239a348e7653b675
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 23a2200b1fda71c5444a7c6f3016e4344c5fdbe7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:36 +0200
Subject: [PATCH 05/13] cinnamon-session: update to 4.8.0.
---
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 bd9d618653c..c27272b802a 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.6.2
-revision=2
+version=4.8.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dgconf=false"
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-session"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0d4793d8fb828ce8ec6dbedc67a5d244e56d4182b83030d10029eadc0c6723e6
+checksum=66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4
From faad459957bb45a4beba890f9eb10d1e898be8b0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:42 +0200
Subject: [PATCH 06/13] cinnamon-settings-daemon: update to 4.8.2.
---
srcpkgs/cinnamon-settings-daemon/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 70f76130dd2..a71edcbd606 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,10 +1,9 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.6.4
-revision=2
-build_style=gnu-configure
+version=4.8.2
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common
gobject-introspection intltool libtool pkg-config"
makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
@@ -16,11 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
-
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
+checksum=e8d6aaf2c5be5b1e12f12b5ca069e682c65f2057ae9133c7dfe271aebebca259
do_check() {
:
From 8b96938a3bda14414f5e067e6145566b0c1560f5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:50 +0200
Subject: [PATCH 07/13] cinnamon-translations: update to 4.8.2.
---
srcpkgs/cinnamon-translations/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 7c31bd54a00..ac2d839fe45 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.6.2
-revision=2
+version=4.8.2
+revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
short_desc="Translations for Cinnamon and Nemo"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://translations.launchpad.net/linuxmint/latest/"
distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=f79b818c3339dec395a8739ebfdb9079e236eeb9608768d76fecfe77dc231cb4
+checksum=483bc894dbebb01a4cde1609f77a673068244393370febd66540a0fe65545c2e
do_install() {
vmkdir usr
From 47ee9cfa4a951db9f3d35ff8883a39806ecdc6a6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:39 +0200
Subject: [PATCH 08/13] cinnamon: update to 4.8.3.
---
srcpkgs/cinnamon/template | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index c495532ae6b..414ef93adbe 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,13 +1,11 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.6.7
+version=4.8.3
revision=1
build_helper=gir
-build_style=gnu-configure
-configure_args="--disable-static --disable-schemas-compile
- --enable-compile-warnings=no --disable-gtk-doc"
-hostmakedepends="automake libtool pkg-config gobject-introspection gettext
- gettext-devel glib-devel intltool xmlto autoconf-archive gtk-doc"
+build_style=meson
+hostmakedepends="libtool pkg-config gobject-introspection gettext
+ gettext-devel glib-devel intltool xmlto gtk-doc"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel
@@ -27,7 +25,8 @@ 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=fcc6182a074b15d599dd53014086bb77b0bdceb3e667627e9125331f5ad0195e
+checksum=1b563f2ce12404cf744d8c3c2c161281246aa442188eb5307c4c96393ba0917e
+patch_args=" -Np1"
python_version=3
pycompile_dirs="
@@ -45,7 +44,7 @@ pycompile_dirs="
pre_configure() {
# Add polkit agent to required components
vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \
- -i files/cinnamon2d.session.in files/cinnamon.session.in
+ -i cinnamon2d.session.in cinnamon.session.in
# Check for the cc-panel path, not for the unneeded binary
vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
@@ -56,6 +55,4 @@ pre_configure() {
# Remove broken symlink
rm -f files/etc/xdg/menus/cinnamon-applications-merged
-
- NOCONFIGURE=1 ./autogen.sh
}
From dea044f91a1010d95688c4d0afe0d56a8c8f0275 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:48 +0200
Subject: [PATCH 09/13] cjs: update to 4.8.1.
---
srcpkgs/cjs/template | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 309dab47438..90c2c71dc47 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,28 +1,30 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.6.0
+version=4.8.1
revision=1
-build_style=gnu-configure
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-profiler"
-hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel dbus mozjs52-devel"
+# XXX: disable tests because they need dbus, X and GTK, same as gjs
+configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
+ -Dprofiler=disabled -Dinstalled_tests=false"
+hostmakedepends="libtool gnome-common pkg-config
+ gobject-introspection glib-devel dbus mozjs78-devel"
makedepends="dbus-glib-devel readline-devel gobject-introspection
- gtk+3-devel mozjs52 mozjs52-devel"
+ gtk+3-devel mozjs78 mozjs78-devel"
short_desc="Javascript for Cinnamon"
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=47f8abb867881594766fec1398d1b9117012826c5e72ecafb3153a0c8226bf81
-
+checksum=20a117f77917896088273f3ee670d43bee1c115a351c2f688840494b15a8613d
+# The deleted lines in meson.build try to build and run a simple program,
+# and that does not work when cross-compiling.
pre_configure() {
- cp ${FILESDIR}/ax_code_coverage.m4 m4/
-
- NOCONFIGURE=1 ./autogen.sh
+ vsed -e '/Check if a minimal SpiderMonkey program compiles/,/^endif/d' -i meson.build
}
+
cjs-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 7e9c92c02bd8aead16ed37fc7106cc2cb1906077 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:58 +0200
Subject: [PATCH 10/13] muffin: update to 4.8.0.
---
srcpkgs/muffin/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 2a014dd6d82..30888d636a5 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.6.3
+version=4.8.0
revision=1
build_style=gnu-configure
build_helper=gir
@@ -16,7 +16,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=e634209f1a1dfec7efc7c741e65014903ea937926070dba3793cac595df3d5a3
+checksum=a4f1cb9ed80b7ea1e51d30b97ea3ae2f196b06fc9fd56c0283e64c9ee1322c18
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
@@ -35,7 +35,6 @@ muffin-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/lib/*.so"
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gir-1.0
From 6bfb814a25932116a80f4ac60f5b6b1979188967 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 28 Dec 2020 01:46:28 +0200
Subject: [PATCH 11/13] nemo: update to 4.8.2.
---
srcpkgs/nemo/patches/meson.patch | 15 +++++++++++++++
srcpkgs/nemo/template | 22 +++++++---------------
2 files changed, 22 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/nemo/patches/meson.patch
diff --git a/srcpkgs/nemo/patches/meson.patch b/srcpkgs/nemo/patches/meson.patch
new file mode 100644
index 00000000000..d6d43a09c4e
--- /dev/null
+++ b/srcpkgs/nemo/patches/meson.patch
@@ -0,0 +1,15 @@
+diff --git libnemo-extension/meson.build libnemo-extension/meson.build
+index 31a1618..84a6cf7 100644
+--- libnemo-extension/meson.build
++++ libnemo-extension/meson.build
+@@ -61,7 +61,9 @@ nemo_extension = declare_dependency(
+ dependencies: nemo_extension_deps,
+ )
+
+-typelibdir = go_intr.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', get_option('libdir')])
++typelibdir = go_intr.get_pkgconfig_variable('typelibdir',
++ define_variable: ['libdir', join_paths(get_option('prefix'), get_option('libdir'))]
++)
+
+ gnome.generate_gir(nemo_extension_lib,
+ sources: nemo_extension_sources + nemo_extension_headers,
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index b01069a1631..abb5f5886c5 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,12 +1,11 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.6.5
+version=4.8.2
revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
-hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config
- gobject-introspection"
+hostmakedepends="gettext-devel glib-devel gnome-common intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
libexif-devel libnotify-devel tracker-devel xapps-devel"
depends="cinnamon-translations dconf gvfs"
@@ -15,25 +14,18 @@ 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=35f18063c4e9e0f94997454482553f48296eb97afe13bcbd56e99a87ea8eb78e
+checksum=e4225b7c4736abe49e106595c770f2c2ea137b15f0b09c9f9ae05c1556fb42a4
python_version=3
-
do_check() {
:
- # requires a display
- # Gtk-WARNING **: 18:34:08.533: cannot open display:
+ # Requires xvfb-run and dbus-run-session;
+ # can't be run inside chroot due to fusermount3
}
-pre_configure() {
+post_patch() {
# Rename 'Files' app name to avoid having the same as nautilus
- sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
-}
-
-post_install() {
- if [ -d "$DESTDIR"/lib/girepository-1.0 ]; then
- mv ${DESTDIR}/lib/girepository-1.0 ${DESTDIR}/usr/lib/
- fi
+ vsed -i 's/^Name.*=.*/& - Nemo/' data/nemo.desktop.in
}
libnemo_package() {
From 961f2a5bc8e413bd1f4fa0ed01f3e71206a19ba1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 28 Dec 2020 01:46:37 +0200
Subject: [PATCH 12/13] nemo-fileroller: update to 4.8.0.
---
srcpkgs/nemo-fileroller/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index e33cba72c74..62f53f6365d 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,7 +1,7 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.6.0
-revision=2
+version=4.8.0
+revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
build_style=gnu-configure
@@ -13,7 +13,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=f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd
+checksum=1b7b85b41c659fe0f93a9b83fadb81a7934c7e7cb2df9eda4a03413b7f5d05c4
pre_configure() {
autoreconf -fi
From 551af84d2e72fec02e5f56898d012de18996d217 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 28 Dec 2020 01:46:45 +0200
Subject: [PATCH 13/13] xapps: update to 2.0.4.
---
srcpkgs/xapps/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 1589440927e..b3f670511e2 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,13 +1,13 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.8.10
+version=2.0.4
revision=1
wrksrc="xapp-${version}"
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gnome-common pkg-config vala python3 gettext"
-makedepends="gettext-devel gobject-introspection libgnomekbd-devel
- python3-gobject-devel libdbusmenu-gtk3-devel"
+makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel
+ libdbusmenu-gtk3-devel"
depends="gist inxi xfconf"
short_desc="Cross-desktop libraries and common resources from Linux Mint"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -15,12 +15,12 @@ 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=a0d542de6dc4d6a318bdf1fad88447db270ab2dd0582f0c6f28008cc77337672
+checksum=99d77bffc39cace6a283c3fe8f63ece3e1cf5d136eae7830d53674f50967e5ee
xapps-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision} libgnomekbd-devel libglib-devel
- gdk-pixbuf-devel"
+ gdk-pixbuf-devel"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (30 preceding siblings ...)
2020-12-27 23:47 ` [PR PATCH] [Updated] " mobinmob
@ 2020-12-28 8:01 ` mobinmob
2020-12-28 16:36 ` ericonr
` (3 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-28 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#issuecomment-751622653
Comment:
@ericonr It seems that the patch breaks cross-compilation. I will keep some changes in the templates and go back to the post-install test and move.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (31 preceding siblings ...)
2020-12-28 8:01 ` mobinmob
@ 2020-12-28 16:36 ` ericonr
2020-12-28 19:13 ` mobinmob
` (2 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2020-12-28 16:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#issuecomment-751777964
Comment:
Do keep my patch, this is related to #27437
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (32 preceding siblings ...)
2020-12-28 16:36 ` ericonr
@ 2020-12-28 19:13 ` mobinmob
2021-01-19 19:30 ` ericonr
2021-01-19 19:30 ` [PR PATCH] [Closed]: " ericonr
35 siblings, 0 replies; 37+ messages in thread
From: mobinmob @ 2020-12-28 19:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#issuecomment-751833083
Comment:
> Do keep my patch, this is related to #27437
Oh, I see! Thank you, I will monitor the issue and push again when resolved. If there is a new point release I will update it.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (33 preceding siblings ...)
2020-12-28 19:13 ` mobinmob
@ 2021-01-19 19:30 ` ericonr
2021-01-19 19:30 ` [PR PATCH] [Closed]: " ericonr
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2021-01-19 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#issuecomment-763077063
Comment:
Closing in favor of #28035
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PR PATCH] [Closed]: Cinnamon: update to 4.8.
2020-12-05 14:33 [PR PATCH] Cinnamon: update to 4.8 mobinmob
` (34 preceding siblings ...)
2021-01-19 19:30 ` ericonr
@ 2021-01-19 19:30 ` ericonr
35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2021-01-19 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
There's a closed pull request on the void-packages repository
Cinnamon: update to 4.8.
https://github.com/void-linux/void-packages/pull/26965
Description:
Includes changes from https://github.com/void-linux/void-packages/pull/26778 by @ndowens .
^ permalink raw reply [flat|nested] 37+ messages in thread