From 3b25ed3172ec9d532a3bdcfaa7c85ac20984fa5e Mon Sep 17 00:00:00 2001 From: Stephanie Fu Date: Mon, 26 Dec 2016 17:17:37 -0600 Subject: [PATCH] Unprintable chars removed (#958) New line --- .../additional-files/rocksndiamonds.iom | Bin 0 -> 15712 bytes .../additional-files/rocksndiamonds.rdef.in | 38 ++++++++++++++++++ .../patches/rocksndiamonds-3.3.1.2.patchset | 23 +++++++++++ .../rocksndiamonds-3.3.1.2.recipe | 17 ++++++++ 4 files changed, 78 insertions(+) create mode 100644 games-arcade/rocksndiamonds/additional-files/rocksndiamonds.iom create mode 100644 games-arcade/rocksndiamonds/additional-files/rocksndiamonds.rdef.in diff --git a/games-arcade/rocksndiamonds/additional-files/rocksndiamonds.iom b/games-arcade/rocksndiamonds/additional-files/rocksndiamonds.iom new file mode 100644 index 0000000000000000000000000000000000000000..92e8dbf1772b496c4eb48d8cb127ff24d2ee1865 GIT binary patch literal 15712 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 aKTksVaVE+Qeh_*=+$>3;GnAzh;pX1~oJN=c literal 0 HcmV?d00001 diff --git a/games-arcade/rocksndiamonds/additional-files/rocksndiamonds.rdef.in b/games-arcade/rocksndiamonds/additional-files/rocksndiamonds.rdef.in new file mode 100644 index 000000000..1d114af2d --- /dev/null +++ b/games-arcade/rocksndiamonds/additional-files/rocksndiamonds.rdef.in @@ -0,0 +1,38 @@ +// Rocks 'n' Diamonds icon by Stephanie Fu + +resource app_signature "application/x-vnd.Artsoft-rocksndiamonds"; + +resource app_flags B_EXCLUSIVE_LAUNCH; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + variety = B_APPV_DEVELOPMENT, + internal = @INTERNAL@, + short_info = "Rocks'n'Diamonds", + long_info = "Rocks'n'Diamonds, an arcade style game.\nCopyright 2001-2013 Artsoft Entertainment" +}; + +resource file_types message; + +resource vector_icon array { + $"6E6369660B03C6630203904902020004025AD37E28FFAB6115030065FE03A9CB" + $"FE033287FE05FE0300307E05FF04016303010000100A04243E3A483A5E24540A" + $"043A48503E50543A5E0A04243E3A48503E3A340A043C404440473739370A0339" + $"37402647370A0439373432373B3C400A033432402639370A0347374C3444400A" + $"03402647374C340607FE1B312EBA85B854BA1CB8A4BAA5B83BBAC5B7A8BACAB7" + $"E5BABFB77033B72233B75233B6D4BA1FB6BCBA5FB6E7B999B6BC30292D060C9A" + $"BFAA3035B86DBAAAB57C31273428B9ED28BB772935B6D533B66FBBA0B6F7BB84" + $"B83ABBB7B7FABB2AB8ACBAC5B929BBF0BCE933BC3D3231302F0608AFF9382FBC" + $"F0B7D737323532BC4DB9DC323333332F3526322535243225BBBEB4773927BC43" + $"B51F39B6FD06096BEE0335273628BACDB5393328B9E9B660B9C43530362FBA32" + $"2F36B743BBF2B80E362A382A362A362A362A38290608F22F3A59474C57C328C9" + $"89C4A6C8DC5356C6E1C8B7535655545554C840C7A85553C7FCC76155535D4D50" + $"0A06243B24513A5B5051503B3A310A062E313A2546333E3F363F313A0E0A0901" + $"0D2020220A00010020201D0A01010120201D0A02010220201D0A0A010E100117" + $"8200040A0A010F1001178400040A030103201A1F0A040104201A1F0A05010520" + $"1A1F0A060106201A1F0A070107201A1F0A050108201A1F0A0802090A201D3C0A" + $"08020B0C20323F" +}; + diff --git a/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset b/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset index b7c633931..9a741afa1 100644 --- a/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset +++ b/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset @@ -84,3 +84,26 @@ index aaa3a5b..03723fb 100644 -- 1.8.3.4 + +From 6953f4b742475f5d8befe8fcc9d9f5db5c7bc6c9 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 25 Dec 2016 10:12:22 +0100 +Subject: gcc5 patch + + +diff --git a/src/init.c b/src/init.c +index a7ad871..34e7ec2 100644 +--- a/src/init.c ++++ b/src/init.c +@@ -257,7 +257,7 @@ void InitGadgets() + gadgets_initialized = TRUE; + } + +-inline void InitElementSmallImagesScaledUp(int graphic) ++inline static void InitElementSmallImagesScaledUp(int graphic) + { + #if 0 + struct FileInfo *fi = getImageListEntryFromImageID(graphic); +-- +2.7.0 + diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe index 0111afa9b..63aed020d 100644 --- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe +++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe @@ -15,6 +15,7 @@ REVISION="2" SOURCE_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.3.1.2.tar.gz" CHECKSUM_SHA256="c117c20026299c6c935bd531ef9b0dc767731f600881d12ceb80c831483755f3" PATCHES="rocksndiamonds-$portVersion.patchset" +ADDITIONAL_FILES="rocksndiamonds.rdef.in" ARCHITECTURES="!x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86" @@ -59,5 +60,21 @@ INSTALL() destdir=$appsDir/"Rocks'n'Diamonds" mkdir -p $destdir cp -r rocksndiamonds sounds graphics levels music $destdir + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local INTERNAL="`echo "$portVersion" | cut -d. -f4`" + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@INTERNAL@|$INTERNAL|" \ + $portDir/additional-files/rocksndiamonds.rdef.in > rocksndiamonds.rdef + + addResourcesToBinaries rocksndiamonds.rdef \ + $destdir/rocksndiamonds + addAppDeskbarSymlink $destdir/rocksndiamonds "Rocks'n'Diamonds" } +