i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vim, KeymapSwitcher and UnRAR packages updated

Browse Source 
* Version of Vim package for x86_64 added;
* Version of KeymapSwitcher package for x86_64 added;
* KeymapSwitcher package fixed to preserve Cmd <-> Ctrl swap settings on
  keymaps switch. Fixes #9142;
* UnRAR updated from 3.7.8 to 4.2.4, fixed for multibyte characters
  support and build for x86_64. Partially fixes #4879;
This commit is contained in:
Siarzhuk Zharski
2013-01-22 09:38:48 +01:00
parent 90ae2e54f6
commit 44e22d214f
1 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+49 -10
View File
@@ -95,6 +95,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# TimGMSoundFont - a good quality General MIDI Sound Font # TimGMSoundFont - a good quality General MIDI Sound Font
# TrackerNewTemplates - template files for Tracker's New menu # TrackerNewTemplates - template files for Tracker's New menu
# Transmission - a fast, easy, and free BitTorrent Client # Transmission - a fast, easy, and free BitTorrent Client
# UnRAR - utility to list, test and extract RAR archives
# UserlandFS - aids native file system development (like FUSE) # UserlandFS - aids native file system development (like FUSE)
# Vim - Vi IMproved. Highly configurable text editor # Vim - Vi IMproved. Highly configurable text editor
# Vision - powerful native IRC client # Vision - powerful native IRC client
@@ -1330,22 +1331,29 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
# KeymapSwitcher # KeymapSwitcher
if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] { if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 {
Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-11-01.zip KeymapSwitcher-1.2.7-x86-gcc4-2013-01-08.zip
: $(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-11-01.zip : $(baseURL)/KeymapSwitcher-1.2.7-x86-gcc4-2013-01-08.zip
: : : false ; : : : false ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-11-01.zip KeymapSwitcher-1.2.7-x86-gcc2-2013-01-08.zip
: $(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-11-01.zip : $(baseURL)/KeymapSwitcher-1.2.7-x86-gcc2-2013-01-08.zip
: : : false ; : : : false ;
} }
AddSymlinkToHaikuImage home config settings deskbar Preferences AddSymlinkToHaikuImage home config settings deskbar Preferences
: /boot/common/bin/KeymapSwitcher ; : /boot/common/bin/KeymapSwitcher ;
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.7-x86_64-2013-01-08.zip
: $(baseURL)/KeymapSwitcher-1.2.7-x86_64-2013-01-08.zip
: : true ;
AddSymlinkToHaikuImage home config settings deskbar Preferences
: /boot/common/bin/KeymapSwitcher ;
} else {
Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
} }
} }
@@ -2080,6 +2088,31 @@ if [ IsOptionalHaikuImagePackageAdded Transmission ] {
} }
# UnRAR
if [ IsOptionalHaikuImagePackageAdded UnRAR ] {
if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
UnRAR-4.2.4-x86-gcc4-2013-01-21.zip
: $(baseURL)/UnRAR-4.2.4-x86-gcc4-2013-01-21.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
UnRAR-4.2.4-x86-gcc2-2013-01-21.zip
: $(baseURL)/UnRAR-4.2.4-x86-gcc2-2013-01-21.zip
: : true ;
}
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
UnRAR-4.2.4-x86_64-2013-01-21.zip
: $(baseURL)/UnRAR-4.2.4-x86_64-2013-01-21.zip
: : true ;
} else {
Echo "No optional package UnRAR available for $(TARGET_ARCH)" ;
}
}
# UserlandFS # UserlandFS
if [ IsOptionalHaikuImagePackageAdded UserlandFS ] { if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
local arch = $(TARGET_ARCH) ; local arch = $(TARGET_ARCH) ;
@@ -2135,9 +2168,7 @@ if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
# Vim # Vim
if [ IsOptionalHaikuImagePackageAdded Vim ] { if [ IsOptionalHaikuImagePackageAdded Vim ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 {
Echo "No optional package Vim available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage vim-7.3-r1a4-x86-gcc4-2012-09-26.zip InstallOptionalHaikuImagePackage vim-7.3-r1a4-x86-gcc4-2012-09-26.zip
: $(baseURL)/vim-7.3-r1a4-x86-gcc4-2012-09-26.zip : $(baseURL)/vim-7.3-r1a4-x86-gcc4-2012-09-26.zip
@@ -2149,6 +2180,14 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
} }
AddSymlinkToHaikuImage home config settings deskbar Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/common/bin/gvim ; : /boot/common/bin/gvim ;
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage vim-7.3-x86_64-2013-01-19.zip
: $(baseURL)/vim-7.3-x86_64-2013-01-19.zip
: : true ;
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/common/bin/gvim ;
} else {
Echo "No optional package Vim available for $(TARGET_ARCH)" ;
} }
} }