Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] MultiMC: update to 0.6.12.
@ 2021-03-22  3:21 Hnaguski
  2021-03-22 13:47 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 1 reply; 2+ messages in thread
From: Hnaguski @ 2021-03-22  3:21 UTC (permalink / raw)
  To: ml

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

There is a new pull request by Hnaguski against master on the void-packages repository

https://github.com/Hnaguski/void-packages multimc
https://github.com/void-linux/void-packages/pull/29671

MultiMC: update to 0.6.12.
<!-- Mark items with [x] where applicable -->

#### General

I removed the patches needed for big endian, it shouldn't be required as of https://github.com/MultiMC/MultiMC5/commit/485f123362b3e49cff3f162ace27f4c2fc0436fe. I don't have hardware to actually test this though so an issue could still exist?

#### 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

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 37d50b301f6adf66164bee194b2afa5141a2b98d Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sun, 21 Mar 2021 20:57:46 -0600
Subject: [PATCH] MultiMC: update to 0.6.12.

---
 srcpkgs/MultiMC/patches/be.patch | 37 --------------------------------
 srcpkgs/MultiMC/template         |  6 +++---
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/MultiMC/patches/be.patch

diff --git a/srcpkgs/MultiMC/patches/be.patch b/srcpkgs/MultiMC/patches/be.patch
deleted file mode 100644
index 6f81b8790437..000000000000
--- a/srcpkgs/MultiMC/patches/be.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fixes build on big endian.
-
---- libraries/classparser/src/javaendian.h
-+++ libraries/classparser/src/javaendian.h
-@@ -11,32 +11,26 @@ inline uint64_t bigswap(uint64_t x)
- {
-     return x;
- }
--;
- inline uint32_t bigswap(uint32_t x)
- {
-     return x;
- }
--;
- inline uint16_t bigswap(uint16_t x)
- {
-     return x;
- }
--;
- inline int64_t bigswap(int64_t x)
- {
-     return x;
- }
--;
- inline int32_t bigswap(int32_t x)
- {
-     return x;
- }
--;
- inline int16_t bigswap(int16_t x)
- {
-     return x;
- }
--;
- #else
- inline uint64_t bigswap(uint64_t x)
- {
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index 2ec51601f47c..162472b00022 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,6 +1,6 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
-version=0.6.11
+version=0.6.12
 revision=1
 wrksrc="${pkgname}5-${version}"
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
@@ -12,13 +12,13 @@ hostmakedepends="openjdk8 xxd git qt5-qmake qt5-host-tools tar"
 makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
 depends="virtual?java-environment"
 short_desc="Instanced Minecraft client"
-maintainer="Spencer H <spencernh77@gmail.com>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="Apache-2.0"
 homepage="http://multimc.org"
 distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${version}.tar.gz
  https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
  https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="7cad736f1fe3f2887aeaa7a7f3927930e16ed815c98e4cf3a7378a99c426a775
+checksum="c251744b77d93db4ead56940b7b81d30dc5390fb86a1676d3f0364cc4e570185
  36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
  ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
 skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: MultiMC: update to 0.6.12.
  2021-03-22  3:21 [PR PATCH] MultiMC: update to 0.6.12 Hnaguski
@ 2021-03-22 13:47 ` ericonr
  0 siblings, 0 replies; 2+ messages in thread
From: ericonr @ 2021-03-22 13:47 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

MultiMC: update to 0.6.12.
https://github.com/void-linux/void-packages/pull/29671

Description:
<!-- Mark items with [x] where applicable -->

#### General

I removed the patches needed for big endian, it shouldn't be required as of https://github.com/MultiMC/MultiMC5/commit/485f123362b3e49cff3f162ace27f4c2fc0436fe. I don't have hardware to actually test this though so an issue could still exist?

#### 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

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-03-22 13:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-22  3:21 [PR PATCH] MultiMC: update to 0.6.12 Hnaguski
2021-03-22 13:47 ` [PR PATCH] [Merged]: " ericonr

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).