From d3fcf1114248c08a2473b4a8157cad0d82eb6dd9 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:45:14 +0300 Subject: [PATCH 01/12] cinnamon-control-center: update to 4.6.0. --- srcpkgs/cinnamon-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template index 4fcaa26b49d..fd70c1782a4 100644 --- a/srcpkgs/cinnamon-control-center/template +++ b/srcpkgs/cinnamon-control-center/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-control-center' pkgname=cinnamon-control-center -version=4.4.0 +version=4.6.0 revision=1 build_style=gnu-configure build_helper=gir @@ -19,7 +19,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=43d78c704ce37af175733e578c180698bb3141ef67ebf0122f271b0278105c35 +checksum=cfb1c7398cac2c071d4cca1317c98094c107ec2ebb1f46abda8fd9d956ba6f92 do_check() { : From 91fadf4d8672713354e0849f0d80e84cf196ebe9 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:45:27 +0300 Subject: [PATCH 02/12] cinnamon-desktop: update to 4.6.0. --- srcpkgs/cinnamon-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template index 126cf0afddc..293a6704508 100644 --- a/srcpkgs/cinnamon-desktop/template +++ b/srcpkgs/cinnamon-desktop/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-desktop' pkgname=cinnamon-desktop -version=4.4.1 +version=4.6.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://developer.linuxmint.com/projects/cinnamon-projects.html" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=b32fb974e49048e091e98a24e740b01e4e6f97a7947b53dd65f4552dd61a34cf +checksum=6f46a072488f2a417f75542ed3816ac49d577eef4b984e55ece7904c360e963e cinnamon-desktop-devel_package() { depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}" From a0301c013508e0acaa32af60cbd7dbe2947b91fc Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:45:37 +0300 Subject: [PATCH 03/12] cinnamon-menus: update to 4.6.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 aeafaac3980..ba50c5140d5 100644 --- a/srcpkgs/cinnamon-menus/template +++ b/srcpkgs/cinnamon-menus/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-menus' pkgname=cinnamon-menus -version=4.4.0 +version=4.6.0 revision=1 build_style=meson build_helper=gir @@ -12,7 +12,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=c5597082394c054a9eff1820064ad5713f492d1780c793850a02a084a03a8379 +checksum=5c380048051869cdb0a92b5f2f7857c77b067706e1c80a1f2b5e12ffe057a696 cinnamon-menus-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 26950f42228e4f1769c899068a6aab176b00a567 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:45:48 +0300 Subject: [PATCH 04/12] cinnamon-screensaver: update to 4.6.0. --- srcpkgs/cinnamon-screensaver/template | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template index e30d58eef1b..9c0e6a70d4e 100644 --- a/srcpkgs/cinnamon-screensaver/template +++ b/srcpkgs/cinnamon-screensaver/template @@ -1,10 +1,9 @@ # Template file for 'cinnamon-screensaver' pkgname=cinnamon-screensaver -version=4.4.1 +version=4.6.0 revision=1 -build_style=gnu-configure +build_style=meson build_helper=gir -configure_args="--disable-static" hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection intltool libtool pkg-config python3-devel" makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel @@ -17,7 +16,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=6ae265ebea2adb2b488cbbfbc8647021bc0cabffc01e46c7cfaf8ca1a91b349a +checksum=e93349521a24f2b49c8a293ee15798ba341ae8e9b000cf3da5311a162ce8cb60 python_version=3 pycompile_dirs="/usr/share/cinnamon-screensaver" @@ -26,10 +25,6 @@ do_check() { : } -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} - post_install() { vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname} } From 86ae8713d3ddae6c5fb000df126177f9eabe1e36 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:45:59 +0300 Subject: [PATCH 05/12] cinnamon-session: update to 4.6.0. --- srcpkgs/cinnamon-session/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template index e0faf811024..7a38b765fc3 100644 --- a/srcpkgs/cinnamon-session/template +++ b/srcpkgs/cinnamon-session/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-session' pkgname=cinnamon-session -version=4.4.1 +version=4.6.0 revision=1 build_style=meson build_helper=gir @@ -16,4 +16,4 @@ 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=8c85bdca724e211aaaeb7ccf0af220c77facafd567ea6ad2bc167f597a75cb87 +checksum=abfe4fc2305f10d53349f58c17a2798c6af7b87b0074ce25630a8744bfd09c43 From ed2884edc8426e829c804767e5ce3c8909476d3e Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:46:15 +0300 Subject: [PATCH 06/12] cinnamon-settings-daemon: update to 4.6.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 5e104904112..92bb42d9dee 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-settings-daemon' pkgname=cinnamon-settings-daemon -version=4.4.0 +version=4.6.0 revision=1 build_style=gnu-configure build_helper=gir @@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=6797a0bb73ea2345580a43fe8c75c70f48634b82b0a3518f48cc603f084bf012 +checksum=36eaeb3457d253c97a26fec2e471a7ab99c931e7930b42a38e4d64fb02480230 pre_configure() { NOCONFIGURE=1 ./autogen.sh From e2944fd7819d7d48de65f3cca662064967b319f8 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:46:24 +0300 Subject: [PATCH 07/12] cinnamon-translations: update to 4.6.0. --- 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 550e3e2425d..92b177b2478 100644 --- a/srcpkgs/cinnamon-translations/template +++ b/srcpkgs/cinnamon-translations/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-translations' pkgname=cinnamon-translations -version=4.4.2 +version=4.6.0 revision=1 archs=noarch build_style=gnu-makefile @@ -11,7 +11,7 @@ license="GPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=c13cdedf4efd71bf60583765b922e7a12dd6820e30c8207cfd5f8cd47c648037 +checksum=e5846c2e0fb9e8ec889495f724e9c26a4ba2cc87d2cb1cd4ce0a607fc535dee6 do_install() { vmkdir /usr/share/locale From 94bc8b0f1835a089148c998150115b45daa582ed Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:46:33 +0300 Subject: [PATCH 08/12] cinnamon: update to 4.6.1. --- srcpkgs/cinnamon/patches/cross-muffin.patch | 14 -- srcpkgs/cinnamon/patches/python3.8.patch | 172 -------------------- srcpkgs/cinnamon/template | 4 +- 3 files changed, 2 insertions(+), 188 deletions(-) delete mode 100644 srcpkgs/cinnamon/patches/cross-muffin.patch delete mode 100644 srcpkgs/cinnamon/patches/python3.8.patch diff --git a/srcpkgs/cinnamon/patches/cross-muffin.patch b/srcpkgs/cinnamon/patches/cross-muffin.patch deleted file mode 100644 index 11f72ccff95..00000000000 --- a/srcpkgs/cinnamon/patches/cross-muffin.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/Makefile.am -+++ src/Makefile.am -@@ -227,11 +227,6 @@ - $(CINNAMON_LIBS) \ - libst-1.0.la \ - libtray.la \ -- $(libdir)/muffin/libmuffin-clutter-0.so \ -- $(libdir)/muffin/libmuffin-cogl-0.so \ -- $(libdir)/muffin/libmuffin-cogl-pango-0.so \ -- $(libdir)/muffin/libmuffin-cogl-path-0.so \ -- $(MUFFIN_LIBS) - $(NULL) - - libcinnamon_la_LDFLAGS = $(WARN_LDFLAGS) -avoid-version -L$(libdir)/muffin diff --git a/srcpkgs/cinnamon/patches/python3.8.patch b/srcpkgs/cinnamon/patches/python3.8.patch deleted file mode 100644 index 4768cacb614..00000000000 --- a/srcpkgs/cinnamon/patches/python3.8.patch +++ /dev/null @@ -1,172 +0,0 @@ -diff --git files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py -index f1a9b9a..6778299 100755 ---- files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py -+++ files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py -@@ -194,7 +194,7 @@ class LauncherEditor(ItemEditor): - def resync_validity(self, *args): - name_text = self.builder.get_object('name-entry').get_text().strip() - exec_text = self.builder.get_object('exec-entry').get_text().strip() -- name_valid = name_text is not "" -+ name_valid = name_text != "" - exec_valid = self.validate_exec_line(exec_text) - self.sync_widgets(name_valid, exec_valid) - -@@ -236,7 +236,7 @@ class DirectoryEditor(ItemEditor): - - def resync_validity(self, *args): - name_text = self.builder.get_object('name-entry').get_text().strip() -- valid = (name_text is not "") -+ valid = (name_text != "") - self.builder.get_object('ok').set_sensitive(valid) - - def load(self): -@@ -281,7 +281,7 @@ class CinnamonLauncherEditor(ItemEditor): - def resync_validity(self, *args): - name_text = self.builder.get_object('name-entry').get_text().strip() - exec_text = self.builder.get_object('exec-entry').get_text().strip() -- name_valid = name_text is not "" -+ name_valid = name_text != "" - exec_valid = self.validate_exec_line(exec_text) - self.sync_widgets(name_valid, exec_valid) - -diff --git files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py -index 12f506b..f04e227 100644 ---- files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py -+++ files/usr/share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py -@@ -339,13 +339,13 @@ class TimeChooserButton(Gtk.Button): - def __init__(self, follow_current=False, time=None, show_seconds='default'): - super(TimeChooserButton, self).__init__() - -- if show_seconds is 'default': -+ if show_seconds == 'default': - self.show_seconds_override_default = False - else: - self.show_seconds_override_default = True -- if show_seconds is 'true': -+ if show_seconds == 'true': - self.show_seconds = True -- elif show_seconds is 'false': -+ elif show_seconds == 'false': - self.show_seconds = False - else: - raise ValueError('Invalid argument: show_seconds must be default, true, or false') -diff --git files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py -index e24bf7b..f531baa 100644 ---- files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py -+++ files/usr/share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py -@@ -239,7 +239,7 @@ class JSONSettingsRevealer(Gtk.Revealer): - break - - if self.key is None: -- if key[:1] is '!': -+ if key[:1] == '!': - self.invert = True - self.key = key[1:] - else: -diff --git files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py -index a648973..8c9c2e5 100755 ---- files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py -+++ files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py -@@ -419,7 +419,7 @@ class Module: - categories, iter = tree.get_selection().get_selected() - if iter: - category = categories[iter][2] -- if category.int_name is not "custom": -+ if category.int_name != "custom": - for keybinding in category.keybindings: - self.kb_store.append((keybinding.label, keybinding)) - else: -@@ -428,7 +428,7 @@ class Module: - - def loadCustoms(self): - for category in self.main_store: -- if category.int_name is "custom": -+ if category.int_name == "custom": - category.clear() - - parent = Gio.Settings.new(CUSTOM_KEYS_PARENT_SCHEMA) -@@ -443,7 +443,7 @@ class Module: - schema.get_strv("binding")) - self.kb_store.append((custom_kb.label, custom_kb)) - for category in self.main_store: -- if category.int_name is "custom": -+ if category.int_name == "custom": - category.add(custom_kb) - - def onKeyBindingChanged(self, tree): -@@ -453,7 +453,7 @@ class Module: - if iter: - keybinding = keybindings[iter][1] - for entry in keybinding.entries: -- if entry is not "_invalid_": -+ if entry != "_invalid_": - self.entry_store.append((entry,)) - self.remove_custom_button.set_property('sensitive', isinstance(keybinding, CustomKeyBinding)) - -@@ -536,7 +536,7 @@ class Module: - new_schema.set_strv("binding", ()) - i = 0 - for cat in self.cat_store: -- if cat[2].int_name is "custom": -+ if cat[2].int_name == "custom": - self.cat_tree.set_cursor(str(i), self.cat_tree.get_column(0), False) - i += 1 - i = 0 -@@ -574,7 +574,7 @@ class Module: - - i = 0 - for cat in self.cat_store: -- if cat[2].int_name is "custom": -+ if cat[2].int_name == "custom": - self.cat_tree.set_cursor(str(i), self.cat_tree.get_column(0), False) - i += 1 - -@@ -600,7 +600,7 @@ class Module: - - i = 0 - for cat in self.cat_store: -- if cat[2].int_name is "custom": -+ if cat[2].int_name == "custom": - self.cat_tree.set_cursor(str(i), self.cat_tree.get_column(0), False) - i += 1 - i = 0 -@@ -691,7 +691,7 @@ class KeyBinding(): - def writeSettings(self): - array = [] - for entry in self.entries: -- if entry is not "": -+ if entry: - array.append(entry) - self.settings.set_strv(self.key, array) - -@@ -731,7 +731,7 @@ class CustomKeyBinding(): - - array = [] - for entry in self.entries: -- if entry is not "": -+ if entry: - array.append(entry) - settings.set_strv("binding", array) - -@@ -777,6 +777,5 @@ class AddCustomDialog(Gtk.Dialog): - self.command_entry.set_text(path) - - def onEntriesChanged(self, widget): -- ok_enabled = self.name_entry.get_text().strip() is not "" and self.command_entry.get_text().strip() is not "" -+ ok_enabled = self.name_entry.get_text().strip() != "" and self.command_entry.get_text().strip() != "" - self.set_response_sensitive(Gtk.ResponseType.OK, ok_enabled) -- -\ No newline at end of file -diff --git files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py -index c5338ab..f833c34 100755 ---- files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py -+++ files/usr/share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py -@@ -118,7 +118,7 @@ class CinnamonSlideshow(dbus.service.Object): - def on_next_file_complete(obj, res, user_data=all_files): - files = obj.next_files_finish(res) - file_list = all_files -- if len(files) is not 0: -+ if files: - file_list = file_list.extend(files) - enumerator.next_files_async(100, GLib.PRIORITY_LOW, None, on_next_file_complete, None) - else: diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index 9c1f326b1fe..66a33d653d9 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon' pkgname=cinnamon -version=4.4.8 +version=4.6.1 revision=1 build_helper=gir build_style=gnu-configure @@ -27,7 +27,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=5bc7db4e519aed8b3b76d6b68abc02be966633005a92579071a77d23d33c8af4 +checksum=bed16019e575112873f8a056c489cbaa3cba443547dc7cb7c7fc0085a255e167 python_version=3 pycompile_dirs=" From 946aa0d3ccde610e4872c721479294cf93fe2121 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:46:41 +0300 Subject: [PATCH 09/12] cjs: update to 4.6.0. --- srcpkgs/cjs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template index 9f23b060db1..309dab47438 100644 --- a/srcpkgs/cjs/template +++ b/srcpkgs/cjs/template @@ -1,7 +1,7 @@ # Template file for 'cjs' pkgname=cjs -version=4.4.0 -revision=2 +version=4.6.0 +revision=1 build_style=gnu-configure build_helper=gir configure_args="--disable-static --disable-profiler" @@ -14,7 +14,7 @@ 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=7dab9615c41d9cb3b2409b2aa6cb9813ef5762f8c62526f54b4b3734079961f6 +checksum=47f8abb867881594766fec1398d1b9117012826c5e72ecafb3153a0c8226bf81 pre_configure() { From 61259da5fcb14ae346cc2344bdc3e50c58415332 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:46:54 +0300 Subject: [PATCH 10/12] muffin: update to 4.6.0. --- srcpkgs/muffin/patches/eglmesaext_h.patch | 36 ------------------- .../pkgconfig-honor-sysroot-cross.patch | 13 ------- srcpkgs/muffin/template | 4 +-- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/muffin/patches/eglmesaext_h.patch delete mode 100644 srcpkgs/muffin/patches/pkgconfig-honor-sysroot-cross.patch diff --git a/srcpkgs/muffin/patches/eglmesaext_h.patch b/srcpkgs/muffin/patches/eglmesaext_h.patch deleted file mode 100644 index ca69b3eb990..00000000000 --- a/srcpkgs/muffin/patches/eglmesaext_h.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- cogl/configure.ac 2019-07-25 10:27:05.000000000 +0200 -+++ cogl/configure.ac 2020-01-26 18:24:57.704883594 +0100 -@@ -486,8 +486,9 @@ - AC_SUBST([COGL_EGL_INCLUDES]) - - AC_CHECK_HEADERS([EGL/eglext.h], -- [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE --#include "], -+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES -+#include -+#include ]) -+ AC_CHECK_HEADERS( -+ [EGL/eglmesaext.h], -+ [], -+ [AC_MSG_ERROR([Unable to locate required EGL headers])], -+ [#include ]) - - AC_CHECK_LIB(EGL, [eglInitialize], - [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"], -@@ -759,7 +765,8 @@ - ) - - COGL_EGL_INCLUDES="#include --#include " -+#include -+#include " - AC_SUBST([COGL_EGL_INCLUDES]) - ]) - diff --git a/srcpkgs/muffin/patches/pkgconfig-honor-sysroot-cross.patch b/srcpkgs/muffin/patches/pkgconfig-honor-sysroot-cross.patch deleted file mode 100644 index eae9a85ca52..00000000000 --- a/srcpkgs/muffin/patches/pkgconfig-honor-sysroot-cross.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/libmuffin.pc.in -+++ src/libmuffin.pc.in -@@ -2,8 +2,8 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ --girdir=@libdir@/muffin --typelibdir=@libdir@/muffin -+girdir=${pc_sysrootdir}@libdir@/muffin -+typelibdir=${pc_sysrootdir}@libdir@/muffin - apiversion=@MUFFIN_PLUGIN_API_VERSION@ - - muffin_major_version=@MUFFIN_MAJOR_VERSION@ diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template index cdd866d57f7..d4ed2c2afd4 100644 --- a/srcpkgs/muffin/template +++ b/srcpkgs/muffin/template @@ -1,6 +1,6 @@ # Template file for 'muffin' pkgname=muffin -version=4.4.2 +version=4.6.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=1c7a98e1a0fa9356d7c166166830bdb043079cdb7ff8d3dd6dc817e29852a52a +checksum=a8f1cb8e495b5fdb146dc4758f83266018d2d8585ce436c6106b3d95d178b262 shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so libmuffin-cogl-path-0.so libmuffin-cogl-0.so" From 5f7e6ca64f8a196a48f4313f0ef33252b4de50e6 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:47:03 +0300 Subject: [PATCH 11/12] nemo: update to 4.6.1. --- srcpkgs/nemo/template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template index 95551f57b7e..a68c5758474 100644 --- a/srcpkgs/nemo/template +++ b/srcpkgs/nemo/template @@ -1,6 +1,6 @@ # Template file for 'nemo' pkgname=nemo -version=4.4.2 +version=4.6.1 revision=1 build_style=meson build_helper=gir @@ -15,7 +15,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=cda3b99c8275c57bb285f8718ef3e463349a8eebe97cc126b0daebffeb242c95 +checksum=be86ebdcd8f6f7ac2886d6791a7e037a0ec73598e4aac7fe1ccead50ceb0da50 python_version=2 #unverified @@ -30,6 +30,12 @@ pre_configure() { sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in } +post_install() { + if [ -d "$DESTDIR"/lib/girepository-1.0 ]; then + mv ${DESTDIR}/lib/girepository-1.0 ${DESTDIR}/usr/lib/ + fi +} + libnemo_package() { short_desc+=" - runtime library" pkg_install() { From d9864f0a23930cb407a2962870d4f24ad6724c3c Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 25 May 2020 18:47:12 +0300 Subject: [PATCH 12/12] nemo-fileroller: update to 4.6.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 bbbe342c0ea..a5a2606548a 100644 --- a/srcpkgs/nemo-fileroller/template +++ b/srcpkgs/nemo-fileroller/template @@ -1,6 +1,6 @@ # Template file for 'nemo-fileroller' pkgname=nemo-fileroller -version=4.4.0 +version=4.6.0 revision=1 wrksrc="nemo-extensions-${version}" build_wrksrc=nemo-fileroller @@ -12,7 +12,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=97b4f8614ec403fa550cc9af7adf6518cd11fd8377cb535f3eecb88239588dd7 +checksum=f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd pre_configure() { autoreconf -fi