From d1477e8a524e50748c219bbc6cbc6789e4d098af Mon Sep 17 00:00:00 2001 From: tgkokk Date: Tue, 7 Jan 2014 00:46:52 +0200 Subject: [PATCH] libsanta changes --- ...nta-0.0.1.recipe => libsanta-3.0.0.recipe} | 15 ++++++++----- .../libsanta/patches/libsanta-0.0.1.patchset | 22 ------------------- 2 files changed, 9 insertions(+), 28 deletions(-) rename haiku-libs/libsanta/{libsanta-0.0.1.recipe => libsanta-3.0.0.recipe} (82%) delete mode 100644 haiku-libs/libsanta/patches/libsanta-0.0.1.patchset diff --git a/haiku-libs/libsanta/libsanta-0.0.1.recipe b/haiku-libs/libsanta/libsanta-3.0.0.recipe similarity index 82% rename from haiku-libs/libsanta/libsanta-0.0.1.recipe rename to haiku-libs/libsanta/libsanta-3.0.0.recipe index 9738762df..dd8da8c57 100644 --- a/haiku-libs/libsanta/libsanta-0.0.1.recipe +++ b/haiku-libs/libsanta/libsanta-3.0.0.recipe @@ -1,7 +1,9 @@ SUMMARY="Custom widget library" DESCRIPTION=" -libsanta has some useful custom widgets (color picker, column list view, \ -scroll view, etc.). +libsanta has some useful custom widgets (color picker, column \ +list view, scroll view etc.) +NOT recommended for new apps! Use Haiku's Layout Manager instead. \ +The recipe exists only for legacy BeOS apps. " HOMEPAGE="https://github.com/HaikuArchives/SantasGiftBag" COPYRIGHT="briant@timelinevista.com" @@ -31,8 +33,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -PATCHES="libsanta-0.0.1.patchset" - BUILD() { make TYPE=STATIC \ @@ -54,7 +54,10 @@ INSTALL() cp libsanta.a $developLibDir cd ../obj-shared - cp libsanta $libDir/libsanta.so + cp libsanta $libDir/libsanta.so.3.0.0 + + ln -s $libDir/libsanta.so.3.0.0 $libDir/libsanta.so.3 + ln -s $libDir/libsanta.so.3.0.0 $libDir/libsanta.so cd .. @@ -72,7 +75,7 @@ INSTALL() ./PrefilledBitmap/PrefilledBitmap.h \ ./ScrollViewCorner/ScrollViewCorner.h $includeDir/santa - symlinkRelative -s $libDir/libsanta.so $developLibDir + symlinkRelative -s $libDir/libsanta.so.3.0.0 $developLibDir packageEntries devel \ $developLibDir \ diff --git a/haiku-libs/libsanta/patches/libsanta-0.0.1.patchset b/haiku-libs/libsanta/patches/libsanta-0.0.1.patchset deleted file mode 100644 index baaab658e..000000000 --- a/haiku-libs/libsanta/patches/libsanta-0.0.1.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 459e758be3720ec93b1029eea0db2af14db38121 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Fri, 13 Dec 2013 00:03:52 -0700 -Subject: Fix stdc++ libs on gcc4 - - -diff --git a/Makefile b/Makefile -index 57c3914..2719e8d 100644 ---- a/Makefile -+++ b/Makefile -@@ -51,7 +51,7 @@ RSRCS= - # naming scheme you need to specify the path to the library - # and it's name - # library: my_lib.a entry: my_lib.a or path/my_lib.a --LIBS= be root stdc++.r4 -+LIBS= be root $(STDCPPLIBS) - - # specify additional paths to directories following the standard - # libXXX.so or libXXX.a naming scheme. You can specify full paths --- -1.8.3.4 -