diff --git a/dev-vcs/guitar/guitar-1.1.1.recipe b/dev-vcs/guitar/guitar-1.2.999~git.recipe
similarity index 86%
rename from dev-vcs/guitar/guitar-1.1.1.recipe
rename to dev-vcs/guitar/guitar-1.2.999~git.recipe
index 32bded80b..14f10702d 100644
--- a/dev-vcs/guitar/guitar-1.1.1.recipe
+++ b/dev-vcs/guitar/guitar-1.2.999~git.recipe
@@ -6,17 +6,18 @@ Features:
 * Written in C++
 * Powered by Qt 5"
 HOMEPAGE="https://soramimi.github.io/Guitar/"
-COPYRIGHT="2020 S.Fuchita"
+COPYRIGHT="2023 S.Fuchita"
 LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="https://github.com/soramimi/Guitar/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="9155fc7c8f28972ecf40ad0badc5a519b50a28e92f54e4e6ea2570ec5ecdf957"
+REVISION="1"
+srcGitRev="c7bb0f62d91c9803fd3e2f5b3017d84e6750e833"
+SOURCE_URI="https://github.com/soramimi/Guitar/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="603fceb37d82ef5ef53945694a1a339b777225f1c2ca6463ee73e32d3e19d1bb"
 SOURCE_FILENAME="Guitar-$portVersion-$srcGitRev.tar.gz"
-SOURCE_DIR="Guitar-$portVersion"
+SOURCE_DIR="Guitar-$srcGitRev"
 ADDITIONAL_FILES="guitar.rdef.in"
 PATCHES="guitar-$portVersion.patchset"
 
-ARCHITECTURES="all !x86_gcc2 ?arm ?ppc"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -25,7 +26,6 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	cmd:file
 	cmd:git
 	lib:libcrypto$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
diff --git a/dev-vcs/guitar/patches/guitar-1.1.1.patchset b/dev-vcs/guitar/patches/guitar-1.1.1.patchset
deleted file mode 100644
index 6309be632..000000000
--- a/dev-vcs/guitar/patches/guitar-1.1.1.patchset
+++ /dev/null
@@ -1,57 +0,0 @@
-From d546ef47139269493945df46685a41273521d11a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
-Date: Sun, 23 Feb 2020 16:16:16 +0100
-Subject: =?UTF-8?q?Applied=20patch=20from=20upstream:=20fix=20compilation?=
- =?UTF-8?q?=20problem=0A9c4708ba7a4a40b08b1083ee75b23ad66a411a50?=
-
-
-diff --git a/src/texteditor/AbstractCharacterBasedApplication.cpp b/src/texteditor/AbstractCharacterBasedApplication.cpp
-index cad4cc4..163b2f0 100644
---- a/src/texteditor/AbstractCharacterBasedApplication.cpp
-+++ b/src/texteditor/AbstractCharacterBasedApplication.cpp
-@@ -218,12 +218,12 @@ QString AbstractCharacterBasedApplication::recentlyUsedPath()
- 	return m->recently_used_path;
- }
- 
--std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::screen()
-+std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::char_screen()
- {
- 	return &m->screen;
- }
- 
--const std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::screen() const
-+const std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::char_screen() const
- {
- 	return &m->screen;
- }
-diff --git a/src/texteditor/AbstractCharacterBasedApplication.h b/src/texteditor/AbstractCharacterBasedApplication.h
-index e7418f9..596d656 100644
---- a/src/texteditor/AbstractCharacterBasedApplication.h
-+++ b/src/texteditor/AbstractCharacterBasedApplication.h
-@@ -233,8 +233,8 @@ protected:
- 	SelectionAnchor selection_anchor_1;
- protected:
- 
--	std::vector<Character> *screen();
--	std::vector<Character> const *screen() const;
-+	std::vector<Character> *char_screen();
-+	std::vector<Character> const *char_screen() const;
- 	std::vector<uint8_t> *line_flags();
- 
- 	void initEditor();
-diff --git a/src/texteditor/TextEditorWidget.cpp b/src/texteditor/TextEditorWidget.cpp
-index a2b23ab..26298a6 100644
---- a/src/texteditor/TextEditorWidget.cpp
-+++ b/src/texteditor/TextEditorWidget.cpp
-@@ -324,7 +324,7 @@ void TextEditorWidget::paintScreen(QPainter *painter)
- 			text.reserve(w);
- 			int o = y * w;
- 			CharAttr charattr;
--			Character const *line = &screen()->at(o);
-+			Character const *line = &char_screen()->at(o);
- 			int n = 0;
- 			while (x + n < w) {
- 				uint32_t c = line[x + n].c;
--- 
-2.24.1
-
diff --git a/dev-vcs/guitar/patches/guitar-1.2.999~git.patchset b/dev-vcs/guitar/patches/guitar-1.2.999~git.patchset
new file mode 100644
index 000000000..a30958476
--- /dev/null
+++ b/dev-vcs/guitar/patches/guitar-1.2.999~git.patchset
@@ -0,0 +1,44 @@
+From e4a7d35bdc2d8a66bbf87a409db2dd535326e97f Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sat, 23 Sep 2023 20:30:12 -0600
+Subject: use gethostbyname() on Haiku
+
+
+diff --git a/src/webclient.cpp b/src/webclient.cpp
+index 18c4c1a..bacac53 100644
+--- a/src/webclient.cpp
++++ b/src/webclient.cpp
+@@ -67,7 +67,7 @@ public:
+ 		struct hostent *he = nullptr;
+ 		{
+ 			int err = 0;
+-#if defined(_WIN32) || defined(__APPLE__)
++#if defined(_WIN32) || defined(__APPLE__) || defined(__HAIKU__)
+ 			he = ::gethostbyname(name);
+ #else
+ 			gethostbyname_r(name, &tmp, buf, sizeof(buf), &he, &err);
+-- 
+2.39.2
+
+
+From ebe4d2011dbdba9437ac95081c2d7fe4dce6f5d4 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sat, 23 Sep 2023 21:57:46 -0600
+Subject: fix INCLUDEPATH to include file/src
+
+
+diff --git a/filetype/filetype.pri b/filetype/filetype.pri
+index 32107a1..279a5de 100644
+--- a/filetype/filetype.pri
++++ b/filetype/filetype.pri
+@@ -1,6 +1,6 @@
+ 
+ INCLUDEPATH += filetype/misc
+-INCLUDEPATH += filetype/src
++INCLUDEPATH += filetype/file/src
+ INCLUDEPATH += filetype/pcre2/src
+ win32:INCLUDEPATH += filetype/win32
+ macx:INCLUDEPATH += filetype/macos
+-- 
+2.39.2
+