mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-03 05:28:53 +02:00
Overhaul the haiku-apps directory
* Fixed PROVIDES/*REQUIRES entries * Added vcs hashes to the ports needing it in the SRC_URI * Made single executable apps install to the top level $appsDir * Added patches for gcc4 versions of most apps * Added patches for apps that couldn't build on any arch ( even though they were marked as working :( ) * Other misc fixes that I've forgotten already because I'm sick of looking at this directory
This commit is contained in:
@@ -1,18 +1,20 @@
|
||||
SUMMARY="An image viewer/organiser designed for BeOS-compatible operating systems."
|
||||
DESCRIPTION="Album is a file browsing and tagging utility for BeOS and compatibles. It
|
||||
started out with a goal of the ultimate image organiser (code named Aberration), but ended
|
||||
up as something much more modest and BeOS-specific. The idea is to have a work pad for
|
||||
pictures from different locations where they can be previewed and tagged in one place. The
|
||||
program is not limited to picture files and BFS (Be File System) volumes, although that
|
||||
further limits whatever the usefulness since much of the functionality has to do with file
|
||||
SUMMARY="An image viewer/organiser designed for BeOS-compatible systems."
|
||||
DESCRIPTION="
|
||||
Album is a file browsing and tagging utility for BeOS and compatibles.
|
||||
It started out with a goal of the ultimate image organiser (code
|
||||
named Aberration), but ended up as something much more modest and
|
||||
BeOS-specific. The idea is to have a work pad for pictures from
|
||||
different locations where they can be previewed and tagged in one
|
||||
place. The program is not limited to picture files and BFS (Be File
|
||||
System) volumes, although that further limits whatever the usefulness
|
||||
since much of the functionality has to do with file
|
||||
attributes."
|
||||
HOMEPAGE="http://users.volja.net/mkovac1/proj/album/"
|
||||
SRC_URI="git://github.com/HaikuArchives/Album"
|
||||
#CHECKSUM_MD5=" "
|
||||
SRC_URI="git://github.com/HaikuArchives/Album#64aa3371a9"
|
||||
LICENSE="MIT"
|
||||
COPYRIGHT="2006-2009 by Matjaž Kovač"
|
||||
REVISION="2"
|
||||
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
|
||||
REVISION="3"
|
||||
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
|
||||
PROVIDES="
|
||||
Album = $portVersion
|
||||
app:Album = $portVersion
|
||||
@@ -22,34 +24,33 @@ REQUIRES="
|
||||
haiku >= $haikuVersion
|
||||
"
|
||||
|
||||
BUILD_REQUIRES=" "
|
||||
BUILD_REQUIRES="
|
||||
haiku_devel >= $haikuVersion
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel >= $haikuVersion
|
||||
makefile_engine
|
||||
cmd:gcc
|
||||
cmd:make
|
||||
cmd:mkdepend
|
||||
"
|
||||
|
||||
PATCHES="album-0.9.2.patch"
|
||||
PATCHES="album-0.9.2.patchset"
|
||||
|
||||
USER_SETTINGS_FILES="
|
||||
settings/Album_settings
|
||||
"
|
||||
|
||||
SOURCE_DIR="$portVersionedName/src"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
|
||||
cd src
|
||||
make OBJ_DIR=objects \
|
||||
BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
albumDir=$appsDir/Album
|
||||
mkdir -p $albumDir
|
||||
|
||||
cp -a objects.x86-gcc2-debug/Album $albumDir
|
||||
|
||||
addAppDeskbarSymlink $albumDir/Album
|
||||
mkdir -p $appsDir
|
||||
cp -a src/objects/Album $appsDir
|
||||
addAppDeskbarSymlink $appsDir/Album
|
||||
}
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/MainWindow.cpp b/MainWindow.cpp
|
||||
index 4fcb98a..66ed596 100644
|
||||
--- a/MainWindow.cpp
|
||||
+++ b/MainWindow.cpp
|
||||
@@ -142,7 +142,7 @@ MainWindow::MainWindow(BRect frame, const char *title):
|
||||
|
||||
// Create a tempory repository for negotiated drops from image ditors etc.
|
||||
BPath path;
|
||||
- if (find_directory(B_COMMON_TEMP_DIRECTORY, &path) == B_OK) {
|
||||
+ if (find_directory(B_SYSTEM_TEMP_DIRECTORY, &path) == B_OK) {
|
||||
path.Append("Album");
|
||||
if (create_directory(path.Path(), 0x777) == B_OK) {
|
||||
fRepository.SetTo(path.Path());
|
||||
45
haiku-apps/album/patches/album-0.9.2.patchset
Normal file
45
haiku-apps/album/patches/album-0.9.2.patchset
Normal file
@@ -0,0 +1,45 @@
|
||||
From 47be97d358d8db50026e107d94a63d15f39e7fb1 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Roberts <cpr420@gmail.com>
|
||||
Date: Mon, 2 Dec 2013 17:23:41 -0700
|
||||
Subject: applying patch album-0.9.2.patch
|
||||
|
||||
|
||||
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
|
||||
index 4fcb98a..66ed596 100644
|
||||
--- a/src/MainWindow.cpp
|
||||
+++ b/src/MainWindow.cpp
|
||||
@@ -142,7 +142,7 @@ MainWindow::MainWindow(BRect frame, const char *title):
|
||||
|
||||
// Create a tempory repository for negotiated drops from image ditors etc.
|
||||
BPath path;
|
||||
- if (find_directory(B_COMMON_TEMP_DIRECTORY, &path) == B_OK) {
|
||||
+ if (find_directory(B_SYSTEM_TEMP_DIRECTORY, &path) == B_OK) {
|
||||
path.Append("Album");
|
||||
if (create_directory(path.Path(), 0x777) == B_OK) {
|
||||
fRepository.SetTo(path.Path());
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 8f2c953908de0b0e23ae027802902072b153c686 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Roberts <cpr420@gmail.com>
|
||||
Date: Mon, 2 Dec 2013 17:27:22 -0700
|
||||
Subject: Fix makefile stdc++ libs
|
||||
|
||||
|
||||
diff --git a/src/makefile b/src/makefile
|
||||
index 02e892f..38f0454 100644
|
||||
--- a/src/makefile
|
||||
+++ b/src/makefile
|
||||
@@ -63,7 +63,7 @@ RSRCS= Album.rsrc
|
||||
# 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=root be translation iptcdata
|
||||
+LIBS=be translation iptcdata $(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
|
||||
|
||||
Reference in New Issue
Block a user