From b6a76113d7ac3d5755127f9df3cf06ad8b283feb Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Mon, 20 Nov 2023 01:09:39 +0200 Subject: [PATCH 01/23] nemo: update to 6.0.0. --- srcpkgs/nemo/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template index f4fbde7c6452c..f665836801abc 100644 --- a/srcpkgs/nemo/template +++ b/srcpkgs/nemo/template @@ -1,7 +1,7 @@ # Template file for 'nemo' pkgname=nemo -version=5.8.5 -revision=2 +version=6.0.0 +revision=1 build_style=meson build_helper=gir pycompile_dirs="/usr/share/nemo/actions/myaction.py" @@ -13,9 +13,9 @@ short_desc="Cinnamon file manager (nautilus fork)" maintainer="Jami Kettunen " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/linuxmint/nemo" -changelog="https://raw.githubusercontent.com/linuxmint/nemo/5.8-maintenance/debian/changelog" +changelog="https://raw.githubusercontent.com/linuxmint/nemo/master/debian/changelog" distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz" -checksum=eee308a5ae473c77bdf5fa870eff79087485b859a11de501df2d34e91bad174b +checksum=ea1081a2dc7b4b51d1663086300cf32960ca1e67523be16c18d4609c95a381a1 python_version=3 # Requires xvfb-run and dbus-run-session make_check=no # can't be run inside chroot due to fusermount3 From 9960efbdabc557830341ab67c209baaadc9ada66 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:04:38 +0000 Subject: [PATCH 02/23] cinnamon-control-center: update to 6.0.0. --- srcpkgs/cinnamon-control-center/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template index 0d24f6c29e952..f4a65f2652986 100644 --- a/srcpkgs/cinnamon-control-center/template +++ b/srcpkgs/cinnamon-control-center/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-control-center' pkgname=cinnamon-control-center -version=5.8.2 +version=6.0.0 revision=1 build_style=meson build_helper=gir @@ -16,8 +16,8 @@ short_desc="Cinnamon Control Center" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/linuxmint/cinnamon-control-center" -distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=8905b9ddf0c9b8ef98c47c2f4a1fd5e0b944d4955a05b4534b1c54d13c7241e5 +distfiles="https://github.com/linuxmint/cinnamon-control-center/archive/${version}.tar.gz" +checksum=8dcf3b1a5e0388f5292de27120482c692a79e7c31aea583301ad083a8c449532 # requires X and wacom devices? make_check=no From 2e838f3611ce5b8744444cff88cc095e0eca1cf7 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:04:41 +0000 Subject: [PATCH 03/23] cinnamon-desktop: update to 6.0.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 a61bb56b55879..c9ccffd68c5b9 100644 --- a/srcpkgs/cinnamon-desktop/template +++ b/srcpkgs/cinnamon-desktop/template @@ -1,7 +1,7 @@ # Template file for 'cinnamon-desktop' pkgname=cinnamon-desktop -version=5.8.0 -revision=2 +version=6.0.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://github.com/linuxmint/cinnamon-desktop" distfiles="https://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz" -checksum=53080bd27527a8271d659e143a8d3b333d9b85efc82b77e571075f9cf8d3287c +checksum=17473083758acac9ca580849c88a2ac4bcc2fe715ee232fbecfa0baf2204bbb5 cinnamon-desktop-devel_package() { depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}" From 877def7a2e4e8463af64fd6322e6353b6f9b9bfc Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:04:43 +0000 Subject: [PATCH 04/23] cinnamon-menus: update to 6.0.0. --- srcpkgs/cinnamon-menus/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template index e923c3cc86324..49fee3468f15a 100644 --- a/srcpkgs/cinnamon-menus/template +++ b/srcpkgs/cinnamon-menus/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-menus' pkgname=cinnamon-menus -version=5.8.0 +version=6.0.0 revision=1 build_style=meson build_helper=gir @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/linuxmint/cinnamon-menus" distfiles="https://github.com/linuxmint/cinnamon-menus/archive/${version}.tar.gz" -checksum=99c4336ea5d87f01cbf19b40c8200dde933aebd73fe87b83cc11361bea5b6626 +checksum=d0afb32f4e18fe4b3fa69bd3e9754c7dc6195d33a3d9dcc2ce22e798c7f5f253 cinnamon-menus-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 8b97e0be62dcac7352b0a6f8354fdca9a96235c1 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:04:56 +0000 Subject: [PATCH 05/23] cinnamon-screensaver: update to 6.0.0. --- ...8ed18f35591f2bd99043f12c06d98b4527db.patch | 42 +++++++++++++++++++ srcpkgs/cinnamon-screensaver/template | 6 +-- 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/cinnamon-screensaver/patches/37ab8ed18f35591f2bd99043f12c06d98b4527db.patch diff --git a/srcpkgs/cinnamon-screensaver/patches/37ab8ed18f35591f2bd99043f12c06d98b4527db.patch b/srcpkgs/cinnamon-screensaver/patches/37ab8ed18f35591f2bd99043f12c06d98b4527db.patch new file mode 100644 index 0000000000000..043c6ce5c18b7 --- /dev/null +++ b/srcpkgs/cinnamon-screensaver/patches/37ab8ed18f35591f2bd99043f12c06d98b4527db.patch @@ -0,0 +1,42 @@ +From 37ab8ed18f35591f2bd99043f12c06d98b4527db Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Thu, 7 Dec 2023 09:05:41 -0500 +Subject: [PATCH] cinnamon-screensaver-main.py: Fix application theme provider. + +We relied on the return value from Gtk.CssProvider.load_from_data +method to determine whether or not to apply the fallback theme. + +The return value itself was deprecated, but still works in Gtk3. +Unfortunately a change was recently made in pygobject that overrides +this method, and since the return value is removed in Gtk4, it +was removed from this override, so is always interpreted as False. + +Use try/except instead, as that method can still raise an error +upon failure. + +Fixes #446 + +Ref: +https://gitlab.gnome.org/GNOME/pygobject/-/merge_requests/231 +--- + src/cinnamon-screensaver-main.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/cinnamon-screensaver-main.py b/src/cinnamon-screensaver-main.py +index 05b727c..5c5e486 100755 +--- a/src/cinnamon-screensaver-main.py ++++ b/src/cinnamon-screensaver-main.py +@@ -139,9 +139,12 @@ def do_style_overrides(self): + + fallback_prov = Gtk.CssProvider() + +- if fallback_prov.load_from_data(fallback_css.encode()): ++ try: ++ fallback_prov.load_from_data(fallback_css.encode()) + Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default(), fallback_prov, 600) + Gtk.StyleContext.reset_widgets(Gdk.Screen.get_default()) ++ except Exception as e: ++ print("Could not parse fallback css: %s" % str(e)) + + if __name__ == "__main__": + setproctitle.setproctitle('cinnamon-screensaver') diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template index 906f49f861ea5..d3c5cbc90f4b7 100644 --- a/srcpkgs/cinnamon-screensaver/template +++ b/srcpkgs/cinnamon-screensaver/template @@ -1,7 +1,7 @@ # Template file for 'cinnamon-screensaver' pkgname=cinnamon-screensaver -version=5.8.1 -revision=2 +version=6.0.0 +revision=1 build_style=meson build_helper="gir" hostmakedepends="gettext-devel glib-devel pkg-config python3-devel" @@ -16,7 +16,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/linuxmint/cinnamon-screensaver" distfiles="https://github.com/linuxmint/cinnamon-screensaver/archive/${version}.tar.gz" -checksum=8959f03a9e7e2b2760a8fb5c7129d2431021ca193ff4ebcac59c4bbda95a8319 +checksum=77fc1fbbb9965e80467bf3a95c6e0e5c60e6318de15ca5d63d898a4d8f6f9cb4 python_version=3 pycompile_dirs="/usr/share/cinnamon-screensaver" From 41be3d9156897b6a27ec096939cb714e5b723759 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:15 +0000 Subject: [PATCH 06/23] cinnamon-session: update to 6.0.1. --- srcpkgs/cinnamon-session/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template index 6dad113168c6e..a1b168ed0bd55 100644 --- a/srcpkgs/cinnamon-session/template +++ b/srcpkgs/cinnamon-session/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-session' pkgname=cinnamon-session -version=5.8.1 +version=6.0.1 revision=1 build_style=meson build_helper="gir" @@ -8,11 +8,11 @@ hostmakedepends="pkg-config gettext-devel dbus-glib-devel glib-devel intltool xmlto" makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel cinnamon-desktop-devel libcanberra-devel upower-devel - elogind-devel libXtst-devel xapps-devel" + elogind-devel libXtst-devel xapps-devel libglib-devel" depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind" short_desc="Cinnamon session handler" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/linuxmint/cinnamon-session" distfiles="https://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz" -checksum=bf8a4b622900c3b9c3d917bcacc1bbaed74aa07c69270f6fc53783a65b4687eb +checksum=061a4a75207a57a5735aa63d6cf0c20cc6ef430bde8c75f1c81698b15c46dc8e From acd27d2a07d6706473a2abc2901a9eb286f673a6 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:16 +0000 Subject: [PATCH 07/23] cinnamon-settings-daemon: update to 6.0.0. --- srcpkgs/cinnamon-settings-daemon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template index e1a57b6c27814..df78452e2b01a 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-settings-daemon' pkgname=cinnamon-settings-daemon -version=5.8.1 +version=6.0.0 revision=1 build_style=meson build_helper="gir" @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/linuxmint/cinnamon-settings-daemon" distfiles="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${version}.tar.gz" -checksum=8b8a80b24755061128e45a064dc8320ce94b7f9bc9e13fd66fc5fae07e9de3a4 +checksum=dd08305359d4d8cae5ff5d5447d8043a4b1b4b63e08d633b9a00e9f5bb3a977b cinnamon-settings-daemon-devel_package() { short_desc+=" - development files" From 2e957fd636eb2da31dcba7d976638394b8339bf0 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:17 +0000 Subject: [PATCH 08/23] cinnamon-translations: update to 6.0.1. --- srcpkgs/cinnamon-translations/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template index 794d42bb0dcd8..909ae40446c80 100644 --- a/srcpkgs/cinnamon-translations/template +++ b/srcpkgs/cinnamon-translations/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-translations' pkgname=cinnamon-translations -version=5.8.2 +version=6.0.1 revision=1 build_style=gnu-makefile hostmakedepends="gettext" @@ -9,7 +9,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/linuxmint/cinnamon-translations/" distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}/cinnamon-translations-${version}.tar.gz" -checksum=3c4454696bd5d57d96dbbde10232c72b575d6e6e5364c657836967aa783ab0c8 +checksum=b3147c244a963aa9a43e4c1096d6f9ff8f559c87cf2eed105d38e4fa900a6f02 do_install() { vmkdir usr From f2ce5f906c4da59638744d4e2193343d48e50249 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:19 +0000 Subject: [PATCH 09/23] cinnamon: update to 6.0.0. --- srcpkgs/cinnamon/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index c64c953fe824e..517bfc3845342 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,14 +1,14 @@ # Template file for 'cinnamon' pkgname=cinnamon -version=5.8.4 -revision=2 +version=6.0.0 +revision=1 build_style=meson build_helper="gir" hostmakedepends="pkg-config 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 xapps-devel + startup-notification-devel pulseaudio-devel dbus-devel xapps-devel libgnome-keyring-devel NetworkManager-devel libcroco-devel cinnamon-desktop-devel" depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*} @@ -18,15 +18,15 @@ depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*} gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify - python3-tinycss python3-pytz python3-distro python3-requests libtimezonemap - libsoup" + python3-tinycss2 python3-pytz python3-distro python3-requests libtimezonemap + libsoup3" short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/linuxmint/cinnamon" changelog="https://raw.githubusercontent.com/linuxmint/cinnamon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/cinnamon/archive/${version}.tar.gz" -checksum=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c +checksum=67791494408be87edd4ef5da25503665b48cd0538c1b21f30f989a4155e55d1e python_version=3 pycompile_dirs=" From 7e0825f998b11ca479333776cf81fb6b43e2fc5f Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:50 +0000 Subject: [PATCH 10/23] cjs: update to 6.0.0. --- ...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 ------------------- srcpkgs/cjs/template | 4 +- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch deleted file mode 100644 index 3c1c7e0599f47..0000000000000 --- a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fb480aae4eff422c3acd275c0108e970eafcdcb9 Mon Sep 17 00:00:00 2001 -From: Dominik Opyd -Date: Wed, 8 Mar 2023 15:13:56 +0100 -Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place - ---- - installed-tests/js/meson.build | 10 +++++++--- - meson.build | 4 ---- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build -index 62a935d1..877d18df 100644 ---- a/installed-tests/js/meson.build -+++ b/installed-tests/js/meson.build -@@ -203,9 +203,13 @@ endif - # during build should be run using dbus-run-session - - dbus_tests = ['GDBus'] --if have_gtk4 and not get_option('skip_gtk_tests') -- # FIXME: find out why GTK4 tries to acquire a message bus -- dbus_tests += 'Gtk4' -+if not get_option('skip_gtk_tests') -+ have_gtk4 = dependency('gtk4', required: false).found() -+ -+ if have_gtk4 -+ # FIXME: find out why GTK4 tries to acquire a message bus -+ dbus_tests += 'Gtk4' -+ endif - endif - - bus_config = files('../../test/test-bus.conf') -diff --git a/meson.build b/meson.build -index 7bde6204..2bb38fa5 100644 ---- a/meson.build -+++ b/meson.build -@@ -679,10 +679,6 @@ endif - - ### Tests and test setups ###################################################### - --if not get_option('skip_gtk_tests') -- have_gtk4 = dependency('gtk4', required: false).found() --endif -- - subdir('installed-tests') - - # Note: The test program in test/ needs to be ported diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template index 319bae6b2b130..f82cc052649c4 100644 --- a/srcpkgs/cjs/template +++ b/srcpkgs/cjs/template @@ -1,6 +1,6 @@ # Template file for 'cjs' pkgname=cjs -version=5.8.0 +version=6.0.0 revision=1 build_style=meson build_helper="gir" @@ -13,7 +13,7 @@ maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="https://github.com/linuxmint/cjs" distfiles="https://github.com/linuxmint/cjs/archive/refs/tags/${version}.tar.gz" -checksum=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2 +checksum=916f6fde42eb09b34a6c8ed0875a301d02c8f4588cadae660c0d4cb9e701bae2 make_check_pre="xvfb-run" pre_configure() { From 77086bc6e9a449869d2f6acb65df974f6d3ee853 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:52 +0000 Subject: [PATCH 11/23] muffin: update to 6.0.0. --- srcpkgs/muffin/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template index eb9f61b98bdd5..d1b2cbb7f22aa 100644 --- a/srcpkgs/muffin/template +++ b/srcpkgs/muffin/template @@ -1,6 +1,6 @@ # Template file for 'muffin' pkgname=muffin -version=5.8.1 +version=6.0.0 revision=1 build_style=meson build_helper="gir" @@ -8,9 +8,9 @@ build_helper="gir" configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=true -Dudev=true -Dsm=true -Dlibwacom=true -Dpango_ft2=true -Dstartup_notification=true -Dremote_desktop=true -Dintrospection=true - -Dprofiler=false -Ddebug=false -Ddefault_driver=auto" + -Dprofiler=false -Ddebug=false -Ddefault_driver=auto -Dwayland=false" hostmakedepends="gdk-pixbuf-devel gettext-devel-tools glib-devel - intltool pkg-config wayland-devel wayland-protocols" + intltool pkg-config wayland-devel wayland-protocols libxcvt" makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel libglib-devel graphene-devel gtk+3-devel gdk-pixbuf-devel pango-devel cairo-devel upower-devel libXcomposite-devel libxkbcommon-devel @@ -19,7 +19,8 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel libXinerama-devel libICE-devel dbus-devel libglvnd-devel eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel - libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel" + libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel + elogind-devel" depends="zenity" short_desc="Cinnamon window manager based on Mutter" maintainer="Orphaned " @@ -27,7 +28,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/linuxmint/muffin" changelog="https://raw.githubusercontent.com/linuxmint/muffin/master/debian/changelog" distfiles="https://github.com/linuxmint/muffin/archive/${version}.tar.gz" -checksum=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6 +checksum=dc05d10020fc92063eae70558d80f3ae9e82bf00d2f8ee1ecf2c1b9cef9479cd post_install() { vmkdir usr/share/gir-1.0 From 5dbf86865ba9341295a3e5c251aa03011403ebe0 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:53 +0000 Subject: [PATCH 12/23] nemo-audio-tab: update to 6.0.0. --- srcpkgs/nemo-audio-tab/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nemo-audio-tab/template b/srcpkgs/nemo-audio-tab/template index 2d2ec5ac55b00..c3b488e6630e6 100644 --- a/srcpkgs/nemo-audio-tab/template +++ b/srcpkgs/nemo-audio-tab/template @@ -1,7 +1,7 @@ # Template file for 'nemo-audio-tab' pkgname=nemo-audio-tab -version=5.8.0 -revision=2 +version=6.0.0 +revision=1 build_wrksrc=nemo-audio-tab build_style=python3-module hostmakedepends="pkg-config python3-setuptools" @@ -12,4 +12,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/linuxmint/nemo-extensions" distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz" -checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28 +checksum=e87ab3fc803c2d0f7bee4bbbbf9074382469352774caeafc88a10b969097cf82 From b4bf6a5bcaedf7452210235da5eda625f42c649c Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:55 +0000 Subject: [PATCH 13/23] nemo-compare: update to 6.0.0. --- srcpkgs/nemo-compare/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template index ed5163f9fd109..d6c8d7705a3c8 100644 --- a/srcpkgs/nemo-compare/template +++ b/srcpkgs/nemo-compare/template @@ -1,7 +1,7 @@ # Template file for 'nemo-compare' pkgname=nemo-compare -version=5.8.1 -revision=2 +version=6.0.0 +revision=1 build_wrksrc=nemo-compare build_style=python3-module hostmakedepends="pkg-config python3-setuptools" @@ -11,6 +11,6 @@ short_desc="Nemo compare extension" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/linuxmint/nemo-extensions" -# distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz" -distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz" -checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784 +# distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz" +distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz" +checksum=e87ab3fc803c2d0f7bee4bbbbf9074382469352774caeafc88a10b969097cf82 From 0176a6d03560d3eeae536317dc308d8200703d47 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:56 +0000 Subject: [PATCH 14/23] nemo-emblems: update to 6.0.0. --- srcpkgs/nemo-emblems/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nemo-emblems/template b/srcpkgs/nemo-emblems/template index 4e1cb6726d9e3..3911e747458f8 100644 --- a/srcpkgs/nemo-emblems/template +++ b/srcpkgs/nemo-emblems/template @@ -1,7 +1,7 @@ # Template file for 'nemo-emblems' pkgname=nemo-emblems -version=5.8.0 -revision=2 +version=6.0.0 +revision=1 build_wrksrc=nemo-emblems build_style=python3-module hostmakedepends="pkg-config python3-setuptools" @@ -12,4 +12,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/linuxmint/nemo-extensions" distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz" -checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28 +checksum=e87ab3fc803c2d0f7bee4bbbbf9074382469352774caeafc88a10b969097cf82 From 31e4712e4940e576d8aac2f8924a7c03a6b169c1 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:58 +0000 Subject: [PATCH 15/23] nemo-extensions: update to 6.0.0. --- srcpkgs/nemo-extensions/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template index 401c7e515c5d3..90a8b3b6cf930 100644 --- a/srcpkgs/nemo-extensions/template +++ b/srcpkgs/nemo-extensions/template @@ -1,6 +1,6 @@ # Template file for 'nemo-extensions' pkgname=nemo-extensions -version=5.8.0 +version=6.0.0 revision=1 build_style=meta depends=" From ea3254d5b1d5dc78ab14597d2bc71d398c34a97a Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:05:59 +0000 Subject: [PATCH 16/23] nemo-fileroller: update to 6.0.0. --- srcpkgs/nemo-fileroller/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template index 8fa00c1b719f2..1a714d15e470e 100644 --- a/srcpkgs/nemo-fileroller/template +++ b/srcpkgs/nemo-fileroller/template @@ -1,6 +1,6 @@ # Template file for 'nemo-fileroller' pkgname=nemo-fileroller -version=5.8.0 +version=6.0.0 revision=1 build_wrksrc=nemo-fileroller build_style=meson @@ -12,4 +12,4 @@ maintainer="Mohammed Anas " license="GPL-2.0-or-later" homepage="https://github.com/linuxmint/nemo-extensions" distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz" -checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28 +checksum=e87ab3fc803c2d0f7bee4bbbbf9074382469352774caeafc88a10b969097cf82 From 675b6019e266dc0e0f4c233ee171fb2522bc887b Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:06:01 +0000 Subject: [PATCH 17/23] nemo-preview: update to 6.0.0. --- srcpkgs/nemo-preview/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template index c5591bbca361e..e36e39cd0f206 100644 --- a/srcpkgs/nemo-preview/template +++ b/srcpkgs/nemo-preview/template @@ -1,6 +1,6 @@ # Template file for 'nemo-preview' pkgname=nemo-preview -version=5.8.0 +version=6.0.0 revision=1 build_wrksrc=nemo-preview build_style=meson @@ -14,4 +14,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/linuxmint/nemo-extensions" distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz" -checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28 +checksum=e87ab3fc803c2d0f7bee4bbbbf9074382469352774caeafc88a10b969097cf82 From 7e74d345b81ac75934e870d1421b113aa6cb8efb Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:06:02 +0000 Subject: [PATCH 18/23] nemo-python: update to 6.0.0. --- srcpkgs/nemo-python/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nemo-python/template b/srcpkgs/nemo-python/template index 009b05c1fb3b8..f4708ae77fb55 100644 --- a/srcpkgs/nemo-python/template +++ b/srcpkgs/nemo-python/template @@ -1,7 +1,7 @@ # Template file for 'nemo-python' pkgname=nemo-python -version=5.8.0 -revision=2 +version=6.0.0 +revision=1 build_wrksrc=nemo-python build_style=meson hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/linuxmint/nemo-extensions" distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz" -checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28 +checksum=e87ab3fc803c2d0f7bee4bbbbf9074382469352774caeafc88a10b969097cf82 From 0ad57e5e4b4d0fb9d11199a854e585383a65ee86 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:06:03 +0000 Subject: [PATCH 19/23] nemo-terminal: update to 6.0.0. --- srcpkgs/nemo-terminal/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nemo-terminal/template b/srcpkgs/nemo-terminal/template index 6f863a8aedb91..8a316d283dcfb 100644 --- a/srcpkgs/nemo-terminal/template +++ b/srcpkgs/nemo-terminal/template @@ -1,7 +1,7 @@ # Template file for 'nemo-terminal' pkgname=nemo-terminal -version=5.8.0 -revision=2 +version=6.0.0 +revision=1 build_wrksrc=nemo-terminal build_style=python3-module hostmakedepends="pkg-config python3-setuptools" @@ -12,4 +12,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/linuxmint/nemo-extensions" distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz" -checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28 +checksum=e87ab3fc803c2d0f7bee4bbbbf9074382469352774caeafc88a10b969097cf82 From 77be1c29a480f826fd89b1b22e29943e3efd9662 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:06:40 +0000 Subject: [PATCH 20/23] nemo-image-converter: update to 6.0.0. --- srcpkgs/nemo-image-converter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nemo-image-converter/template b/srcpkgs/nemo-image-converter/template index e4a69222c4545..2cc84bb8e5f15 100644 --- a/srcpkgs/nemo-image-converter/template +++ b/srcpkgs/nemo-image-converter/template @@ -1,6 +1,6 @@ # Template file for 'nemo-image-converter' pkgname=nemo-image-converter -version=5.8.0 +version=6.0.0 revision=1 build_wrksrc=nemo-image-converter build_style=meson @@ -12,4 +12,4 @@ 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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28 +checksum=e87ab3fc803c2d0f7bee4bbbbf9074382469352774caeafc88a10b969097cf82 From 0fe0b5cb7e02fd0eb4ed91940314e01793ee61c5 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:06:45 +0000 Subject: [PATCH 21/23] timeshift: update to 23.12.1. --- srcpkgs/timeshift/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template index 05a171c266e9f..cb572761166de 100644 --- a/srcpkgs/timeshift/template +++ b/srcpkgs/timeshift/template @@ -1,6 +1,6 @@ # Template file for 'timeshift' pkgname=timeshift -version=23.06.2 +version=23.12.1 revision=1 build_style=meson hostmakedepends="gettext pkg-config vala help2man" @@ -13,7 +13,7 @@ license="GPL-3.0-only" homepage="https://github.com/linuxmint/timeshift" changelog="https://raw.githubusercontent.com/linuxmint/timeshift/master/debian/changelog" distfiles="https://github.com/linuxmint/timeshift/archive/${version}/timeshift-${version}.tar.gz" -checksum=a88c947a70e850fcac11e34484bd9074ec48302998f9d734f579387b5b88eeaf +checksum=ebfa37a5a3e7d8197bf935302512df100c95008749a605cccbfef0cd038a703f if [ "$CROSS_BUILD" ]; then hostmakedepends=${hostmakedepends%help2man} From beb1d7cae53ffc810217968ab799ad039a30ceeb Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:06:51 +0000 Subject: [PATCH 22/23] xapps: update to 2.8.1. --- srcpkgs/xapps/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template index fd8d76eba1696..fccc46dfcfe82 100644 --- a/srcpkgs/xapps/template +++ b/srcpkgs/xapps/template @@ -1,7 +1,7 @@ # Template file for 'xapps' pkgname=xapps -version=2.6.1 -revision=2 +version=2.8.1 +revision=1 build_style=meson build_helper="gir" hostmakedepends="glib-devel pkg-config vala python3 gettext" @@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later" homepage="https://github.com/linuxmint/xapp" changelog="https://raw.githubusercontent.com/linuxmint/xapp/master/debian/changelog" distfiles="https://github.com/linuxmint/xapp/archive/${version}.tar.gz" -checksum=c16c633c5c7ea572d7db77be9f0fdaa57c7b9f335a62f5fcb6b87bf6473aff0f +checksum=31f0eaf99413e32c9d909a18d29ce0ac8ae4a02d84020fbbaaf7135f2bd91d7a xapps-devel_package() { short_desc+=" - development files" From 5d0b9908fe876c2caa466364037d8c72a4d9e444 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 12 Dec 2023 22:06:53 +0000 Subject: [PATCH 23/23] xreader: update to 3.8.4. --- ...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ------------------ srcpkgs/xreader/template | 4 +- 2 files changed, 2 insertions(+), 194 deletions(-) delete mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch deleted file mode 100644 index e81d4f95511ed..0000000000000 --- a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Fri, 4 Aug 2023 09:41:57 -0400 -Subject: [PATCH] Fix building with meson 1.2. - -Thanks to @heftig for the patch. - -Fixes #612. ---- - cut-n-paste/meson.build | 3 --- - cut-n-paste/smclient/meson.build | 6 ++++++ - cut-n-paste/synctex/meson.build | 6 ++++++ - cut-n-paste/totem-screensaver/meson.build | 6 ++++++ - cut-n-paste/zoom-control/meson.build | 6 ++++++ - libdocument/meson.build | 6 ++++-- - libmisc/meson.build | 6 ++++++ - libview/meson.build | 6 ++++++ - shell/meson.build | 26 ++++++++++++++++------- - 9 files changed, 58 insertions(+), 13 deletions(-) - -diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build -index 0f79ebb8..5fd89d2e 100644 ---- a/cut-n-paste/meson.build -+++ b/cut-n-paste/meson.build -@@ -2,6 +2,3 @@ subdir('zoom-control') - subdir('totem-screensaver') - subdir('smclient') - subdir('synctex') -- --cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient') --synctex_includes = include_directories('synctex') -diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build -index ca129a3d..5c9eea93 100644 ---- a/cut-n-paste/smclient/meson.build -+++ b/cut-n-paste/smclient/meson.build -@@ -22,3 +22,9 @@ libsmclient = static_library( - dependencies: smclient_deps, - include_directories: include_dirs, - ) -+ -+libsmclient_dep = declare_dependency( -+ link_with: libsmclient, -+ dependencies: smclient_deps, -+ include_directories: [include_root, include_directories('.')], -+) -diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build -index 0f063adb..305c4f56 100644 ---- a/cut-n-paste/synctex/meson.build -+++ b/cut-n-paste/synctex/meson.build -@@ -14,3 +14,9 @@ libsynctex = static_library( - synctex_sources, - dependencies: synctex_deps, - ) -+ -+libsynctex_dep = declare_dependency( -+ link_with: libsynctex, -+ dependencies: synctex_deps, -+ include_directories: include_directories('.'), -+) -diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build -index faac9b7c..a67c2f96 100644 ---- a/cut-n-paste/totem-screensaver/meson.build -+++ b/cut-n-paste/totem-screensaver/meson.build -@@ -15,3 +15,9 @@ libtotemscrsaver = static_library( - dependencies: totem_screensaver_deps, - include_directories: include_root, - ) -+ -+libtotemscrsaver_dep = declare_dependency( -+ link_with: libtotemscrsaver, -+ dependencies: totem_screensaver_deps, -+ include_directories: [include_root, include_directories('.')], -+) -diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build -index f48567fc..2c3320ac 100644 ---- a/cut-n-paste/zoom-control/meson.build -+++ b/cut-n-paste/zoom-control/meson.build -@@ -20,3 +20,9 @@ libephyzoom = static_library( - include_directories: include_root, - dependencies: zoom_deps, - ) -+ -+libephyzoom_dep = declare_dependency( -+ link_with: libephyzoom, -+ include_directories: [include_root, include_directories('.')], -+ dependencies: zoom_deps, -+) -diff --git a/libdocument/meson.build b/libdocument/meson.build -index 6c0d6e34..5965a582 100644 ---- a/libdocument/meson.build -+++ b/libdocument/meson.build -@@ -121,14 +121,14 @@ libdocument_deps = [ - gmodule, - gtk, - math, -+ libsynctex_dep, - ] - - libdocument = library( - 'xreaderdocument', - libdocument_private_headers + libdocument_sources, - dependencies: libdocument_deps, -- include_directories: [include_root, synctex_includes], -- link_whole: [libsynctex], -+ include_directories: include_root, - soversion: binary_major_version, - version: binary_version, - install: true, -@@ -137,6 +137,8 @@ libdocument = library( - # this is needed so targets that depend on generated headers can do so - libdocument_dep = declare_dependency( - link_with: libdocument, -+ dependencies: libdocument_deps, -+ include_directories: include_root, - sources: libdoc_enums[1] - ) - -diff --git a/libmisc/meson.build b/libmisc/meson.build -index 280d3b03..e0140736 100644 ---- a/libmisc/meson.build -+++ b/libmisc/meson.build -@@ -20,3 +20,9 @@ libmisc = static_library( - include_directories: include_dirs, - dependencies: libmisc_deps, - ) -+ -+libmisc_dep = declare_dependency( -+ link_with: libmisc, -+ include_directories: include_dirs, -+ dependencies: libmisc_deps, -+) -diff --git a/libview/meson.build b/libview/meson.build -index b1c18504..77c7f023 100644 ---- a/libview/meson.build -+++ b/libview/meson.build -@@ -90,6 +90,12 @@ libview = library( - install: true, - ) - -+libview_dep = declare_dependency( -+ link_with: libview, -+ include_directories: include_dirs, -+ dependencies: libview_deps, -+) -+ - install_headers( - libview_headers, - subdir: libview_header_dir, -diff --git a/shell/meson.build b/shell/meson.build -index cff438b3..4060ceec 100644 ---- a/shell/meson.build -+++ b/shell/meson.build -@@ -132,21 +132,31 @@ if get_option('enable_dbus') - ) - endif - -+libshell_deps = [ -+ xreader_deps, -+ libview_dep, -+ libmisc_dep, -+ libtotemscrsaver_dep, -+ libsmclient_dep, -+ libephyzoom_dep, -+] -+ - libshell = static_library( - 'shell', - shell_sources, -- link_with: libview, -- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom], -- dependencies: xreader_deps, -- include_directories: [include_dirs, cnc_includes], -+ dependencies: libshell_deps, -+ include_directories: include_dirs, -+) -+ -+libshell_dep = declare_dependency( -+ link_whole: libshell, # Need the whole lib for gresource lookup -+ dependencies: libshell_deps, -+ include_directories: include_dirs, - ) - - xreader = executable( - 'xreader', - 'main.c', -- link_with: libview, -- link_whole: libshell, -- dependencies: xreader_deps, -- include_directories: [include_dirs, cnc_includes], -+ dependencies: libshell_dep, - install: true, - ) diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template index 3712f8751c094..e46f918414a20 100644 --- a/srcpkgs/xreader/template +++ b/srcpkgs/xreader/template @@ -1,6 +1,6 @@ # Template file for 'xreader' pkgname=xreader -version=3.8.2 +version=3.8.4 revision=1 build_style=meson build_helper="gir" @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/linuxmint/xreader" distfiles="https://github.com/linuxmint/xreader/archive/${version}.tar.gz" -checksum=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401 +checksum=5fce15973bb62d9ba4184ad65250e7fe90fc314e0c5c5248083e54f36507f1b7 # XX dogtail is needed for testing (not in repo) # XX tests need xorg running make_check=no