Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] cutter: update to 2.0.5.
@ 2022-03-01  7:53 faulesocke
  2022-03-02  8:54 ` [PR PATCH] [Updated] WIP: " faulesocke
                   ` (31 more replies)
  0 siblings, 32 replies; 33+ messages in thread
From: faulesocke @ 2022-03-01  7:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 568 bytes --]

There is a new pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages cutter
https://github.com/void-linux/void-packages/pull/35901

cutter: update to 2.0.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/35901.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cutter-35901.patch --]
[-- Type: text/x-diff, Size: 3687 bytes --]

From 85997926a31265ba61d31d8bfb6370e3fae356f9 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Tue, 1 Mar 2022 08:49:12 +0100
Subject: [PATCH] cutter: update to 2.0.5.

---
 .../cutter/patches/ksyntaxhighlighting.patch  | 43 +++++++++++++++++++
 srcpkgs/cutter/template                       | 29 ++++++++-----
 2 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/cutter/patches/ksyntaxhighlighting.patch

diff --git a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch b/srcpkgs/cutter/patches/ksyntaxhighlighting.patch
new file mode 100644
index 000000000000..461a3dec9d58
--- /dev/null
+++ b/srcpkgs/cutter/patches/ksyntaxhighlighting.patch
@@ -0,0 +1,43 @@
+diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp
+index 3c309e83..47019165 100644
+--- a/src/common/Configuration.cpp
++++ b/src/common/Configuration.cpp
+@@ -7,9 +7,9 @@
+ #include <QApplication>
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+-#    include <KSyntaxHighlighting/repository.h>
+-#    include <KSyntaxHighlighting/theme.h>
+-#    include <KSyntaxHighlighting/definition.h>
++#    include <repository.h>
++#    include <theme.h>
++#    include <definition.h>
+ #endif
+ 
+ #include "common/ColorThemeWorker.h"
+diff --git a/src/common/SyntaxHighlighter.cpp b/src/common/SyntaxHighlighter.cpp
+index 64a2038e..eebb59f9 100644
+--- a/src/common/SyntaxHighlighter.cpp
++++ b/src/common/SyntaxHighlighter.cpp
+@@ -5,7 +5,7 @@
+ 
+ #    include "Configuration.h"
+ 
+-#    include <KSyntaxHighlighting/theme.h>
++#    include <theme.h>
+ 
+ SyntaxHighlighter::SyntaxHighlighter(QTextDocument *document)
+     : KSyntaxHighlighting::SyntaxHighlighter(document)
+diff --git a/src/common/SyntaxHighlighter.h b/src/common/SyntaxHighlighter.h
+index b9e88970..a21b4ec2 100644
+--- a/src/common/SyntaxHighlighter.h
++++ b/src/common/SyntaxHighlighter.h
+@@ -10,7 +10,7 @@
+ 
+ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
+ 
+-#    include <KSyntaxHighlighting/syntaxhighlighter.h>
++#    include <syntaxhighlighter.h>
+ 
+ class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
+ {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 7142c048f53c..174e9b25796e 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,16 +1,25 @@
 # Template file for 'cutter'
 pkgname=cutter
-version=1.12.0
-revision=2
-build_wrksrc=src
-build_style=qmake
-configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools radare2"
+version=2.0.5
+revision=1
+wrksrc=$pkgname
+build_style=cmake
+configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins
+ CUTTER_ENABLE_PYTHON=y CUTTER_ENABLE_PYTHON_BINDINGS=y
+ CUTTER_ENABLE_GRAPHVIZ=y CUTTER_ENABLE_KSYNTAXHIGHLIGHTING=y"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools radare2 meson git"
 makedepends="capstone-devel python3-devel qt5-declarative-devel
- qt5-location-devel qt5-svg-devel radare2"
+ qt5-location-devel qt5-svg-devel radare2 graphviz-devel
+ libshiboken2-devel libpyside2-python3-devel qt5-declarative-devel
+ syntax-highlighting-devel"
 short_desc="GUI for radare2 written in C++ and QT"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
-homepage="https://github.com/radareorg/cutter"
-distfiles="https://github.com/radareorg/${pkgname}/archive/v${version}.tar.gz"
-checksum=868213d2ea0b4a29b9b03c9b605c2b2155c4c03b62735a9bd376a0dadcb4fe1b
+homepage="https://cutter.re"
+
+do_fetch() {
+	git clone --recurse-submodules https://github.com/rizinorg/cutter
+	cd cutter
+	git checkout "v${version}"
+	git submodule update --init --recursive
+}

^ permalink raw reply	[flat|nested] 33+ messages in thread
end of thread, other threads:[~2022-03-04 23:55 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-01  7:53 [PR PATCH] cutter: update to 2.0.5 faulesocke
2022-03-02  8:54 ` [PR PATCH] [Updated] WIP: " faulesocke
2022-03-02  8:55 ` faulesocke
2022-03-02  8:58 ` [PR PATCH] [Updated] " faulesocke
2022-03-02  9:12 ` [PR REVIEW] " paper42
2022-03-02  9:13 ` paper42
2022-03-02 10:26 ` faulesocke
2022-03-02 10:31 ` faulesocke
2022-03-02 10:33 ` faulesocke
2022-03-02 10:38 ` [PR REVIEW] " faulesocke
2022-03-02 11:03 ` paper42
2022-03-02 11:03 ` paper42
2022-03-02 11:03 ` paper42
2022-03-02 11:03 ` paper42
2022-03-02 11:03 ` paper42
2022-03-02 11:03 ` paper42
2022-03-02 11:04 ` paper42
2022-03-02 11:05 ` paper42
2022-03-02 11:06 ` paper42
2022-03-02 11:06 ` paper42
2022-03-02 11:06 ` paper42
2022-03-02 11:47 ` faulesocke
2022-03-02 11:50 ` paper42
2022-03-02 12:00 ` [PR PATCH] [Updated] " faulesocke
2022-03-02 12:01 ` [PR REVIEW] " faulesocke
2022-03-02 12:05 ` paper42
2022-03-02 12:08 ` [PR PATCH] [Updated] " faulesocke
2022-03-02 12:15 ` faulesocke
2022-03-02 12:25 ` faulesocke
2022-03-02 12:29 ` [PR REVIEW] " faulesocke
2022-03-02 13:08 ` paper42
2022-03-02 13:08 ` paper42
2022-03-04 23:55 ` [PR PATCH] [Merged]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).