{frozen-bubble,perl540Packages.SDL}: drop (#521240)
This commit is contained in:
@@ -1,33 +0,0 @@
|
||||
diff --git a/Build.PL b/Build.PL
|
||||
index b029d1e..8737395 100644
|
||||
--- a/Build.PL
|
||||
+++ b/Build.PL
|
||||
@@ -16,13 +16,14 @@ use Games::FrozenBubble;
|
||||
my $prefix = Alien::SDL->config('prefix');
|
||||
my $cflags = '-I'
|
||||
. File::Spec->catfile( $prefix, 'include' )
|
||||
+ . ' ' . `pkg-config --cflags SDL_mixer`
|
||||
;
|
||||
$cflags .= ' -fnested-functions' if $^O =~ /darwin/;
|
||||
###!!! this looks strange, you perhaps meant "$cflags .= ..."
|
||||
###!!! I intended Alien::SDL to add -I$prefix/include automatically, please tell me when it does not work (kmx)
|
||||
my $devnull = File::Spec->devnull();
|
||||
my @cflags = ExtUtils::CBuilder->new->split_like_shell( $cflags );
|
||||
-my @linkers = ( ExtUtils::CBuilder->new->split_like_shell( Alien::SDL->config('libs', '-lSDL_mixer', '-lSDL_Pango') ) );
|
||||
+my @linkers = ( ExtUtils::CBuilder->new->split_like_shell( Alien::SDL->config('libs', '-lSDL_Pango',`pkg-config --libs SDL_mixer`) ) );
|
||||
push @linkers, '-liconv'
|
||||
if $^O =~ /win/i; ###!!! really only Win needs this? ; BEWARE this matches also 'darwin', 'cygwin'!!!!
|
||||
|
||||
diff --git a/inc/My/Builder.pm b/inc/My/Builder.pm
|
||||
index 2ebaf91..c420b9a 100644
|
||||
--- a/inc/My/Builder.pm
|
||||
+++ b/inc/My/Builder.pm
|
||||
@@ -123,7 +123,7 @@ sub ACTION_server {
|
||||
push @ofiles, $cbuilder->compile(
|
||||
source => catfile($server_directory, $cfile),
|
||||
extra_compiler_flags => [
|
||||
- qw(-g -Wall -Werror -pipe), # verbatim from Makefile
|
||||
+ qw(-g -pipe), # verbatim from Makefile
|
||||
'-I' . $server_directory, # does not seem to be necessary
|
||||
$cbuilder->split_like_shell(`pkg-config glib-2.0 --cflags`),
|
||||
$cbuilder->split_like_shell(`pkg-config glib-2.0 --libs`),
|
||||
@@ -1,74 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
perlPackages,
|
||||
pkg-config,
|
||||
SDL,
|
||||
SDL_mixer,
|
||||
SDL_Pango,
|
||||
glib,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
perlPackages.buildPerlModule {
|
||||
pname = "frozen-bubble";
|
||||
version = "2.212";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz";
|
||||
hash = "sha256-ch4E/2nFIzBgZWv79AAqoa6t2WyVNR8MV7uFtto1owU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-compilation.patch
|
||||
(fetchpatch {
|
||||
# https://github.com/kthakore/frozen-bubble/pull/82
|
||||
url = "https://github.com/kthakore/frozen-bubble/commit/1aacc67254a0aafd856086cc306e9f7b389c6bf4.patch?full_index=1";
|
||||
hash = "sha256-RqJ+/UFv4esKWZBk0fttsEXhPMislEBTAl2oj4pLAZY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
SDL
|
||||
SDL_mixer
|
||||
SDL_Pango
|
||||
perlPackages.SDL
|
||||
perlPackages.FileSlurp
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with perlPackages; [
|
||||
AlienSDL
|
||||
CompressBzip2
|
||||
FileShareDir
|
||||
FileWhich
|
||||
IPCSystemSimple
|
||||
LocaleMaketextLexicon
|
||||
];
|
||||
|
||||
perlPreHook = "export LD=$CC";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "frozen-bubble";
|
||||
exec = "frozen-bubble";
|
||||
desktopName = "Frozen Bubble";
|
||||
genericName = "Frozen Bubble";
|
||||
comment = "Arcade/reflex colour matching game";
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Puzzle with Bubbles";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ puckipedia ];
|
||||
};
|
||||
}
|
||||
@@ -797,6 +797,7 @@ mapAliases {
|
||||
freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23
|
||||
freerdp3 = throw "'freerdp3' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
|
||||
freerdpUnstable = throw "'freerdpUnstable' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
|
||||
frozen-bubble = throw "'frozen-bubble' has been removed because it is broken and unmaintained"; # Added 2026-05-17
|
||||
frugal = throw "'frugal' was removed because upstream has been pulled"; # Added 2025-12-20
|
||||
fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # Added 2025-07-05
|
||||
fusionInventory = warnAlias "'fusionInventory' has been renamed to 'fusioninventory-agent'" fusioninventory-agent; # Added 2026-02-08
|
||||
|
||||
@@ -30474,51 +30474,6 @@ with self;
|
||||
};
|
||||
};
|
||||
|
||||
SDL = buildPerlModule {
|
||||
pname = "SDL";
|
||||
version = "2.548";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.548.tar.gz";
|
||||
hash = "sha256-JSoZK/qcIHCkiDcH0TnDpF2cRRjM1moeaZtbeVm9T7U=";
|
||||
};
|
||||
patches = [
|
||||
# https://github.com/PerlGameDev/SDL/pull/304
|
||||
../development/perl-modules/sdl-modern-perl.patch
|
||||
# sdl-compat correctly reports the bit depth of the test image,
|
||||
# while SDL_classic rounded to the next byte
|
||||
../development/perl-modules/sdl-compat-bit-depth.patch
|
||||
(fetchpatch {
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/surface-xs-declare-calc-offset-earlier.diff?h=perl-sdl&id=d4b6da86d33046cde0e84fa2cd6eaccff1667cab";
|
||||
hash = "sha256-dQ2O4dO18diSAilSZrZj6II+mBuKKI3cx9fR1SJqUvo=";
|
||||
})
|
||||
];
|
||||
preCheck = "rm t/core_audiospec.t";
|
||||
buildInputs = [
|
||||
pkgs.SDL
|
||||
pkgs.SDL_gfx
|
||||
pkgs.SDL_mixer
|
||||
pkgs.SDL_image
|
||||
pkgs.SDL_ttf
|
||||
pkgs.SDL_Pango
|
||||
pkgs.SDL_net
|
||||
AlienSDL
|
||||
CaptureTiny
|
||||
TestDeep
|
||||
TestDifferences
|
||||
TestException
|
||||
TestMost
|
||||
TestWarn
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
FileShareDir
|
||||
TieSimple
|
||||
];
|
||||
meta = {
|
||||
description = "SDL bindings to Perl";
|
||||
license = with lib.licenses; [ lgpl21Plus ];
|
||||
};
|
||||
};
|
||||
|
||||
SeleniumRemoteDriver = buildPerlPackage {
|
||||
pname = "Selenium-Remote-Driver";
|
||||
version = "1.49";
|
||||
@@ -39746,4 +39701,5 @@ with self;
|
||||
MongoDB = throw "MongoDB has been removed"; # 2025-09-12
|
||||
pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07
|
||||
HTTPHeaderParserXS = throw "HTTPHeaderParserXS has been removed"; # Added 2025-11-08
|
||||
SDL = throw "'SDL' has been removed as it was broken and unused"; # Added 2026-05-17
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user