Github messages for voidlinux
 help / color / mirror / Atom feed
From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] Cinnamon 4.8
Date: Tue, 19 Jan 2021 19:40:58 +0100	[thread overview]
Message-ID: <20210119184058.e48qLoHjOLtZoGtl4AE9pw3jJ_CeMWRS9p-pNh2vZKQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28035@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 728 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages cinna
https://github.com/void-linux/void-packages/pull/28035

[WIP] Cinnamon 4.8
<!-- Mark items with [x] where applicable -->

Closes #26965 

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

@mobinmob I have yet to search for new releases, but if you know of any I'm missing, please let me know.

A patch file from https://github.com/void-linux/void-packages/pull/28035.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinna-28035.patch --]
[-- Type: text/x-diff, Size: 38502 bytes --]

From 3ee7550ca78492864f6990cf6e80a1c3d17a9434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 19 Jan 2021 11:25:39 -0300
Subject: [PATCH 01/15] hooks/{pre,post}-install: fix 98-fixup-gir-path.

The libdir changes to use /usr/lib{32,64} instead of /usr/lib broke
cross builds for some packages that use gir, due to issues with copying
over symlinks. Since we haven't managed to track down the root cause for
the installation path, a symlink is a clean enough temporary fix. This
follows the style of the 00-libdir hooks.

Since pre-install runs for the main package and then each subpackage,
using PKGDESTDIR is the simplest way of avoiding errors with multiple
symlinks, but it's still creating (mostly, afaik) unnecessary symlinks
for each subpackage, since the path magic should be fully taken care of
in the main package during install.

As far as I can see, the previous hook was quite flawed. Since it was a
pre-install hook, the check for a directory would happen *before*
package installation (so nothing would happen). The only reason it did
anything was because it also ran as a step before a subpackage's
pkg_install (most GIR packages have a -devel subpackage), but used
DESTDIR instead of PKGDESTDIR, so it checked and affected the contents
of the main package. Then when the subpackage's pkg_install ran, the
files would have already been copied to the correct folders.

Closes #27437
---
 common/hooks/post-install/00-fixup-gir-path.sh | 11 +++++++++++
 common/hooks/pre-install/98-fixup-gir-path.sh  |  6 ++----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 common/hooks/post-install/00-fixup-gir-path.sh

