From 31a40d1aed267061b7d6330e46d4f16c3020c3f4 Mon Sep 17 00:00:00 2001
From: Thibaud CANALE <thican@thican.net>
Date: Tue, 2 Apr 2024 05:41:28 +0200
Subject: [PATCH] net-wireless/qflipper: rework nanopb include path

Keep closer to its upstream bundle path.

Signed-off-by: Thibaud CANALE <thican@thican.net>
---
 .../files/qflipper-1.3.0_unbundle.patch         | 17 ++++++++---------
 .../qflipper/files/qflipper-nanopb.patch        | 11 -----------
 net-wireless/qflipper/qflipper-1.3.3-r1.ebuild  |  1 -
 net-wireless/qflipper/qflipper-9999.ebuild      |  1 -
 4 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 net-wireless/qflipper/files/qflipper-nanopb.patch

diff --git a/net-wireless/qflipper/files/qflipper-1.3.0_unbundle.patch b/net-wireless/qflipper/files/qflipper-1.3.0_unbundle.patch
index 48e4ca9a2..75cfb77ab 100644
--- a/net-wireless/qflipper/files/qflipper-1.3.0_unbundle.patch
+++ b/net-wireless/qflipper/files/qflipper-1.3.0_unbundle.patch
@@ -1,9 +1,9 @@
 ---
  application/application.pro             | 5 ++---
  cli/cli.pro                             | 5 ++---
- plugins/flipperproto0/flipperproto0.pro | 5 ++---
+ plugins/flipperproto0/flipperproto0.pro | 4 ++--
  qFlipper.pro                            | 2 --
- 4 files changed, 6 insertions(+), 11 deletions(-)
+ 4 files changed, 6 insertions(+), 10 deletions(-)
 
 diff --git a/application/application.pro b/application/application.pro
 index c8b24333..28683b70 100644
@@ -52,20 +52,19 @@ index 5c007e7d..fe0106ee 100644
  
  win32 {
 diff --git a/plugins/flipperproto0/flipperproto0.pro b/plugins/flipperproto0/flipperproto0.pro
-index 64848402..c6b9fee7 100644
+index 64848402..5595aa9b 100644
 --- a/plugins/flipperproto0/flipperproto0.pro
 +++ b/plugins/flipperproto0/flipperproto0.pro
-@@ -12,8 +12,7 @@ CONFIG += plugin c++11
- 
+@@ -13,7 +13,7 @@ CONFIG += plugin c++11
  VERSION = 0.0.0
  
--INCLUDEPATH += $$PWD/../protobufinterface \
+ INCLUDEPATH += $$PWD/../protobufinterface \
 -    $$PWD/../../3rdparty/nanopb
-+INCLUDEPATH += $$PWD/../protobufinterface
++    /usr/include/nanopb
  
  HEADERS += \
      guirequest.h \
-@@ -65,7 +64,7 @@ SOURCES += \
+@@ -65,7 +65,7 @@ SOURCES += \
      systemresponse.cpp
  
  unix|win32 {
@@ -92,4 +91,4 @@ index 1bb97627..8b2a6c44 100644
  cli.depends = backend
 -plugins.depends = 3rdparty
 -- 
-2.39.2
+2.43.2
diff --git a/net-wireless/qflipper/files/qflipper-nanopb.patch b/net-wireless/qflipper/files/qflipper-nanopb.patch
deleted file mode 100644
index 811509dca..000000000
--- a/net-wireless/qflipper/files/qflipper-nanopb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/qflipper_common.pri.orig	2024-02-10 08:36:41.914137638 +0800
-+++ b/qflipper_common.pri	2024-02-10 08:51:51.385156397 +0800
-@@ -2,6 +2,8 @@
- 
- equals(QT_MAJOR_VERSION, 6): QT += core5compat
- 
-+INCLUDEPATH += "/usr/include/nanopb"
-+
- unix:!macx {
-     DEFINES += USB_BACKEND_LIBUSB
-     CONFIG += link_pkgconfig
diff --git a/net-wireless/qflipper/qflipper-1.3.3-r1.ebuild b/net-wireless/qflipper/qflipper-1.3.3-r1.ebuild
index bcb425aad..c7a4edaf8 100644
--- a/net-wireless/qflipper/qflipper-1.3.3-r1.ebuild
+++ b/net-wireless/qflipper/qflipper-1.3.3-r1.ebuild
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.0_unbundle.patch"
 	"${FILESDIR}/${P}_display_version.patch"
-	"${FILESDIR}/${PN}-nanopb.patch"
 )
 
 src_configure() {
diff --git a/net-wireless/qflipper/qflipper-9999.ebuild b/net-wireless/qflipper/qflipper-9999.ebuild
index 9b1135e7f..16050e852 100644
--- a/net-wireless/qflipper/qflipper-9999.ebuild
+++ b/net-wireless/qflipper/qflipper-9999.ebuild
@@ -44,7 +44,6 @@ DEPEND="${RDEPEND}"
 # https://github.com/flipperdevices/qFlipper/issues/213
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.0_unbundle.patch"
-	"${FILESDIR}/${PN}-nanopb.patch"
 )
 
 src_configure() {