From: mobinmob <mobinmob@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: Cinnamon: update to 4.8.
Date: Sat, 26 Dec 2020 12:12:04 +0100 [thread overview]
Message-ID: <20201226111204.rNbqa6Y5JSRmpETb7tpeH-UIDaMijqVdXTaUrN_yQOE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26965@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2432 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/26965#issuecomment-751345457
Comment:
> Please apply
>
> ```diff
> diff --git a/srcpkgs/nemo/patches/meson.patch b/srcpkgs/nemo/patches/meson.patch
> new file mode 100644
> index 0000000000..d6d43a09c4
> --- /dev/null
> +++ b/srcpkgs/nemo/patches/meson.patch
> @@ -0,0 +1,15 @@
> +diff --git libnemo-extension/meson.build libnemo-extension/meson.build
> +index 31a1618..84a6cf7 100644
> +--- libnemo-extension/meson.build
> ++++ libnemo-extension/meson.build
> +@@ -61,7 +61,9 @@ nemo_extension = declare_dependency(
> + dependencies: nemo_extension_deps,
> + )
> +
> +-typelibdir = go_intr.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', get_option('libdir')])
> ++typelibdir = go_intr.get_pkgconfig_variable('typelibdir',
> ++ define_variable: ['libdir', join_paths(get_option('prefix'), get_option('libdir'))]
> ++)
> +
> + gnome.generate_gir(nemo_extension_lib,
> + sources: nemo_extension_sources + nemo_extension_headers,
> diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
> index deb08370f5..abb5f5886c 100644
> --- a/srcpkgs/nemo/template
> +++ b/srcpkgs/nemo/template
> @@ -17,22 +17,15 @@ distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
> checksum=e4225b7c4736abe49e106595c770f2c2ea137b15f0b09c9f9ae05c1556fb42a4
> python_version=3
>
> -
> do_check() {
> :
> - # requires a display
> - # Gtk-WARNING **: 18:34:08.533: cannot open display:
> + # Requires xvfb-run and dbus-run-session;
> + # can't be run inside chroot due to fusermount3
> }
>
> -pre_configure() {
> +post_patch() {
> # Rename 'Files' app name to avoid having the same as nautilus
> - vsed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
> -}
> -
> -post_install() {
> - if [ -d "$DESTDIR"/lib/girepository-1.0 ]; then
> - mv ${DESTDIR}/lib/girepository-1.0 ${DESTDIR}/usr/lib/
> - fi
> + vsed -i 's/^Name.*=.*/& - Nemo/' data/nemo.desktop.in
> }
>
> libnemo_package() {
> ```
Thank you for the patch, it is much cleaner. Once I have the time to do complete rebuild I will push with the changes.
> And please don't do tricks like that `post_install` again, I spent a lot of time chasing my own tail trying to figure out why the build was complaining about files in `/lib64`.
Please check git blame.
next prev parent reply other threads:[~2020-12-26 11:12 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-05 14:33 [PR PATCH] " mobinmob
2020-12-05 14:41 ` [PR PATCH] [Updated] " mobinmob
2020-12-05 20:05 ` [PR REVIEW] " ericonr
2020-12-05 20:06 ` ericonr
2020-12-05 20:06 ` ericonr
2020-12-05 20:06 ` ericonr
2020-12-05 23:38 ` mobinmob
2020-12-05 23:38 ` mobinmob
2020-12-05 23:40 ` mobinmob
2020-12-05 23:42 ` mobinmob
2020-12-05 23:44 ` mobinmob
2020-12-05 23:51 ` sgn
2020-12-05 23:53 ` ericonr
2020-12-05 23:54 ` [PR PATCH] [Updated] " mobinmob
2020-12-05 23:55 ` [PR REVIEW] " mobinmob
2020-12-05 23:55 ` mobinmob
2020-12-06 0:04 ` mobinmob
2020-12-06 0:08 ` sgn
2020-12-06 0:09 ` sgn
2020-12-09 18:27 ` ericonr
2020-12-09 18:27 ` ericonr
2020-12-18 22:11 ` mobinmob
2020-12-21 19:06 ` [PR PATCH] [Updated] " mobinmob
2020-12-21 19:07 ` [PR REVIEW] " mobinmob
2020-12-21 19:08 ` mobinmob
2020-12-21 19:21 ` [PR PATCH] [Updated] " mobinmob
2020-12-21 20:05 ` mobinmob
2020-12-24 4:42 ` ericonr
2020-12-24 5:49 ` ericonr
2020-12-26 11:12 ` mobinmob [this message]
2020-12-26 11:18 ` mobinmob
2020-12-27 23:47 ` [PR PATCH] [Updated] " mobinmob
2020-12-28 8:01 ` mobinmob
2020-12-28 16:36 ` ericonr
2020-12-28 19:13 ` mobinmob
2021-01-19 19:30 ` ericonr
2021-01-19 19:30 ` [PR PATCH] [Closed]: " ericonr
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=20201226111204.rNbqa6Y5JSRmpETb7tpeH-UIDaMijqVdXTaUrN_yQOE@z \
--to=mobinmob@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).