From 9e40303151c5151a0fa787908fa7d37c23d25502 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Fri, 12 Jan 2018 09:51:50 +0100 Subject: [PATCH] Milkytracker version bump (#2098) --- ...0.0.recipe => milkytracker-1.01.00.recipe} | 10 +++--- ...set => milkytracker-1.01.00-gcc4.patchset} | 22 ++++++++++++ ...patchset => milkytracker-1.01.00.patchset} | 36 +++++++++++++++---- 3 files changed, 56 insertions(+), 12 deletions(-) rename media-sound/milkytracker/{milkytracker-1.0.0.recipe => milkytracker-1.01.00.recipe} (90%) rename media-sound/milkytracker/patches/{milkytracker-1.0.0-gcc4.patchset => milkytracker-1.01.00-gcc4.patchset} (91%) rename media-sound/milkytracker/patches/{milkytracker-1.0.0.patchset => milkytracker-1.01.00.patchset} (88%) diff --git a/media-sound/milkytracker/milkytracker-1.0.0.recipe b/media-sound/milkytracker/milkytracker-1.01.00.recipe similarity index 90% rename from media-sound/milkytracker/milkytracker-1.0.0.recipe rename to media-sound/milkytracker/milkytracker-1.01.00.recipe index 3d4141ea2..5d73e977d 100644 --- a/media-sound/milkytracker/milkytracker-1.0.0.recipe +++ b/media-sound/milkytracker/milkytracker-1.01.00.recipe @@ -21,14 +21,14 @@ LICENSE="GNU GPL v3 New-BSD" REVISION="1" SOURCE_URI="https://github.com/milkytracker/MilkyTracker/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="7fa982561c297aae7ed8223d2535c1f0a72057da01d002e8665b9223206932dc" +CHECKSUM_SHA256="9b07c910c3c037ae57a76a4d571511a50276a563a0d2463e1d88256b756b76b7" SOURCE_DIR="MilkyTracker-$portVersion" PATCHES="milkytracker-$portVersion.patchset" if [ $effectiveTargetArchitecture != "x86_gcc2" ]; then PATCHES="milkytracker-$portVersion-gcc4.patchset" fi -ARCHITECTURES="?x86_gcc2 x86 ?x86_64" +ARCHITECTURES="?x86_gcc2 x86 x86_64" PROVIDES=" milkytracker = $portVersion @@ -46,14 +46,14 @@ BUILD_REQUIRES=" devel:libzzip$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:jam " BUILD() { - VER_X=1; VER_YY=00; VER_ZZ=00; + VER_X=1; VER_YY=01; VER_ZZ=00; echo "const int MILKYTRACKER_VERSION = 0x${VER_X}${VER_YY}${VER_ZZ};" \ > src/tracker/version.h echo "const char MILKYTRACKER_VERSION_STRING[] = \"MilkyTracker ${VER_X}.${VER_YY}.${VER_ZZ}\";" \ diff --git a/media-sound/milkytracker/patches/milkytracker-1.0.0-gcc4.patchset b/media-sound/milkytracker/patches/milkytracker-1.01.00-gcc4.patchset similarity index 91% rename from media-sound/milkytracker/patches/milkytracker-1.0.0-gcc4.patchset rename to media-sound/milkytracker/patches/milkytracker-1.01.00-gcc4.patchset index 4bcd48cdc..557ff9485 100644 --- a/media-sound/milkytracker/patches/milkytracker-1.0.0-gcc4.patchset +++ b/media-sound/milkytracker/patches/milkytracker-1.01.00-gcc4.patchset @@ -188,3 +188,25 @@ index 1ded1b3..2e56afe 100644 -- 2.12.2 + +From 6f963bf8a77776296d8fa21418ef14d79f68f664 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Wed, 10 Jan 2018 15:41:44 +0100 +Subject: Build fix + + +diff --git a/platforms/haiku/Jamfiles/src-ppui-Jamfile b/platforms/haiku/Jamfiles/src-ppui-Jamfile +index 4595986..af08708 100644 +--- a/platforms/haiku/Jamfiles/src-ppui-Jamfile ++++ b/platforms/haiku/Jamfiles/src-ppui-Jamfile +@@ -12,6 +12,7 @@ SubDirHdrs - ; + Library libppui : + Button.cpp + CheckBox.cpp ++ CheckBoxLabel.cpp + Container.cpp + ContextMenu.cpp + Control.cpp +-- +2.15.1 + diff --git a/media-sound/milkytracker/patches/milkytracker-1.0.0.patchset b/media-sound/milkytracker/patches/milkytracker-1.01.00.patchset similarity index 88% rename from media-sound/milkytracker/patches/milkytracker-1.0.0.patchset rename to media-sound/milkytracker/patches/milkytracker-1.01.00.patchset index 343d0aff6..bb3fa0941 100644 --- a/media-sound/milkytracker/patches/milkytracker-1.0.0.patchset +++ b/media-sound/milkytracker/patches/milkytracker-1.01.00.patchset @@ -1,11 +1,11 @@ -From d27ab27a0b248c688f1b22a8b42b7f9a7e383eaf Mon Sep 17 00:00:00 2001 +From cd4b51220d4482ff681278e89d2e296ec2b13323 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 3 Sep 2014 16:22:32 +0000 Subject: include diff --git a/src/ppui/BasicTypes.h b/src/ppui/BasicTypes.h -index 23ab385..831c284 100644 +index 20eba8b..63e0c1c 100644 --- a/src/ppui/BasicTypes.h +++ b/src/ppui/BasicTypes.h @@ -43,7 +43,7 @@ typedef signed int pp_int32; @@ -18,10 +18,10 @@ index 23ab385..831c284 100644 #include "PPSystemString_POSIX.h" #endif -- -2.12.2 +2.15.1 -From fc6fc4fbb9ffde6b4d0f9dc31a0b45d67b566f97 Mon Sep 17 00:00:00 2001 +From 911a07a0e82a830467635990332c8d595e3c11c4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 3 Sep 2014 16:47:15 +0000 Subject: link against libstdc++ @@ -53,10 +53,10 @@ index 662ee18..b76c586 100644 Main MilkySettings : MilkySettingsApplication.cpp -- -2.12.2 +2.15.1 -From 3fadce6df023928645e011e81fb86d247bc768ed Mon Sep 17 00:00:00 2001 +From 3992ae5a2a6cec1b98757a5e18be8287747c1dbc Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 23 May 2017 23:34:15 +0200 Subject: Build update for 1.0.0. @@ -186,5 +186,27 @@ index 1ded1b3..2e56afe 100644 MilkyWindow* milkyWindow = (MilkyWindow*)Window(); -- -2.12.2 +2.15.1 + + +From 6f963bf8a77776296d8fa21418ef14d79f68f664 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Wed, 10 Jan 2018 15:41:44 +0100 +Subject: Build fix + + +diff --git a/platforms/haiku/Jamfiles/src-ppui-Jamfile b/platforms/haiku/Jamfiles/src-ppui-Jamfile +index 4595986..af08708 100644 +--- a/platforms/haiku/Jamfiles/src-ppui-Jamfile ++++ b/platforms/haiku/Jamfiles/src-ppui-Jamfile +@@ -12,6 +12,7 @@ SubDirHdrs - ; + Library libppui : + Button.cpp + CheckBox.cpp ++ CheckBoxLabel.cpp + Container.cpp + ContextMenu.cpp + Control.cpp +-- +2.15.1