From e2a068293a10cfcb1cb8273a83f7bc08b39c87b6 Mon Sep 17 00:00:00 2001 From: mobinmob 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 " 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 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 " 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 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 " 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 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 " 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 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 " 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 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 " 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 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 " 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 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 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 " 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 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 " 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 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 " 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 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 " 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 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 " 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