diff --git a/haiku-apps/album/album-0.9.2.recipe b/haiku-apps/album/album-0.9.3.recipe similarity index 67% rename from haiku-apps/album/album-0.9.2.recipe rename to haiku-apps/album/album-0.9.3.recipe index 8543edd40..252c6743f 100644 --- a/haiku-apps/album/album-0.9.2.recipe +++ b/haiku-apps/album/album-0.9.3.recipe @@ -1,20 +1,18 @@ -SUMMARY="An image viewer/organiser designed for BeOS-compatible systems" -DESCRIPTION=" -Album is a file browsing and tagging utility for BeOS and compatibles. It \ +SUMMARY="An image viewer/organiser designed for BeOS-compatible systems." +DESCRIPTION="Album is a file browsing and tagging utility for Haiku. 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. -" +picture files and BFS volumes, although this further limits 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#64aa3371a9" +SRC_URI="git+https://github.com/HaikuArchives/Album#cbabd25282" LICENSE="MIT" COPYRIGHT="2006-2009 by Matjaž Kovač" -REVISION="3" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 ?x86_64" + PROVIDES=" Album = $portVersion app:Album = $portVersion @@ -22,10 +20,12 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion + lib:libiptcdata$secondaryArchSuffix " BUILD_REQUIRES=" haiku_devel >= $haikuVersion + devel:libiptcdata$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -35,8 +35,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -PATCHES="album-0.9.2.patchset" - USER_SETTINGS_FILES=" settings/Album_settings " @@ -44,8 +42,7 @@ USER_SETTINGS_FILES=" BUILD() { cd src - make OBJ_DIR=objects \ - BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make OBJ_DIR=objects } INSTALL() diff --git a/haiku-apps/album/patches/album-0.9.2.patchset b/haiku-apps/album/patches/album-0.9.2.patchset deleted file mode 100644 index 14fffeab6..000000000 --- a/haiku-apps/album/patches/album-0.9.2.patchset +++ /dev/null @@ -1,45 +0,0 @@ -From 47be97d358d8db50026e107d94a63d15f39e7fb1 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -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 -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 -