summaryrefslogtreecommitdiff
path: root/editors/jucipp
diff options
context:
space:
mode:
Diffstat (limited to 'editors/jucipp')
-rw-r--r--editors/jucipp/Makefile7
-rw-r--r--editors/jucipp/distinfo14
-rw-r--r--editors/jucipp/files/patch-src_source.cpp106
-rw-r--r--editors/jucipp/files/patch-src_usages__clang.cpp32
-rw-r--r--editors/jucipp/files/patch-src_window.cpp11
5 files changed, 10 insertions, 160 deletions
diff --git a/editors/jucipp/Makefile b/editors/jucipp/Makefile
index ad0de3e05e75..37d155509da8 100644
--- a/editors/jucipp/Makefile
+++ b/editors/jucipp/Makefile
@@ -1,7 +1,6 @@
PORTNAME= jucipp
DISTVERSIONPREFIX= v
-DISTVERSION= 1.8.0
-PORTREVISION= 9
+DISTVERSION= 1.8.1
CATEGORIES= editors
MAINTAINER= info@babaei.net
@@ -22,8 +21,8 @@ USES= cmake compiler:c++14-lang desktop-file-utils gnome \
llvm:build,noexport,run pkgconfig
USE_GITLAB= yes
GL_ACCOUNT= cppit
-GL_TUPLE= cppit:libclangmm:5611eb3d9e69486f85a431fbaae03c065f62c2d8:libclangmm/lib/libclangmm \
- eidheim:tiny-process-library:aaf6afa48ad8f0ea5f15dc5cb5f53888bf1ff7ac:tinyprocesslibrary/lib/tiny-process-library
+GL_TUPLE= cppit:libclangmm:8dca5d81af05d5184da92a2ca2ce175b5577de25:libclangmm/lib/libclangmm \
+ eidheim:tiny-process-library:8bbb5a211c5c9df8ee69301da9d22fb977b27dc1:tinyprocesslibrary/lib/tiny-process-library
USE_GNOME= gdkpixbuf gtkmm30 gtksourceviewmm3
CMAKE_ARGS= -DCMAKE_INCLUDE_PATH=${LOCALBASE}/llvm${LLVM_DEFAULT}/include \
diff --git a/editors/jucipp/distinfo b/editors/jucipp/distinfo
index 30dd1c2891e9..22efe3e4d5b4 100644
--- a/editors/jucipp/distinfo
+++ b/editors/jucipp/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1724084748
-SHA256 (jucipp-v1.8.0.tar.bz2) = 641ed653f3528a79cf80d9c8ccc6edf87acaf2d0f78d4c330bd8fd86b92974af
-SIZE (jucipp-v1.8.0.tar.bz2) = 946508
-SHA256 (cppit-libclangmm-5611eb3d9e69486f85a431fbaae03c065f62c2d8_GL0.tar.gz) = 391e1163c5c5981b7c362b0265e95cd78b4414c3c0f011a48c269f08806be12f
-SIZE (cppit-libclangmm-5611eb3d9e69486f85a431fbaae03c065f62c2d8_GL0.tar.gz) = 18115
-SHA256 (eidheim-tiny-process-library-aaf6afa48ad8f0ea5f15dc5cb5f53888bf1ff7ac_GL0.tar.gz) = 2faf40246f6d8a297b777e1ec7df5e3a060224967a7664de350d6cd42ef08b06
-SIZE (eidheim-tiny-process-library-aaf6afa48ad8f0ea5f15dc5cb5f53888bf1ff7ac_GL0.tar.gz) = 14307
+TIMESTAMP = 1764584013
+SHA256 (jucipp-v1.8.1.tar.bz2) = a852a09ca9408726050979edfa83e783017964ed996119f5cd84312e6400f1ff
+SIZE (jucipp-v1.8.1.tar.bz2) = 948476
+SHA256 (cppit-libclangmm-8dca5d81af05d5184da92a2ca2ce175b5577de25_GL0.tar.gz) = b3b667da4c090f6959bfa53e42290f501bd6f30a954658bf788bb0b739a6847b
+SIZE (cppit-libclangmm-8dca5d81af05d5184da92a2ca2ce175b5577de25_GL0.tar.gz) = 18287
+SHA256 (eidheim-tiny-process-library-8bbb5a211c5c9df8ee69301da9d22fb977b27dc1_GL0.tar.gz) = 0ff45f47da95f1c36ce5e1e91342285301bf339150b34c3c5964687117ef01e5
+SIZE (eidheim-tiny-process-library-8bbb5a211c5c9df8ee69301da9d22fb977b27dc1_GL0.tar.gz) = 14293
diff --git a/editors/jucipp/files/patch-src_source.cpp b/editors/jucipp/files/patch-src_source.cpp
deleted file mode 100644
index 27b739e533bc..000000000000
--- a/editors/jucipp/files/patch-src_source.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
---- src/source.cpp.orig 2023-08-03 07:43:31 UTC
-+++ src/source.cpp
-@@ -1193,57 +1193,61 @@ void Source::View::setup_format_style(bool is_generic_
- try {
- boost::property_tree::ptree pt;
- boost::property_tree::xml_parser::read_xml(stdout_stream, pt);
-- auto replacements_pt = pt.get_child("replacements", boost::property_tree::ptree());
-- for(auto it = replacements_pt.rbegin(); it != replacements_pt.rend(); ++it) {
-- if(it->first == "replacement") {
-- auto offset = it->second.get<size_t>("<xmlattr>.offset");
-- auto length = it->second.get<size_t>("<xmlattr>.length");
-- auto replacement_str = it->second.get<std::string>("");
-+ for(auto it_root = pt.begin(); it_root != pt.end(); ++it_root) {
-+ if(it_root->first == "replacements") {
-+ for(auto it = it_root->second.rbegin(); it != it_root->second.rend(); ++it) {
-+ if(it->first == "replacement") {
-+ auto offset = it->second.get<size_t>("<xmlattr>.offset");
-+ auto length = it->second.get<size_t>("<xmlattr>.length");
-+ auto replacement_str = it->second.get<std::string>("");
-
-- size_t bytes = 0;
-- for(size_t c = 0; c < bytes_in_lines.size(); ++c) {
-- auto previous_bytes = bytes;
-- bytes += bytes_in_lines[c];
-- if(offset < bytes || (c == bytes_in_lines.size() - 1 && offset == bytes)) {
-- std::pair<size_t, size_t> line_index(c, offset - previous_bytes);
-- auto start = get_buffer()->get_iter_at_line_index(line_index.first, line_index.second);
-+ size_t bytes = 0;
-+ for(size_t c = 0; c < bytes_in_lines.size(); ++c) {
-+ auto previous_bytes = bytes;
-+ bytes += bytes_in_lines[c];
-+ if(offset < bytes || (c == bytes_in_lines.size() - 1 && offset == bytes)) {
-+ std::pair<size_t, size_t> line_index(c, offset - previous_bytes);
-+ auto start = get_buffer()->get_iter_at_line_index(line_index.first, line_index.second);
-
-- // Use left gravity insert to avoid moving cursor from end of line
-- bool left_gravity_insert = false;
-- if(get_buffer()->get_insert()->get_iter() == start) {
-- auto iter = start;
-- do {
-- if(*iter != ' ' && *iter != '\t') {
-- left_gravity_insert = iter.ends_line();
-- break;
-+ // Use left gravity insert to avoid moving cursor from end of line
-+ bool left_gravity_insert = false;
-+ if(get_buffer()->get_insert()->get_iter() == start) {
-+ auto iter = start;
-+ do {
-+ if(*iter != ' ' && *iter != '\t') {
-+ left_gravity_insert = iter.ends_line();
-+ break;
-+ }
-+ } while(iter.forward_char());
- }
-- } while(iter.forward_char());
-- }
-
-- if(length > 0) {
-- auto offset_end = offset + length;
-- size_t bytes = 0;
-- for(size_t c = 0; c < bytes_in_lines.size(); ++c) {
-- auto previous_bytes = bytes;
-- bytes += bytes_in_lines[c];
-- if(offset_end < bytes || (c == bytes_in_lines.size() - 1 && offset_end == bytes)) {
-- auto end = get_buffer()->get_iter_at_line_index(c, offset_end - previous_bytes);
-- get_buffer()->erase(start, end);
-- start = get_buffer()->get_iter_at_line_index(line_index.first, line_index.second);
-- break;
-+ if(length > 0) {
-+ auto offset_end = offset + length;
-+ size_t bytes = 0;
-+ for(size_t c = 0; c < bytes_in_lines.size(); ++c) {
-+ auto previous_bytes = bytes;
-+ bytes += bytes_in_lines[c];
-+ if(offset_end < bytes || (c == bytes_in_lines.size() - 1 && offset_end == bytes)) {
-+ auto end = get_buffer()->get_iter_at_line_index(c, offset_end - previous_bytes);
-+ get_buffer()->erase(start, end);
-+ start = get_buffer()->get_iter_at_line_index(line_index.first, line_index.second);
-+ break;
-+ }
-+ }
- }
-+ if(left_gravity_insert) {
-+ Mark mark(start);
-+ get_buffer()->insert(start, replacement_str);
-+ get_buffer()->place_cursor(mark->get_iter());
-+ }
-+ else
-+ get_buffer()->insert(start, replacement_str);
-+ break;
- }
- }
-- if(left_gravity_insert) {
-- Mark mark(start);
-- get_buffer()->insert(start, replacement_str);
-- get_buffer()->place_cursor(mark->get_iter());
-- }
-- else
-- get_buffer()->insert(start, replacement_str);
-- break;
- }
- }
-+ break;
- }
- }
- }
diff --git a/editors/jucipp/files/patch-src_usages__clang.cpp b/editors/jucipp/files/patch-src_usages__clang.cpp
deleted file mode 100644
index 89b956a45b78..000000000000
--- a/editors/jucipp/files/patch-src_usages__clang.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/usages_clang.cpp.orig 2023-08-03 07:43:31 UTC
-+++ src/usages_clang.cpp
-@@ -562,7 +562,7 @@ Usages::Clang::PathSet Usages::Clang::find_paths(const
- boost::system::error_code ec;
- if(!boost::filesystem::is_regular_file(path, ec)) {
- if(path == build_path || path == debug_path || path.filename() == ".git")
-- it.no_push();
-+ it.disable_recursion_pending();
- continue;
- }
-
-@@ -737,7 +737,7 @@ void Usages::Clang::write_cache(const boost::filesyste
- stream.close();
- boost::filesystem::rename(tmp_file, full_cache_path, ec);
- if(ec) {
-- boost::filesystem::copy_file(tmp_file, full_cache_path, boost::filesystem::copy_option::overwrite_if_exists);
-+ boost::filesystem::copy_file(tmp_file, full_cache_path, boost::filesystem::copy_options::overwrite_existing);
- boost::filesystem::remove(tmp_file, ec);
- }
- }
-@@ -759,9 +759,9 @@ Usages::Clang::Cache Usages::Clang::read_cache(const b
- if(boost::filesystem::exists(cache_path, ec)) {
- std::ifstream stream(cache_path.string());
- if(stream) {
-- Cache cache;
-- boost::archive::text_iarchive text_iarchive(stream);
- try {
-+ Cache cache;
-+ boost::archive::text_iarchive text_iarchive(stream);
- text_iarchive >> cache;
- return cache;
- }
diff --git a/editors/jucipp/files/patch-src_window.cpp b/editors/jucipp/files/patch-src_window.cpp
deleted file mode 100644
index eed51beab9e4..000000000000
--- a/editors/jucipp/files/patch-src_window.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/window.cpp.orig 2023-08-03 07:43:31 UTC
-+++ src/window.cpp
-@@ -995,7 +995,7 @@ void Window::set_menu_actions() {
- if(std::any_of(exclude_folders.begin(), exclude_folders.end(), [&filename](const std::string &exclude_folder) {
- return filename == exclude_folder;
- }))
-- it.no_push();
-+ it.disable_recursion_pending();
- continue;
- }
- files.emplace_back(path);
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-08 20:05:20 +0000