launchpad: move to HaikuArchives' version. (#10764)

Closes #2900.
This commit is contained in:
OscarL
2024-07-29 04:13:27 -03:00
committed by GitHub
parent af63e66057
commit 5ce653952e
6 changed files with 174 additions and 115 deletions

View File

@@ -1,63 +0,0 @@
SUMMARY="A simple BeOS application/file/folder launcher"
DESCRIPTION="
A simple BeOS application/file/folder launcher.
"
HOMEPAGE="https://sourceforge.net/projects/launchpad"
SOURCE_URI="http://launchpad.cvs.sourceforge.net/viewvc/launchpad/buta/LaunchPad/?view=tar&pathrev=release-1-3-0"
SOURCE_FILENAME="launchpad-1.3.tar.gz"
CHECKSUM_MD5="9001e130b7ceb90aaef9791b8fac1afb"
REVISION="3"
LICENSE="BSD (3-clause)"
COPYRIGHT="1997-2000 Hiromasa Kato"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
launchpad = $portVersion
app:LaunchPad = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libprefs
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
lib:libprefs
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:autoconf
cmd:libtool
cmd:aclocal
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
SOURCE_DIR="LaunchPad"
PATCHES="
configure.patch
configure.in.patch
Makefile.in.patch
"
BUILD()
{
libtoolize --force --copy --install
./configure --with-libprefs=$portPackageLinksDir/lib~libprefs/lib
make
}
INSTALL()
{
mkdir -p $appsDir
cp src/LaunchPad $appsDir
addAppDeskbarSymlink $appsDir/LaunchPad
}

View File

@@ -0,0 +1,52 @@
SUMMARY="A simple BeOS application/file/folder launcher"
DESCRIPTION="A simple BeOS application/file/folder launcher."
HOMEPAGE="https://sourceforge.net/projects/launchpad"
COPYRIGHT="1997-2000 Hiromasa Kato"
LICENSE="BSD (3-clause)"
REVISION="1"
srcGitRev="c8562c843644ab20c2a7c38098826bd65842e355"
SOURCE_URI="https://github.com/HaikuArchives/LaunchPad/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="a2ddcf8ee31f1b509d65c46a1712d48f9685ce5012cbcc2db0096a3e59b75152"
SOURCE_DIR="LaunchPad-$srcGitRev"
PATCHES="2.patch"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
launchpad = $portVersion
app:LaunchPad = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libprefs${secondaryArchSuffix}
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
makefile_engine
devel:libprefs${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
cd src
make $jobArgs
}
INSTALL()
{
mkdir -p $appsDir
cp src/LaunchPad $appsDir
addAppDeskbarSymlink $appsDir/LaunchPad
}

View File

