Balló György pushed to branch main at Arch Linux / Packaging / Packages /
regexxer
Commits:
1d082d35 by Balló György at 2024-11-14T04:22:30+01:00
upgpkg: 0.10-12: Rebuild for gtksourceviewmm-4.0
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + regexxer-gtksourceviewmm4.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = regexxer
pkgdesc = Interactive search and replace tool for GNOME
pkgver = 0.10
- pkgrel = 11
+ pkgrel = 12
url = https://regexxer.sourceforge.net/
arch = x86_64
license = GPL-2.0-or-later
@@ -15,13 +15,16 @@ pkgbase = regexxer
depends = glibmm
depends = gtk3
depends = gtkmm3
+ depends = gtksourceview4
depends = gtksourceviewmm
depends = hicolor-icon-theme
depends = libsigc++
depends = pangomm
source =
git+https://gitlab.gnome.org/Archive/regexxer.git#tag=regexxer-0.10
+ source = regexxer-gtksourceviewmm4.patch
source = regexxer.appdata.xml
b2sums =
9192c07e2152d87a2b36fa077981d62dc48138775578fb2c23593a9aa8529b5552138e503be82252904551747dbf4425b50ebcc3b285574977a73c6fe2365318
+ b2sums =
8465c61df06c830264eea9b1624bc957ff00c61f818d6b5d36cc70b659415cd66d5651c2249f9be3caf5204e66d372beb57a2a719101df09bedfd970fc02000d
b2sums =
1b8878c5fbfaccefd3f1157e9905b8e7cc022c9e5def6aa22b7f9dc06b8cad8b632962bf1aac1da763bedee702e14d373119ac66e2f9c07bde22beb9097086a3
pkgname = regexxer
=====================================
PKGBUILD
=====================================
@@ -2,7 +2,7 @@
pkgname=regexxer
pkgver=0.10
-pkgrel=11
+pkgrel=12
pkgdesc='Interactive search and replace tool for GNOME'
arch=(x86_64)
url='https://regexxer.sourceforge.net/'
@@ -16,6 +16,7 @@ depends=(
glibmm
gtk3
gtkmm3
+ gtksourceview4
gtksourceviewmm
hicolor-icon-theme
libsigc++
@@ -27,10 +28,12 @@ makedepends=(
)
source=(
"git+https://gitlab.gnome.org/Archive/$pkgname.git#tag=$pkgname-$pkgver";
+ regexxer-gtksourceviewmm4.patch
regexxer.appdata.xml
)
b2sums=(
9192c07e2152d87a2b36fa077981d62dc48138775578fb2c23593a9aa8529b5552138e503be82252904551747dbf4425b50ebcc3b285574977a73c6fe2365318
+
8465c61df06c830264eea9b1624bc957ff00c61f818d6b5d36cc70b659415cd66d5651c2249f9be3caf5204e66d372beb57a2a719101df09bedfd970fc02000d
1b8878c5fbfaccefd3f1157e9905b8e7cc022c9e5def6aa22b7f9dc06b8cad8b632962bf1aac1da763bedee702e14d373119ac66e2f9c07bde22beb9097086a3
)
@@ -46,6 +49,9 @@ prepare() {
# Don't try to compile GSettings schemas when packaging
sed -i '/GLIB_COMPILE_SCHEMAS/ d' Makefile.am
+ # Port to gtksourceviewmm4
+ git apply -3 ../regexxer-gtksourceviewmm4.patch
+
autoreconf -fi
}
=====================================
regexxer-gtksourceviewmm4.patch
=====================================
@@ -0,0 +1,44 @@
+From cd5c1834d0018040df57a540eaf3eefe926b1c8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]>
+Date: Thu, 14 Nov 2024 03:51:01 +0100
+Subject: [PATCH] Port to gtksourceviewmm4
+
+---
+ configure.ac | 2 +-
+ src/mainwindow.cc | 7 +++++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0dcf4d8..8f8a7d8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,7 @@ AM_GLIB_GNU_GETTEXT
+
+ PKG_CHECK_MODULES([REGEXXER_MODULES],
+ [gtkmm-3.0 >= 3.0.0 glibmm-2.4 >= 2.27.94
+- gtksourceviewmm-3.0 >= 2.91.5])
++ gtksourceviewmm-4.0 >= 2.91.5])
+
+ DK_PKG_PATH_PROG([GDK_PIXBUF_CSOURCE], [gdk-pixbuf-2.0], [gdk-pixbuf-csource])
+ DK_PKG_PATH_PROG([GTK_UPDATE_ICON_CACHE], [gtk+-2.0], [gtk-update-icon-cache])
+diff --git a/src/mainwindow.cc b/src/mainwindow.cc
+index 2596f5a..3ae1256 100644
+--- a/src/mainwindow.cc
++++ b/src/mainwindow.cc
+@@ -248,8 +248,11 @@ void MainWindow::initialize(const InitState& init)
+
textview_->set_show_line_numbers(settings->get_boolean(conf_key_show_line_numbers));
+
textview_->set_highlight_current_line(settings->get_boolean(conf_key_highlight_current_line));
+
textview_->set_auto_indent(settings->get_boolean(conf_key_auto_indentation));
+- textview_->set_draw_spaces(static_cast<Gsv::DrawSpacesFlags>
+- (settings->get_flags(conf_key_draw_spaces)));
++
++ GtkSourceSpaceDrawer* space_drawer =
gtk_source_view_get_space_drawer(textview_->gobj());
++ gtk_source_space_drawer_set_types_for_locations(space_drawer,
GTK_SOURCE_SPACE_LOCATION_ALL,
++
static_cast<GtkSourceSpaceTypeFlags>(settings->get_flags(conf_key_draw_spaces)));
++ gtk_source_space_drawer_set_enable_matrix(space_drawer, TRUE);
+
+ std::string folder;
+
+--
+2.47.0
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/regexxer/-/commit/1d082d35d2b29fe08028a1ea67d0296f8bf227c1
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/regexxer/-/commit/1d082d35d2b29fe08028a1ea67d0296f8bf227c1
You're receiving this email because of your account on gitlab.archlinux.org.
