Github messages for voidlinux
 help / color / mirror / Atom feed
From: F0Xde <F0Xde@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] MultiMC: Remove wrapper script (#31077)
Date: Mon, 24 May 2021 11:02:48 +0200	[thread overview]
Message-ID: <20210524090248.mwI22PMXK-qLuNZZV3-_GY1IhxNC5GftOvMhuX3Tryo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31079@inbox.vuxu.org>

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

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

https://github.com/F0Xde/void-packages multimc
https://github.com/void-linux/void-packages/pull/31079

MultiMC: Remove wrapper script (#31077)
See #31077 

#### Have the results of the proposed changes been tested?
- [x] 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

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

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

From 97d94129069508c31190bb9a1a8811bccdaa8530 Mon Sep 17 00:00:00 2001
From: F0X <f0xde@protonmail.com>
Date: Sun, 23 May 2021 18:03:56 +0200
Subject: [PATCH 1/2] MultiMC: Remove wrapper script (#31077)

---
 srcpkgs/MultiMC/files/MultiMC.sh | 2 --
 srcpkgs/MultiMC/template         | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 srcpkgs/MultiMC/files/MultiMC.sh

diff --git a/srcpkgs/MultiMC/files/MultiMC.sh b/srcpkgs/MultiMC/files/MultiMC.sh
deleted file mode 100644
index 271794952e82..000000000000
--- a/srcpkgs/MultiMC/files/MultiMC.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/libexec/multimc/multimc -d ~/.multimc
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index 6f19fc623d0a..f4b3da2f3d4a 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,7 +1,7 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
 version=0.6.12
-revision=2
+revision=3
 wrksrc="${pkgname}5-${version}"
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
 _nbtversion="multimc-0.6.1"
@@ -35,9 +35,6 @@ pre_configure() {
 }
 
 post_install() {
-	vmkdir usr/libexec/multimc
-	mv "${DESTDIR}/usr/bin/multimc" "${DESTDIR}/usr/libexec/multimc"
-	vbin "${FILESDIR}/MultiMC.sh" MultiMC
 	vinstall build/libMultiMC_nbt++.so 755 /usr/lib
 	vinstall build/libMultiMC_quazip.so 755 /usr/lib
 	vinstall application/package/linux/multimc.desktop 644 /usr/share/applications

From 2f8688dd3a919837f3cb547e69148fed6ec3b012 Mon Sep 17 00:00:00 2001
From: F0X <f0xde@protonmail.com>
Date: Mon, 24 May 2021 11:02:07 +0200
Subject: [PATCH 2/2] MultiMC: Use correct name in desktop file

---
 srcpkgs/MultiMC/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index f4b3da2f3d4a..5b5fdc922110 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -38,6 +38,5 @@ post_install() {
 	vinstall build/libMultiMC_nbt++.so 755 /usr/lib
 	vinstall build/libMultiMC_quazip.so 755 /usr/lib
 	vinstall application/package/linux/multimc.desktop 644 /usr/share/applications
-	vsed -i "${DESTDIR}/usr/share/applications/multimc.desktop" -e 's/Exec=multimc/Exec=MultiMC/'
 	vinstall application/resources/multimc/scalable/multimc.svg 644 /usr/share/pixmaps
 }

  parent reply	other threads:[~2021-05-24  9:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-23 16:07 [PR PATCH] " F0Xde
2021-05-23 17:12 ` Duncaen
2021-05-23 17:43 ` F0Xde
2021-05-23 17:51 ` F0Xde
2021-05-24  9:02 ` [PR PATCH] [Updated] " F0Xde
2021-05-24  9:02 ` F0Xde [this message]
2022-05-20  2:12 ` github-actions
2022-06-04  2:08 ` [PR PATCH] [Closed]: " github-actions

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=20210524090248.mwI22PMXK-qLuNZZV3-_GY1IhxNC5GftOvMhuX3Tryo@z \
    --to=f0xde@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).