[gentoo-commits] repo/proj/guru:master commit in: games-action/multimc/files/, games-action/multimc/
commit: c8b2746f67b88df10e5bd02e216b65c8661f67bd
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Thu May 20 12:55:18 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Thu May 20 13:34:38 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c8b2746f
games-action/multimc: move to ::gentoo
Signed-off-by: Andrew Ammerlaan gentoo.org>
games-action/multimc/Manifest | 3 -
.../multimc/files/multimc-0.6.12-gcc11.patch | 11
games-action/multimc/metadata.xml | 28 -
games-action/multimc/multimc-0.6.12.ebuild | 73 --
4 files changed, 115 deletions(-)
diff --git a/games-action/multimc/Manifest b/games-action/multimc/Manifest
deleted file mode 100644
index f9dc35972..0
--- a/games-action/multimc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libnbtplusplus-multimc-0.6.1.tar.gz 47171 BLAKE2B
e0e4d2593554dc59605114fcae86c59877da67d3f0888145b9ec2fe3d08decec7345a92c7d37310e021b5719f1371a58a22dc796e719028a478877e6d08982ed
SHA512
81a1640a069d88df7ba0abf72089aecbe1e9d791c88acaaa7e70c8f0bcd0512cf8698178342657e363524ce8488dd072368a0aa8cc091a24912d6f8b6b0f4f2d
-DIST multimc-0.6.12.tar.gz 2389805 BLAKE2B
d7b7660578d78d5d1cbaae607bf340c0c0a0aab5b0d2460218e1e468f450a3ac7030cb235c3e25f61d27d8c1e3cca71a1abbea22f9759726d34e495fe49de180
SHA512
334b0996b7b49a0f4a46a3e5b08d50d5f7aa398b8d5871772c751c1f98438d9584ffcdaf27ad6d2e84b2776415bd38910dffb8e746c4b343916c6849df2146da
-DIST quazip-multimc-3.tar.gz 103519 BLAKE2B
7a636f9e76cae61cee42131093b56d2a577814b2eb04bdc3c3a7614cf307bbdabe533c66a9f07848bbd929a62b7043dc53f2f85e2e487bfcc820170112f1114b
SHA512
2e9074203c67bc7ad98621c551047e5367f06e54cacfecc755a5bf2c9f99266eab42ad972f86ae28ed7e1507f6d27d8d2680a87ce9fd5b1e93a18bcb627ec3f0
diff --git a/games-action/multimc/files/multimc-0.6.12-gcc11.patch
b/games-action/multimc/files/multimc-0.6.12-gcc11.patch
deleted file mode 100644
index b523fa7c5..0
--- a/games-action/multimc/files/multimc-0.6.12-gcc11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur MultiMC5-0.6.12.orig/libraries/systeminfo/src/sys_unix.cpp
MultiMC5-0.6.12/libraries/systeminfo/src/sys_unix.cpp
MultiMC5-0.6.12.orig/libraries/systeminfo/src/sys_unix.cpp 2021-03-22
04:45:06.0 +0900
-+++ MultiMC5-0.6.12/libraries/systeminfo/src/sys_unix.cpp 2021-04-29
06:41:55.269952475 +0900
-@@ -4,6 +4,7 @@
-
- #include
- #include
-+#include
-
- Sys::KernelInfo Sys::getKernelInfo()
- {
diff --git a/games-action/multimc/metadata.xml
b/games-action/multimc/metadata.xml
deleted file mode 100644
index 3e76d82c5..0
--- a/games-action/multimc/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
- MultiMC/MultiMC5
- https://github.com/MultiMC/MultiMC5/issues
-
-
- andrewammerl...@gentoo.org
- Andrew Ammerlaan
-
-
- MultiMC is a custom launcher for Minecraft that allows you to
easily manage multiple installations of Minecraft at once. It also allows you
to easily install and remove mods by simply dragging and dropping. Here are the
current features of MultiMC:
-
- - Manage multiple instances of Minecraft at once
- - Start Minecraft with a custom resolution
- - Change Java's runtime options (including memory options)
- - Shows Minecraft's console output in a colour-coded window
- - Kill Minecraft easily if it crashes/freezes
- - Custom icons and groups for instances
- - Forge, Fabric and LiteLoader integration (automatic
installation, version downloads, mod management)
- - Import of Curse modpacks
- - LWJGL version changing built-in
- - Supports every version of Minecraft that the vanilla launcher
does
- - Upload screenshots
- - Import, export Instances allowing you to share with friends
and/or make backups
-
-
diff --git a/games-action/multimc/multimc-0.6.12.ebuild
b/games-action/multimc/multimc-0.6.12.ebuild
deleted file mode 100644
index bf3a23cfe..0
--- a/games-action/multimc/multimc-0.6.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-pkg-2 xdg cmake
-
-MY_PN="MultiMC5"
-MY_P="${MY_PN}-${PV}"
-
-QUAZIP_VER="multimc-3"
-LIBNBTPLUSPLUS_VER="multimc-0.6.1"
-
-DESCRIPTION="An advanced Qt5-based open-source launcher for Minecraft"
-HOMEPAGE="https://multimc.org
- https://github.com/MultiMC/MultiMC5;
-BASE_URI="https://github.com/MultiMC;
-SRC_URI="
- ${BASE_URI}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${BASE_URI}/libnbtplusplus/archive/${LIBNBTPLUSPLUS_VER}.tar.gz ->
libnbtplusplus-${LIBNBTPLUSPLUS_VER}.tar.gz
-
[gentoo-commits] repo/proj/guru:master commit in: games-action/multimc/files/, games-action/multimc/
commit: 42c4211c4cdfe5106f81a079522d7080a769c38a
Author: YOSHIOKA Takuma hard-wi red>
AuthorDate: Wed Apr 28 22:08:27 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Apr 28 22:08:27 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=42c4211c
games-action/multimc: Fix build failure with gcc-11.1.0
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: YOSHIOKA Takuma hard-wi.red>
games-action/multimc/files/multimc-0.6.12-gcc11.patch | 11 +++
games-action/multimc/multimc-0.6.12.ebuild| 1 +
2 files changed, 12 insertions(+)
diff --git a/games-action/multimc/files/multimc-0.6.12-gcc11.patch
b/games-action/multimc/files/multimc-0.6.12-gcc11.patch
new file mode 100644
index 0..b523fa7c5
--- /dev/null
+++ b/games-action/multimc/files/multimc-0.6.12-gcc11.patch
@@ -0,0 +1,11 @@
+diff -Naur MultiMC5-0.6.12.orig/libraries/systeminfo/src/sys_unix.cpp
MultiMC5-0.6.12/libraries/systeminfo/src/sys_unix.cpp
+--- MultiMC5-0.6.12.orig/libraries/systeminfo/src/sys_unix.cpp 2021-03-22
04:45:06.0 +0900
MultiMC5-0.6.12/libraries/systeminfo/src/sys_unix.cpp 2021-04-29
06:41:55.269952475 +0900
+@@ -4,6 +4,7 @@
+
+ #include
+ #include
++#include
+
+ Sys::KernelInfo Sys::getKernelInfo()
+ {
diff --git a/games-action/multimc/multimc-0.6.12.ebuild
b/games-action/multimc/multimc-0.6.12.ebuild
index cd9640293..bf3a23cfe 100644
--- a/games-action/multimc/multimc-0.6.12.ebuild
+++ b/games-action/multimc/multimc-0.6.12.ebuild
@@ -45,6 +45,7 @@ RDEPEND="${COMMON_DEPEND}
"
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/multimc-0.6.12-gcc11.patch )
src_unpack() {
default
[gentoo-commits] repo/proj/guru:master commit in: games-action/multimc/
commit: 51694690a985718881fc7799c492d289d62c23ea
Author: Theo Anderson posteo de>
AuthorDate: Sun Jan 17 10:45:07 2021 +
Commit: Andrew Ammerlaan riseup net>
CommitDate: Sun Jan 17 10:45:07 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=51694690
games-action/multimc: fix build with clang (-Werror)
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Theo Anderson posteo.de>
games-action/multimc/multimc-0.6.11.ebuild | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/games-action/multimc/multimc-0.6.11.ebuild
b/games-action/multimc/multimc-0.6.11.ebuild
index 4596aa60..6ed40831 100644
--- a/games-action/multimc/multimc-0.6.11.ebuild
+++ b/games-action/multimc/multimc-0.6.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,6 +53,11 @@ src_unpack() {
mv "${WORKDIR}/quazip-${QUAZIP_VER}" "${S}/libraries/quazip" || die
}
+src_prepare() {
+ cmake_src_prepare
+ sed -r -i 's/-Werror([a-z=-]+)?//g' CMakeLists.txt || die
+}
+
src_configure() {
local mycmakeargs=(
-DMultiMC_LAYOUT=lin-system
[gentoo-commits] repo/proj/guru:master commit in: games-action/multimc/
commit: be89948e9248b80e3fe56ab6d2b8d72584749ec7
Author: Andrew Ammerlaan riseup net>
AuthorDate: Tue Mar 31 10:07:21 2020 +
Commit: Andrew Ammerlaan riseup net>
CommitDate: Tue Mar 31 10:07:21 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=be89948e
games-action/multimc: use cmake instead of cmake-utils
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan riseup.net>
games-action/multimc/multimc-0.6.11.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/games-action/multimc/multimc-0.6.11.ebuild
b/games-action/multimc/multimc-0.6.11.ebuild
index 4a50f86..4596aa6 100644
--- a/games-action/multimc/multimc-0.6.11.ebuild
+++ b/games-action/multimc/multimc-0.6.11.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit desktop xdg cmake-utils
+inherit desktop xdg cmake
MY_PN="MultiMC5"
MY_P="${MY_PN}-${PV}"
@@ -57,11 +57,11 @@ src_configure() {
local mycmakeargs=(
-DMultiMC_LAYOUT=lin-system
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
domenu application/package/linux/multimc.desktop
doicon -s scalable application/resources/multimc/scalable/multimc.svg
}
