From 5e36a0dd6f9b2daf3f2ba8e768ab93e71ec36f3f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 19 Sep 2018 16:46:35 +0200 Subject: [PATCH] thememanager: upstreamed patchset. --- .../patches/thememanager-1.0~git.patchset | 31 ------------------- .../thememanager/thememanager-1.0~git.recipe | 15 +++++---- 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 haiku-apps/thememanager/patches/thememanager-1.0~git.patchset diff --git a/haiku-apps/thememanager/patches/thememanager-1.0~git.patchset b/haiku-apps/thememanager/patches/thememanager-1.0~git.patchset deleted file mode 100644 index 3a9fa83c8..000000000 --- a/haiku-apps/thememanager/patches/thememanager-1.0~git.patchset +++ /dev/null @@ -1,31 +0,0 @@ -From ed467fa99ce82b7cbc54e765b451ae156bcd8a71 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Sun, 18 Jun 2017 17:42:54 +0300 -Subject: B_BEOS_DATA_DIRECTORY -> B_SYSTEM_DATA_DIRECTORY - - -diff --git a/src/Utils.cpp b/src/Utils.cpp -index e029cc9..8a14e70 100644 ---- a/src/Utils.cpp -+++ b/src/Utils.cpp -@@ -117,7 +117,7 @@ escape_find_directory(BString *dir) - _BORK(B_BEOS_TRANSLATORS_DIRECTORY); - _BORK(B_BEOS_MEDIA_NODES_DIRECTORY); - _BORK(B_BEOS_SOUNDS_DIRECTORY); -- _BORK(B_BEOS_DATA_DIRECTORY); -+ _BORK(B_SYSTEM_DATA_DIRECTORY); - // not in the declared order, so others are picked first - _BORK(B_BEOS_ADDONS_DIRECTORY); - _BORK(B_BEOS_SYSTEM_DIRECTORY); -@@ -217,7 +217,7 @@ unescape_find_directory(BString *dir) - _BORK(B_BEOS_TRANSLATORS_DIRECTORY); - _BORK(B_BEOS_MEDIA_NODES_DIRECTORY); - _BORK(B_BEOS_SOUNDS_DIRECTORY); -- _BORK(B_BEOS_DATA_DIRECTORY); -+ _BORK(B_SYSTEM_DATA_DIRECTORY); - // not in the declared order, so others are picked first - _BORK(B_BEOS_ADDONS_DIRECTORY); - _BORK(B_BEOS_SYSTEM_DIRECTORY); --- -2.12.2 - diff --git a/haiku-apps/thememanager/thememanager-1.0~git.recipe b/haiku-apps/thememanager/thememanager-1.0~git.recipe index ad485b34c..4d1762e20 100644 --- a/haiku-apps/thememanager/thememanager-1.0~git.recipe +++ b/haiku-apps/thememanager/thememanager-1.0~git.recipe @@ -6,35 +6,34 @@ It is add-ons based, so it can be extended." HOMEPAGE="https://github.com/mmuman/HaikuThemeManager/" COPYRIGHT="2000-2015 François Revol" LICENSE="MIT" -REVISION="3" -srcGitRev="38a90a92ea0150a4589865e8ce2054e9726f6352" +REVISION="4" +srcGitRev="e4dcfc74544a07d774b2f41328c341aa1a8b8fab" SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="897c4c34f2c4d2988c3b2f20bcdfbaca3df04071a8ccd79578ab67890b05caeb" +CHECKSUM_SHA256="cb53c56b3f5f0284d6e0ff025bfcfd750ef6f50af2b6efd65afae53c2dfdecba" SOURCE_DIR="HaikuThemeManager-$srcGitRev" -PATCHES="thememanager-$portVersion.patchset" ARCHITECTURES="x86_gcc2 ?x86 x86_64" PROVIDES=" thememanager = $portVersion app:ThemeManager = $portVersion -" + " REQUIRES=" haiku -" + " #XXX: suggests? #thememanager_themes BUILD_REQUIRES=" haiku_devel -" + " BUILD_PREREQUIRES=" makefile_engine cmd:gcc cmd:git cmd:ld cmd:make -" + " BUILD() {