File 0002-Use-the-system-gumbo-parser-library.patch of Package kitscenarist

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Use-the-system-gumbo-parser-library.patch of Package kitscenarist

From 2b21b3e47730f4550b7730d2d8ef1e80fb40e764 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Wed, 21 Oct 2020 09:56:53 +0200
Subject: [PATCH 2/2] Use the system gumbo-parser library

---
 src/bin/scenarist-desktop.pro          |  2 +-
 src/libs/qgumboparser/HtmlTag.h        |  2 +-
 src/libs/qgumboparser/qgumbodocument.h |  2 +-
 src/libs/qgumboparser/qgumbonode.h     |  2 +-
 src/libs/qgumboparser/qgumboparser.pro | 30 +++-----------------------
 5 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/bin/scenarist-desktop.pro b/src/bin/scenarist-desktop.pro
index f9cc3a3..fa66dde 100755
--- a/src/bin/scenarist-desktop.pro
+++ b/src/bin/scenarist-desktop.pro
@@ -69,7 +69,7 @@ PRE_TARGETDEPS += $$PWD/../libs/webloader/src
 #
 # Подключаем библилотеку QGumboParser
 #
-LIBS += -L$$DESTDIR/../../libs/qgumboparser/ -lqgumboparser
+LIBS += -L$$DESTDIR/../../libs/qgumboparser/ -lqgumboparser -lgumbo
 
 INCLUDEPATH += $$PWD/../libs/qgumboparser
 DEPENDPATH += $$PWD/../libs/qgumboparser
diff --git a/src/libs/qgumboparser/HtmlTag.h b/src/libs/qgumboparser/HtmlTag.h
index 2c4175c..a69bedb 100644
--- a/src/libs/qgumboparser/HtmlTag.h
+++ b/src/libs/qgumboparser/HtmlTag.h
@@ -1,7 +1,7 @@
 #ifndef HTMLTAG_H
 #define HTMLTAG_H
 
-#include "gumbo-parser/src/gumbo.h"
+#include <gumbo-parser/gumbo.h>
 
 enum class HtmlTag
 {
diff --git a/src/libs/qgumboparser/qgumbodocument.h b/src/libs/qgumboparser/qgumbodocument.h
index fa88970..1a1455e 100644
--- a/src/libs/qgumboparser/qgumbodocument.h
+++ b/src/libs/qgumboparser/qgumbodocument.h
@@ -2,7 +2,7 @@
 #define QGUMBODOCUMENT_H
 
 #include <QByteArray>
-#include "gumbo-parser/src/gumbo.h"
+#include <gumbo-parser/gumbo.h>
 
 class QString;
 class QGumboNode;
diff --git a/src/libs/qgumboparser/qgumbonode.h b/src/libs/qgumboparser/qgumbonode.h
index 9c46d2c..048f42c 100644
--- a/src/libs/qgumboparser/qgumbonode.h
+++ b/src/libs/qgumboparser/qgumbonode.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include <functional>
-#include "gumbo-parser/src/gumbo.h"
+#include <gumbo-parser/gumbo.h>
 #include "HtmlTag.h"
 
 class QString;
diff --git a/src/libs/qgumboparser/qgumboparser.pro b/src/libs/qgumboparser/qgumboparser.pro
index be6ccc8..99c7ada 100644
--- a/src/libs/qgumboparser/qgumboparser.pro
+++ b/src/libs/qgumboparser/qgumboparser.pro
@@ -29,41 +29,17 @@ UI_DIR = $$DESTDIR/.ui
 SOURCES += \
     qgumboattribute.cpp \
     qgumbodocument.cpp \
-    qgumbonode.cpp \
-    gumbo-parser/src/attribute.c \
-    gumbo-parser/src/char_ref.c \
-    gumbo-parser/src/error.c \
-    gumbo-parser/src/parser.c \
-    gumbo-parser/src/string_buffer.c \
-    gumbo-parser/src/string_piece.c \
-    gumbo-parser/src/tag.c \
-    gumbo-parser/src/tokenizer.c \
-    gumbo-parser/src/utf8.c \
-    gumbo-parser/src/util.c \
-    gumbo-parser/src/vector.c
+    qgumbonode.cpp
 
 HEADERS += \
     qgumboattribute.h \
     qgumbodocument.h \
     qgumbonode.h \
-    gumbo-parser/src/attribute.h \
-    gumbo-parser/src/char_ref.h \
-    gumbo-parser/src/error.h \
-    gumbo-parser/src/gumbo.h \
-    gumbo-parser/src/insertion_mode.h \
-    gumbo-parser/src/parser.h \
-    gumbo-parser/src/string_buffer.h \
-    gumbo-parser/src/string_piece.h \
-    gumbo-parser/src/token_type.h \
-    gumbo-parser/src/tokenizer_states.h \
-    gumbo-parser/src/tokenizer.h \
-    gumbo-parser/src/utf8.h \
-    gumbo-parser/src/util.h \
-    gumbo-parser/src/vector.h \
     HtmlTag.h \
-    gumbo-parser/visualc/include/strings.h \
     helper.h
 
+LIBS += -lgumbo
+
 contains(QMAKE_CC, gcc): {
     QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-sign-compare -Wno-old-style-declaration
 }
-- 
2.28.0

Places

File 0002-Use-the-system-gumbo-parser-library.patch of Package kitscenarist

Places