haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

backup: Remove local patch and fetch it from upstream

Browse Source 
* Upstream already applied the patch we have locally,
  4c01c5b6f0
* Remove it, and update the recipe to fetch that commit (it is the next
  commit after what was currently being fetched).
This commit is contained in:
Chirayu Desai
2014-12-03 12:06:02 +00:00
parent 56677611c4
commit f6a29eb96d
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
haiku-apps/backup/backup-0.0.1.recipe
View File

@@ -5,8 +5,8 @@ A backup application for Haiku.
COPYRIGHT="2013 Alexander von Gluck IV" COPYRIGHT="2013 Alexander von Gluck IV"
LICENSE="MIT" LICENSE="MIT"
HOMEPAGE="https://github.com/kallisti5/backup" HOMEPAGE="https://github.com/kallisti5/backup"
SRC_URI="git+https://github.com/kallisti5/backup#34e156f64d" SRC_URI="git+https://github.com/kallisti5/backup#4c01c5b6f0"
REVISION="2" REVISION="3"
ARCHITECTURES="x86_gcc2 x86 ?x86_64" ARCHITECTURES="x86_gcc2 x86 ?x86_64"
@@ -26,8 +26,6 @@ BUILD_PREREQUIRES="
cmd:mkdepend cmd:mkdepend
" "
PATCHES="backup-0.0.1.patch"
BUILD() BUILD()
{ {
make OBJ_DIR=objects \ make OBJ_DIR=objects \

12
haiku-apps/backup/patches/backup-0.0.1.patch
View File

@@ -1,12 +0,0 @@
diff -Naur backup/BackupView.cpp backup-fix/BackupView.cpp
--- backup/BackupView.cpp 2013-11-18 21:15:38.949223424 +0000
+++ backup-fix/BackupView.cpp 2013-11-18 21:15:33.142344192 +0000
@@ -120,7 +120,7 @@
// Refresh System Directory
BPath sysSettingsDirectory;
- find_directory(B_COMMON_SETTINGS_DIRECTORY, &sysSettingsDirectory);
+ find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &sysSettingsDirectory);
fSysSettingBytes = DirectorySize(&sysSettingsDirectory);
size_to_string(fSysSettingBytes, sizeText, 512);
fSysSettingSizeText->SetText(sizeText);