KeymapSwitcher: Use safe SOURCE_URIs

* drop older recipes
This commit is contained in:
Sergei Reznikov
2016-10-02 19:29:28 +03:00
parent fab7aa9d71
commit 0ef04bdfaa
4 changed files with 14 additions and 184 deletions

View File

@@ -1,55 +0,0 @@
SUMMARY="Easy to use Keymap Switcher for Haiku"
DESCRIPTION="
This is a keymap switcher for Haiku. It is very similar to what you used to \
have in windows to change the keymap with hotkeys, but has some additional \
features (and lacks some, for sure)."
HOMEPAGE="http://www.sf.net/projects/switcher"
COPYRIGHT="1999-2003 Stas Maximov"
LICENSE="BSD (4-clause)"
REVISION="1"
SOURCE_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher(haiku)#release_1_2_7_10"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
keymapswitcher = $portVersion compat >= 1.2.7
"
REQUIRES="
haiku
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel
makefile_engine
cmd:gcc
cmd:ld
cmd:make
"
PATCH()
{
# Fix makefile not to use BUILDHOME as an install dir variable.
sed -i "s,BUILDHOME,HPKG_INSTALL_DIR,g" makefile
}
BUILD()
{
make $jobArgs BUILDHOME=/boot/common/develop HPKG_INSTALL_DIR=$prefix
}
INSTALL()
{
# We're not interested in the package, but that target copies the
# interesting files to a well-known directory structure. Otherwise we'd have
# to find out the name of the object dir and collect everything ourselves.
# Obviously an install target would be even better.
make BUILDHOME=/boot/common/develop HPKG_INSTALL_DIR=$prefix hpkg
# move misplaced KeymapSwitcher
mkdir $preferencesDir
mv $binDir/KeymapSwitcher $preferencesDir
addPreferencesDeskbarSymlink $preferencesDir/KeymapSwitcher
}

View File

@@ -1,14 +1,18 @@
SUMMARY="Easy to use Keymap Switcher for Haiku"
DESCRIPTION="
This is a keymap switcher for Haiku. It is very similar to what you used to \
have in windows to change the keymap with hotkeys, but has some additional \
features (and lacks some, for sure)."
HOMEPAGE="http://www.sf.net/projects/switcher"
COPYRIGHT="1999-2003 Stas Maximov"
DESCRIPTION="This is a keymap switcher for Haiku. It is very similar to what \
you used to have in windows to change the keymap with hotkeys, but has some \
additional features (and lacks some, for sure)."
HOMEPAGE="https://github.com/HaikuArchives/KeymapSwitcher"
COPYRIGHT="
1999-2003 Stas Maximov
2003-2013 Siarzhuk Zharski
"
LICENSE="BSD (4-clause)"
REVISION="1"
SOURCE_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher(haiku)#release_1_2_7_11"
PATCHES="keymapswitcher-$portVersion.patchset"
REVISION="2"
commit="dc72883019995034241eec5e9152cb817dc52002"
SOURCE_URI="https://github.com/HaikuArchives/KeymapSwitcher/archive/$commit.zip"
SOURCE_DIR="KeymapSwitcher-$commit"
CHECKSUM_SHA256="d9b6fcd6d7839c68a2a99db691185ea7590cd167eae1b9c7ff252bc9525ec400"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -31,15 +35,9 @@ BUILD_PREREQUIRES="
cmd:make
"
PATCH()
{
# Fix makefile not to use BUILDHOME as an install dir variable.
sed -i "s,BUILDHOME,HPKG_INSTALL_DIR,g" makefile
}
BUILD()
{
make $jobArgs BUILDHOME=/boot/system/develop HPKG_INSTALL_DIR=$prefix
make $jobArgs BUILDHOME=/system/develop HPKG_INSTALL_DIR=$prefix
}
INSTALL()

View File

@@ -1,69 +0,0 @@
SUMMARY="Easy to use Keymap Switcher for Haiku"
DESCRIPTION="
This is a keymap switcher for Haiku. It is very similar to what you used to \
have in windows to change the keymap with hotkeys, but has some additional \
features (and lacks some, for sure)."
HOMEPAGE="http://www.sf.net/projects/switcher"
COPYRIGHT="1999-2003 Stas Maximov"
LICENSE="BSD (4-clause)"
REVISION="2"
SOURCE_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher\(haiku\)#release_1_2_7_9"
ARCHITECTURES="x86_gcc2 ?x86"
PROVIDES="
keymapswitcher = $portVersion compat >= 1.2.7
"
REQUIRES="
haiku
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel
makefile_engine
cmd:gcc
cmd:ld
cmd:make
"
PATCH()
{
# TODO: Remove once in Haiku PM is in sync with master!
# B_TRANSLATION_CONTEXT was formerly known as B_TRANSLATE_CONTEXT.
sed -i "s,B_TRANSLATION_CONTEXT,B_TRANSLATE_CONTEXT," \
DeskView.cpp \
KeymapSwitcher.cpp \
SettingsWindow.cpp
# add liblocale to libraries to link against
sed -i "s,^\(LIBS=.*\),\1 locale," app.makefile
# patch away building the bindcatalogs target
sed -i "s,bindcatalogs,," makefile
}
BUILD()
{
make $jobArgs BUILDHOME=/boot/common/develop
}
INSTALL()
{
# We're not interested in the package, but that target copies the
# interesting files to a well-known directory structure. Otherwise we'd have
# to find out the name of the object dir and collect everything ourselves.
# Obviously an install target would be even better.
make BUILDHOME=/boot/common/develop package
addOnInstallDir=$addOnsDir/input_server/filters
mkdir -p $addOnInstallDir $preferencesDir
cp -a dist/common/add-ons/input_server/filters/keymap_switcher \
$addOnInstallDir
cp -a dist/common/bin/KeymapSwitcher $preferencesDir
# TODO: Also copy the catalogs!
# TODO: Declare the Deskbar menu symlink!
}

View File

@@ -1,44 +0,0 @@
From cfd8a405edcb8bbcdb3633f9d7633b98ba05a87d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 7 Feb 2014 15:24:16 +0100
Subject: Fix gcc2 build.
diff --git a/SettingsWindow.h b/SettingsWindow.h
index 251fb38..de49f94 100644
--- a/SettingsWindow.h
+++ b/SettingsWindow.h
@@ -78,6 +78,7 @@ class SettingsWindow: public BWindow
virtual void SelectionChanged();
virtual void MouseDown(BPoint point);
};
+ friend class KeymapOutlineListView;
class MoveButton : public BPictureButton
{
--
2.2.2
From 42ab04de2139b956780cffb7d08d11c03b8217c0 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 16 Aug 2015 13:15:45 +0300
Subject: fix makefile syntax
diff --git a/addon.makefile b/addon.makefile
index c937325..86c9456 100644
--- a/addon.makefile
+++ b/addon.makefile
@@ -122,7 +122,7 @@ all: _APP_ default
## include the makefile-engine
include $(BUILDHOME)/etc/makefile-engine
-clean ::
+clean :
rm -f _APP_
$(TARGET) : _APP_
--
2.2.2