From f6a29eb96d2ad4442654d6c24c27ed8f6e74a2e4 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 3 Dec 2014 12:06:02 +0000 Subject: [PATCH] backup: Remove local patch and fetch it from upstream * Upstream already applied the patch we have locally, https://github.com/kallisti5/backup/commit/4c01c5b6f0dd31c21223f5defdf388463769c59f * Remove it, and update the recipe to fetch that commit (it is the next commit after what was currently being fetched). --- haiku-apps/backup/backup-0.0.1.recipe | 6 ++---- haiku-apps/backup/patches/backup-0.0.1.patch | 12 ------------ 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 haiku-apps/backup/patches/backup-0.0.1.patch diff --git a/haiku-apps/backup/backup-0.0.1.recipe b/haiku-apps/backup/backup-0.0.1.recipe index f77b3b03d..c170b092c 100644 --- a/haiku-apps/backup/backup-0.0.1.recipe +++ b/haiku-apps/backup/backup-0.0.1.recipe @@ -5,8 +5,8 @@ A backup application for Haiku. COPYRIGHT="2013 Alexander von Gluck IV" LICENSE="MIT" HOMEPAGE="https://github.com/kallisti5/backup" -SRC_URI="git+https://github.com/kallisti5/backup#34e156f64d" -REVISION="2" +SRC_URI="git+https://github.com/kallisti5/backup#4c01c5b6f0" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -25,8 +25,6 @@ BUILD_PREREQUIRES=" cmd:make cmd:mkdepend " - -PATCHES="backup-0.0.1.patch" BUILD() { diff --git a/haiku-apps/backup/patches/backup-0.0.1.patch b/haiku-apps/backup/patches/backup-0.0.1.patch deleted file mode 100644 index fd90d8a98..000000000 --- a/haiku-apps/backup/patches/backup-0.0.1.patch +++ /dev/null @@ -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);