@@ -0,0 +1,122 @@
From 7885cd78c0285698d898f9127a0d56a911b1dc5f Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 28 Jul 2024 18:05:23 -0300
Subject: [PATCH 1/2] Fix build. Crashes on startup thou.
Closes #1.
Getting a segfault on BWindows::Bounds(), near WindowTab::GetPreferredSize(),
albeit with different parameter types for GCC2 vs x86 (or x86_64).
---
src/LClickFilter.cpp | 17 ++---------------
src/LClickFilter.h | 13 -------------
src/Makefile | 4 ++--
3 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/src/LClickFilter.cpp b/src/LClickFilter.cpp
index 9390e82..ed6429c 100644
--- a/src/LClickFilter.cpp
+++ b/src/LClickFilter.cpp
@@ -5,6 +5,8 @@
#include "LClickFilter.h"
#include <View.h> // for B_PRIMARY_MOUSE_BUTTON, etc...
+#define PRINT
+
const uint32 LClickFilter::kDrag = 'Drag';
const uint32 LClickFilter::kDoubleClick = 'DClk';
const uint32 LClickFilter::kSingleClick = 'SClk';
@@ -90,18 +92,3 @@ LClickFilter::Filter( BMessage* message, BHandler** target )
return B_DISPATCH_MESSAGE;
}
-
-LMouseTrackingThread::LMouseTrackingThread()
-: LThread( "LMouseTrackingThread" )
-{
-}
-
-LMouseTrackingThread::~LMouseTrackingThread()
-{
-}
-
-status_t
-LMouseTrackingThread::Main( void )
-{
- return B_NO_ERROR;
-}
diff --git a/src/LClickFilter.h b/src/LClickFilter.h
index 67f110f..708d484 100644
--- a/src/LClickFilter.h
+++ b/src/LClickFilter.h
@@ -5,7 +5,6 @@
#define _L_CLICK_FILTER_H
#include <MessageFilter.h>
-#include "LThread.h"
class LClickFilter : public BMessageFilter
{
@@ -27,16 +26,4 @@ class LClickFilter : public BMessageFilter
uint32 mLastMouseButton;
};
-class LMouseTrackingThread : public LThread
-{
-public:
- LMouseTrackingThread();
- virtual ~LMouseTrackingThread();
- virtual status_t Main( void );
-
-protected:
-
-private:
-};
-
#endif // _L_CLICK_FILTER_H
diff --git a/src/Makefile b/src/Makefile
index 816ca2b..14444bb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,7 +5,7 @@
## architecture of Haiku.
# The name of the binary.
-NAME = LaunchPad
+NAME = ../LaunchPad
# The type of binary, must be one of:
# APP: Application
@@ -64,7 +64,7 @@ RSRCS =
# - if your library does not follow the standard library naming scheme,
# you need to specify the path to the library and it's name.
# (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
-LIBS = be
+LIBS = be prefs $(STDCPPLIBS)
# Specify additional paths to directories following the standard libXXX.so
# or libXXX.a naming scheme. You can specify full paths or paths relative
From 317dc63ef4336ea1b83d152325494988f90224e0 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 28 Jul 2024 18:24:16 -0300
Subject: [PATCH 2/2] Avoid start-up crash. Better fixes welcomed!
---
src/PaletteWindow.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/PaletteWindow.cpp b/src/PaletteWindow.cpp
index 3202f9b..63f1489 100644
--- a/src/PaletteWindow.cpp
+++ b/src/PaletteWindow.cpp
@@ -179,6 +179,9 @@ WindowTab::Draw( BRect )
void
WindowTab::GetPreferredSize( float *w, float *h )
{
+ if (!Window())
+ return;
+
if ( Orientation() == B_HORIZONTAL )
{
*w = (Window()->Bounds()).Width();

View File

@@ -1,13 +0,0 @@
diff --git a/src/Makefile.in b/src/Makefile.in
index 15486d7..c8c4802 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -25,7 +25,7 @@ RSRCS = LaunchPad_ppc.rsrc
OBJS = $(addsuffix .o, $(foreach file, $(SRCS), $(basename $(notdir $(file)))))
-LIBS = $(LIBPREFSDIR)/bigprefs.$(CPU).a -lbe
+LIBS = $(LIBPREFSDIR)/libprefs.so -lbe # Was first $(LIBPREFSDIR)/bigprefs.$(CPU).a
all: LaunchPad

View File

@@ -1,26 +0,0 @@
diff --git a/configure.in b/configure.in
index 9cd3a85..0138f84 100644
--- a/configure.in
+++ b/configure.in
@@ -20,21 +20,6 @@ esac
AC_SUBST(CPU)
dnl -------------------------------------------------------------------
-dnl Check for BeOS R4
-dnl -------------------------------------------------------------------
-AC_MSG_CHECKING( [BeOS Release] )
-release=[$(uname -r | sed 's/\([^\.]*\)\..*/\1/')]
-case "$release" in
- 5|4)
- AC_MSG_RESULT( [post-R4] )
- ;;
- *)
- AC_MSG_RESULT( [not R4] )
- AC_MSG_ERROR( [BeOS Release 4 is required] )
- ;;
-esac
-
-dnl -------------------------------------------------------------------
dnl Check for libprefs source distribution
dnl -------------------------------------------------------------------
AC_ARG_WITH( libprefs, [ --with-libprefs=PATH path to the libprefs distribution ] )

View File

@@ -1,13 +0,0 @@
diff --git a/configure b/configure
index a438f22..1162706 100755
--- a/configure
+++ b/configure
@@ -585,7 +585,7 @@ echo $ac_n "checking BeOS Release ""... $ac_c" 1>&6
echo "configure:586: checking BeOS Release " >&5
release=$(uname -r | sed 's/\([^\.]*\)\..*/\1/')
case "$release" in
- 5|4)
+ 5|4|1)
echo "$ac_t""post-R4 " 1>&6
;;
*)