diff --git a/common/hooks/post-install/00-fixup-gir-path.sh b/common/hooks/post-install/00-fixup-gir-path.sh
new file mode 100644
index 00000000000..6fdb111fa0b
--- /dev/null
+++ b/common/hooks/post-install/00-fixup-gir-path.sh
@@ -0,0 +1,11 @@
+# This hook removes the symlink necessary to fix the wrong install path of
+# 'gir' files when cross building packages (see pre-install hook). It's a
+# workaround and not a proper fix. Remove it once the root cause of the problem
+# is fixed.
+
+# Has to be a low number so it runs before remove-empty-dirs
+
+hook() {
+	[ -z "$CROSS_BUILD" ] && return
+	rm -f "${PKGDESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr"
+}
diff --git a/common/hooks/pre-install/98-fixup-gir-path.sh b/common/hooks/pre-install/98-fixup-gir-path.sh
index c81c8257294..64fd1405c4c 100644
--- a/common/hooks/pre-install/98-fixup-gir-path.sh
+++ b/common/hooks/pre-install/98-fixup-gir-path.sh
@@ -5,8 +5,6 @@
 
 hook() {
 	[ -z "$CROSS_BUILD" ] && return
-	if [ -d "${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr" ]; then
-		cp -a "${DESTDIR}"/usr/{${XBPS_CROSS_TRIPLET}/usr/*,}
-		rm -rf "${DESTDIR}"/usr/${XBPS_CROSS_TRIPLET}/usr
-	fi
+	vmkdir usr/${XBPS_CROSS_TRIPLET}
+	ln -sf ".." "${PKGDESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr"
 }

From 2d674ed671f6bb5b94d3c2d6b2ca6599a5f60e92 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:00 +0200
Subject: [PATCH 02/15] 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 d818e4223c4..6bdbb7946dc 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 automake
+hostmakedepends="gettext-devel glib-devel
  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 a1575553466bacec599fa566e33800e6bf14757d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:13 +0200
Subject: [PATCH 03/15] 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 6519316291e91295ffd6b350e6632ee4460595e6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:21 +0200
Subject: [PATCH 04/15] 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 4611ddd3ca0..d6a6c90d955 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 gobject-introspection intltool libtool pkg-config"
@@ -11,7 +11,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 e0fc2d896471f47707ebe982bba262bf06d1c610 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:28 +0200
Subject: [PATCH 05/15] 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 e45409aae8a..bd5eb2ea45e 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 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 2f172bbdf368ada05ab70435f9d4908f6a29c634 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:36 +0200
Subject: [PATCH 06/15] 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 4acae6168dc8c72ffebf234bc51f27780a1862b8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:42 +0200
Subject: [PATCH 07/15] cinnamon-settings-daemon: update to 4.8.2.

---
 srcpkgs/cinnamon-settings-daemon/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index a41b897347f..c3e3d95c9db 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,12 +1,11 @@
 # 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 automake
- gobject-introspection intltool libtool pkg-config"
+hostmakedepends="dbus-glib-devel gettext-devel glib-devel
+ gobject-introspection intltool pkg-config"
 makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
  libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
  nss-devel polkit-devel pulseaudio-devel upower-devel"
@@ -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 9133838d74ce718cc31e189ab533f8df889c6605 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:50 +0200
Subject: [PATCH 08/15] 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 6745e116373b7304fa6ae70f3e4607a84261b351 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:39 +0200
Subject: [PATCH 09/15] 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 5134e58e4196a08580b67022e300ab99abfcb830 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:27 +0200
Subject: [PATCH 10/15] xapps: update to 2.0.4, include changes by @ndowens.

Closes: #26965 [via git-merge-pr]
---
 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

From da4a14db586e22a30b2136e4a0cafeebdf8ee662 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:48 +0200
Subject: [PATCH 11/15] cjs: update to 4.8.1.

---
 srcpkgs/cjs/template | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 309dab47438..432b06d34e6 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,28 +1,29 @@
 # 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="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 2af22f1b0b8829c06cab9fcd62078b2c2e811616 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:58 +0200
Subject: [PATCH 12/15] 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 e68a0b52fe6f46af17ef6eb1d4f517528524f23d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:15 +0200
Subject: [PATCH 13/15] nemo: update to 4.8.2, include changes by @ndowens.

Also by ericonr:
- fix names in .desktop file to differentiate between them
---
 .../patches/{fix-gir-path.patch => meson.patch}     |  8 ++++++--
 srcpkgs/nemo/template                               | 13 ++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)
 rename srcpkgs/nemo/patches/{fix-gir-path.patch => meson.patch} (51%)

diff --git a/srcpkgs/nemo/patches/fix-gir-path.patch b/srcpkgs/nemo/patches/meson.patch
similarity index 51%
rename from srcpkgs/nemo/patches/fix-gir-path.patch
rename to srcpkgs/nemo/patches/meson.patch
index 317b031af15..d6d43a09c4e 100644
--- a/srcpkgs/nemo/patches/fix-gir-path.patch
+++ b/srcpkgs/nemo/patches/meson.patch
@@ -1,11 +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,7 @@
+@@ -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')
++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 ef869db4d31..4b32d9ab972 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=4.6.5
+version=4.8.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,19 +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
+	vsed -i 's/^Name.*=.*/& - Nemo/' data/nemo.desktop.in
 }
 
 libnemo_package() {

From 565555e1c403f1eee1d1a7446d82dcf110f7bd48 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:20 +0200
Subject: [PATCH 14/15] 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 b52ce03007a75435cdf4cf592606a5d237cd7c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 19 Jan 2021 12:18:22 -0300
Subject: [PATCH 15/15] mozjs52: remove package.

---
 srcpkgs/mozjs52-devel                         |  1 -
 .../patches/mozjs52-copy-headers.patch        | 30 ---------
 .../patches/mozjs52-disable-mozglue.patch     | 66 ------------------
 .../mozjs52/patches/mozjs52-fix-soname.patch  | 34 ----------
 .../mozjs52-include-configure-script.patch    | 48 -------------
 srcpkgs/mozjs52/patches/mozjs52.pc.patch      |  8 ---
 srcpkgs/mozjs52/template                      | 67 -------------------
 srcpkgs/mozjs52/update                        |  1 -
 8 files changed, 255 deletions(-)
 delete mode 120000 srcpkgs/mozjs52-devel
 delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch
 delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch
 delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch
 delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch
 delete mode 100644 srcpkgs/mozjs52/patches/mozjs52.pc.patch
 delete mode 100644 srcpkgs/mozjs52/template
 delete mode 100644 srcpkgs/mozjs52/update

diff --git a/srcpkgs/mozjs52-devel b/srcpkgs/mozjs52-devel
deleted file mode 120000
index c5eb332bc27..00000000000
--- a/srcpkgs/mozjs52-devel
+++ /dev/null
@@ -1 +0,0 @@
-mozjs52
\ No newline at end of file
diff --git a/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch b/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch
deleted file mode 100644
index 69b216151e0..00000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8b2d7a77bfb4dbd513763501ed7e9722058ee9af Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 5 Jul 2017 22:45:59 -0700
-Subject: [PATCH] build: Copy headers on install instead of symlinking
-
-Patch ported forward to mozjs52 by Philip Chimento
-<philip.chimento@gmail.com>.
----
- python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
-index 132dcf94..33d489a6 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1307,11 +1307,11 @@ def _process_final_target_files(self, obj, files, backend_file):
-                                 raise Exception("Wildcards are only supported in the filename part of "
-                                                 "srcdir-relative or absolute paths.")
- 
--                            install_manifest.add_pattern_symlink(basepath, wild, path)
-+                            install_manifest.add_pattern_copy(basepath, wild, path)
-                         else:
--                            install_manifest.add_pattern_symlink(f.srcdir, f, path)
-+                            install_manifest.add_pattern_copy(f.srcdir, f, path)
-                     else:
--                        install_manifest.add_symlink(f.full_path, dest)
-+                        install_manifest.add_copy(f.full_path, dest)
-                 else:
-                     install_manifest.add_optional_exists(dest)
-                     backend_file.write('%s_FILES += %s\n' % (
diff --git a/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch b/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch
deleted file mode 100644
index 8355cf4b0ea..00000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7e6d628456af3e99ebcb9a01a27e1461585082a4 Mon Sep 17 00:00:00 2001
-From: Till Schneidereit <till@tillschneidereit.net>
-Date: Thu, 1 Oct 2015 12:59:09 +0200
-Subject: [PATCH] Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all
- platforms
-
-Otherwise, build fails not being able to find HashBytes.
-
-Patch ported forward to mozjs52 by Philip Chimento
-<philip.chimento@gmail.com>.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1176787
----
- js/src/old-configure.in | 23 ++++++++++++++---------
- mozglue/build/moz.build |  2 +-
- 2 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 1c5c9e21..ff0617e3 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1623,16 +1623,21 @@ dnl ========================================================
- dnl = Enable jemalloc
- dnl ========================================================
- 
--case "${OS_TARGET}" in
--Android|WINNT|Darwin)
-+dnl In stand-alone builds we always only want to link executables against mozglue.
-+if test "$JS_STANDALONE"; then
-   MOZ_GLUE_IN_PROGRAM=
--  ;;
--*)
--  dnl On !Android !Windows !OSX, we only want to link executables against mozglue
--  MOZ_GLUE_IN_PROGRAM=1
--  AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
--  ;;
--esac
-+else
-+  case "${OS_TARGET}" in
-+  Android|WINNT|Darwin)
-+    MOZ_GLUE_IN_PROGRAM=
-+    ;;
-+  *)
-+    dnl On !Android !Windows !OSX, we only want to link executables against mozglue
-+    MOZ_GLUE_IN_PROGRAM=1
-+    AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
-+    ;;
-+  esac
-+fi
- 
- if test "$MOZ_MEMORY"; then
-   if test "x$MOZ_DEBUG" = "x1"; then
-diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
-index d2897477..e3be5a2b 100644
---- a/mozglue/build/moz.build
-+++ b/mozglue/build/moz.build
-@@ -6,7 +6,7 @@
- 
- # Build mozglue as a shared lib on Windows, OSX and Android.
- # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
--if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
-+if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']:
-     SharedLibrary('mozglue')
- else:
-     Library('mozglue')
-
diff --git a/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch b/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch
deleted file mode 100644
index a91107c1568..00000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Laszlo Boszormenyi (GCS) <gcs@debian.org>
-Date: Fri, 02 May 2014 22:20:45 +0200
-Subject: fix soname
-
-Add soname switch to linker, regardless of Operating System
-
-Bug-Debian: http://bugs.debian.org/746705
----
- config/rules.mk | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: mozjs52-52.2.1~artful1/config/rules.mk
-===================================================================
---- mozjs52-52.2.1~artful1.orig/config/rules.mk
-+++ mozjs52-52.2.1~artful1/config/rules.mk
-@@ -418,7 +418,7 @@ endif # AIX
- #
- # Linux: add -Bsymbolic flag for components
- #
--ifeq ($(OS_ARCH),Linux)
-+#ifeq ($(OS_ARCH),Linux)
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
- endif
-@@ -426,7 +426,8 @@ ifdef LD_VERSION_SCRIPT
- EXTRA_DSO_LDOPTS += -Wl,--version-script,$(LD_VERSION_SCRIPT)
- EXTRA_DEPS += $(LD_VERSION_SCRIPT)
- endif
--endif
-+#endif
-+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
- 
- ifdef SYMBOLS_FILE
- ifeq ($(OS_TARGET),WINNT)
diff --git a/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch b/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch
deleted file mode 100644
index c24d7b157f3..00000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4a06a1a6a71293decb83aee7adb74bc709493106 Mon Sep 17 00:00:00 2001
-From: Philip Chimento <philip.chimento@gmail.com>
-Date: Wed, 5 Jul 2017 22:57:09 -0700
-Subject: [PATCH] build: Include configure script, be nicer about options
-
-A configure script is not included in the SpiderMonkey tarball by
-default. Also, we have to account for JHbuild passing extra unknown
-options like --disable-Werror.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1379540
----
- js/src/configure                               | 9 +++++++++
- python/mozbuild/mozbuild/configure/__init__.py | 2 +-
- python/mozbuild/mozbuild/configure/options.py  | 6 +++++-
- 3 files changed, 15 insertions(+), 2 deletions(-)
- create mode 100755 js/src/configure
-
-diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
-index 0fe640ca..09b460d3 100644
---- a/python/mozbuild/mozbuild/configure/__init__.py
-+++ b/python/mozbuild/mozbuild/configure/__init__.py
-@@ -356,7 +356,7 @@ def run(self, path=None):
-         # All options should have been removed (handled) by now.
-         for arg in self._helper:
-             without_value = arg.split('=', 1)[0]
--            raise InvalidOptionError('Unknown option: %s' % without_value)
-+            print('Ignoring', without_value, ': Unknown option')
- 
-         # Run the execution queue
-         for func, args in self._execution_queue:
-diff --git a/python/mozbuild/mozbuild/configure/options.py b/python/mozbuild/mozbuild/configure/options.py
-index 4310c862..15bfe425 100644
---- a/python/mozbuild/mozbuild/configure/options.py
-+++ b/python/mozbuild/mozbuild/configure/options.py
-@@ -402,7 +402,11 @@ def __init__(self, environ=os.environ, argv=sys.argv):
- 
-     def add(self, arg, origin='command-line', args=None):
-         assert origin != 'default'
--        prefix, name, values = Option.split_option(arg)
-+        try:
-+            prefix, name, values = Option.split_option(arg)
-+        except InvalidOptionError as e:
-+            print('Ignoring', arg, ':', e)
-+            return
-         if args is None:
-             args = self._extra_args
-         if args is self._extra_args and name in self._extra_args:
-
diff --git a/srcpkgs/mozjs52/patches/mozjs52.pc.patch b/srcpkgs/mozjs52/patches/mozjs52.pc.patch
deleted file mode 100644
index 6d85bb05f4e..00000000000
--- a/srcpkgs/mozjs52/patches/mozjs52.pc.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/js/src/js.pc.in
-+++ b/js/src/js.pc.in
-@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript
- Version: @MOZILLA_VERSION@
- @PKGCONF_REQUIRES_PRIVATE@
- Libs: -L${libdir} -l@JS_LIBRARY_NAME@
--Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@
-+Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@
diff --git a/srcpkgs/mozjs52/template b/srcpkgs/mozjs52/template
deleted file mode 100644
index 383767ea777..00000000000
--- a/srcpkgs/mozjs52/template
+++ /dev/null
@@ -1,67 +0,0 @@
-# Template file for 'mozjs52'
-pkgname=mozjs52
-version=52.9.0
-revision=7
-wrksrc="firefox-${version}esr"
-build_wrksrc="js/src"
-build_style=gnu-configure
-hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive which"
-makedepends="icu-devel libffi-devel nspr-devel zlib-devel readline-devel"
-depends="nspr>=4.13.1"
-short_desc="Mozilla JavaScript interpreter and library (52.x series)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6
-patch_args="-Np1"
-
-# Flags for gcc6.3 conceived by Arch Linux developers
-CFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing"
-CXXFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing"
-# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
-LDFLAGS="-fuse-ld=bfd"
-# Flags for gcc9.1
-CFLAGS+=" -Wno-format-overflow"
-CXXFLAGS+=" -Wno-format-overflow"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-fi
-
-do_configure() {
-	local _args
-
-	if [ "$CROSS_BUILD" ]; then
-		export HOST_CFLAGS="-Os"
-		export HOST_CXXFLAGS="-Os"
-		_args+=" --target=$XBPS_CROSS_TRIPLET"
-	fi
-
-	touch ${wrksrc}/js/src/configure
-	SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-		--disable-jemalloc --disable-optimize --enable-ctypes \
-		--enable-gcgenerational --enable-pie --enable-readline \
-		--enable-shared-js --enable-system-ffi --enable-tests \
-		--enable-threadsafe --enable-xterm-updates --with-intl-api \
-		--with-system-icu --with-system-nspr --with-system-zlib \
-		${_args}
-}
-
-post_install() {
-	mv $DESTDIR/usr/lib/libmozjs-52.so $DESTDIR/usr/lib/libmozjs-52.so.0
-	ln -sr $DESTDIR/usr/lib/libmozjs-52.so.0 $DESTDIR/usr/lib/libmozjs-52.so
-}
-
-mozjs52-devel_package() {
-	depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/js52-config
-		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.ajs"
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/mozjs52/update b/srcpkgs/mozjs52/update
deleted file mode 100644
index a1c3f7e43b0..00000000000
--- a/srcpkgs/mozjs52/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="mozjs"

  parent reply	other threads:[~2021-01-19 18:40 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-19 15:15 [PR PATCH] " ericonr
2021-01-19 15:18 ` [PR PATCH] [Updated] " ericonr
2021-01-19 15:48 ` ericonr
2021-01-19 18:40 ` ericonr [this message]
2021-01-19 19:39 ` ericonr
2021-01-19 20:11 ` mobinmob
2021-01-19 21:44 ` ericonr
2021-01-20  1:09 ` ericonr
2021-01-20  1:18 ` [PR PATCH] [Updated] " sgn
2021-01-20  1:22 ` sgn
2021-01-20 19:48 ` ericonr
2021-01-21  4:00 ` [PR PATCH] [Updated] " ericonr
2021-01-24 21:08 ` [PR PATCH] [Merged]: " ericonr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210119184058.e48qLoHjOLtZoGtl4AE9pw3jJ_CeMWRS9p-pNh2vZKQ@z \
    --to=ericonr@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).