diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-16 00:09:44 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-16 00:09:44 +0100 |
| commit | 0a3feeaba4dbc58966dccdbbfcd7fb14deef0831 (patch) | |
| tree | d48a200142b883af377722ab54ec0c1d8c19912f /games-puzzle | |
| parent | 6a7029e0f7370d4d5dfe9e31cc2719a870482392 (diff) | |
gentoo auto-resync : 16:06:2024 - 00:09:44
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/Manifest.gz | bin | 17293 -> 17290 bytes | |||
| -rw-r--r-- | games-puzzle/icebreaker/Manifest | 2 | ||||
| -rw-r--r-- | games-puzzle/icebreaker/files/icebreaker-2.2.2_p20231115-makefile.patch | 32 |
3 files changed, 31 insertions, 3 deletions
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz Binary files differindex b265d73dcfd8..f54bd0a94abf 100644 --- a/games-puzzle/Manifest.gz +++ b/games-puzzle/Manifest.gz diff --git a/games-puzzle/icebreaker/Manifest b/games-puzzle/icebreaker/Manifest index 0cd24cf9fcea..9f3a819a5bae 100644 --- a/games-puzzle/icebreaker/Manifest +++ b/games-puzzle/icebreaker/Manifest @@ -1,4 +1,4 @@ -AUX icebreaker-2.2.2_p20231115-makefile.patch 2302 BLAKE2B 37488f72afe3212c28820e262e886a4ef97b6ed53046923d188dac14818e31c2dabe789ffa20aa285df1ec85d825b0ca0201e8269c44bda1395bec82999a48a4 SHA512 ff54f94daa1d4b4a9c0a23271e3bd0ec588abde294d981e8f77eb5c2def0ff0741eb25ef4052e0ab5668a384d1e9c8bf38195cec41a2d236a0f88a85aee168a0 +AUX icebreaker-2.2.2_p20231115-makefile.patch 3396 BLAKE2B 985dd52df5ea2e3f7fd10c8397445f70450b761518c96aae9d2fc7ac2a6daa4b49249be28c4a8aa9e8ec4a2d8abc09463d5c86161cd5223b2669a64d8b14d6fc SHA512 c87f3b187ce7372e2434026b811f9e954e481a814db72642b091a9d00c5ce0c4a4a0ee731bb0baf82a1fd75e66c5e6047f409dff52379be611d0238fe4f1af78 DIST icebreaker-2.2.2_p20231115.tar.gz 538930 BLAKE2B a3f8a1c1c280c260c8fc1b8060575b000a30535e83bd2033fe68726bf02f31cb213c9a46af5fdd89c7d7c042053cd98b037d69b924daeec985b2f04645d10e9d SHA512 02174b8c57578dc269693ad2ce3ebae756490dd55c9f738a1e8dd75b868b6fafc14c7f0e62c5fc49bca797376a0957a647fc9d7c5f4005cdd7cdf7df637567b0 EBUILD icebreaker-2.2.2_p20231115.ebuild 1078 BLAKE2B 9c5c1ec6af0e9b2c2ebf3aa67100f0b386b041bd924f7c0bcefe222ab6fde44240318d4538d506d2408f45d8137e02317bb26bc2fb94467c82e71614ea051215 SHA512 e51475be361d09fba99d0188620f88ca33ce1693d663dc148629ddfd9f58fa36eca6f9722e40a3801a4e35286f8ade4d18fcfdacc29917bb0d34d3b695cee0f6 MISC metadata.xml 336 BLAKE2B ceeb2b39ecc087caf819359666ccb15f820c8b96e8a9a6ac1786645ba302c53c98ee12cf34e7939c770f27de37e65cd168566b825a5fd738b7516473d84f538c SHA512 b0d3e620503a3c839e344df1b49581adc998e7b88cc81d5a1b2141cb3bcaebdd25efc2d60cec1b21285da5dd363baa90c49653fe81824e2ccb11ba0236a113e8 diff --git a/games-puzzle/icebreaker/files/icebreaker-2.2.2_p20231115-makefile.patch b/games-puzzle/icebreaker/files/icebreaker-2.2.2_p20231115-makefile.patch index 4fec6a700f3d..7d2bd50cb6f0 100644 --- a/games-puzzle/icebreaker/files/icebreaker-2.2.2_p20231115-makefile.patch +++ b/games-puzzle/icebreaker/files/icebreaker-2.2.2_p20231115-makefile.patch @@ -1,7 +1,7 @@ From a5950b94d56f6e35c3dca2e1ad2ff334aacaa070 Mon Sep 17 00:00:00 2001 From: James Le Cuirot <chewi@gentoo.org> Date: Wed, 12 Jun 2024 22:50:15 +0100 -Subject: [PATCH 1/2] Don't include -Werror in CFLAGS +Subject: [PATCH 1/3] Don't include -Werror in CFLAGS Distributions don't like -Werror because it prevents end users from building the software using newer compilers that may raise warnings you @@ -45,7 +45,7 @@ index 92f60c5..17dd71a 100644 From 6ee6046bf1f9893a3c4bfd239871b3296c90b047 Mon Sep 17 00:00:00 2001 From: James Le Cuirot <chewi@gentoo.org> Date: Wed, 12 Jun 2024 22:54:52 +0100 -Subject: [PATCH 2/2] Include LDFLAGS earlier in the linking command +Subject: [PATCH 2/3] Include LDFLAGS earlier in the linking command Some flags need to come before the inputs in order to be effective. --- @@ -68,3 +68,31 @@ index 808b36b..45a7035 100644 -- 2.45.1 + +From 40b865e7776962d45e082fed4904b4c2690b753f Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 15 Jun 2024 11:09:45 +0100 +Subject: [PATCH 3/3] Silence error when rpm command doesn't exist and add + fallback + +The error can trigger QA warnings in non-RPM distros. +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 45a7035..5a497ce 100644 +--- a/Makefile ++++ b/Makefile +@@ -43,7 +43,7 @@ MAKENSIS=makensis + WINDLLS=SDL.dll SDL_mixer.dll libgcc_s_dw2-1.dll libvorbisfile-3.dll libvorbis-0.dll libogg-0.dll libssp-0.dll libwinpthread-1.dll + export WINARCH + +-RPMARCH := $(shell rpm --eval %{_arch} ) ++RPMARCH := $(shell rpm --eval %{_arch} 2>/dev/null || echo none) + RPMOPTS= + RPMCRAZYDEFINES := --define "_topdir %(pwd)/rpmbuild" --define "_sourcedir %(pwd)" --define "_specdir %(pwd)" --define "_tmppath %(pwd)/rpmbuild/tmp/" --define "_builddir %(pwd)/rpmbuild/build/" --define "_rpmdir %(pwd)" --define "_srcrpmdir %(pwd)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" + +-- +2.45.1 + |