From 154f8b980c0b9288e1b8240e79b1303eafb1c9c4 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Mon, 7 Jul 2025 00:52:20 -0600 Subject: [PATCH] emacs: agregar backport para v30.1 --- ...tom_libs_imagemagic_tree-sitter_json.patch | 41 +++++++++++++++++++ helpers/make-emacs | 9 +++- 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 helpers/DATA/emacs/patch_changes/000-add_custom_libs_imagemagic_tree-sitter_json.patch diff --git a/helpers/DATA/emacs/patch_changes/000-add_custom_libs_imagemagic_tree-sitter_json.patch b/helpers/DATA/emacs/patch_changes/000-add_custom_libs_imagemagic_tree-sitter_json.patch new file mode 100644 index 0000000..8f9640f --- /dev/null +++ b/helpers/DATA/emacs/patch_changes/000-add_custom_libs_imagemagic_tree-sitter_json.patch @@ -0,0 +1,41 @@ +diff --git a/debian/rules b/debian/rules +index 2aaaef13..db5d184f 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -297,6 +297,9 @@ confflags_gtk := $(confflags) + confflags_gtk += --with-cairo + confflags_gtk += --with-x=yes + confflags_gtk += --with-x-toolkit=gtk3 ++confflags_gtk += --with-imagemagick ++#confflags_gtk += --with-tree-sitter ++confflags_gtk += --with-json + # For those who prefer the old-style non-toolkit scrollbars, just + # change the assignment below to --without-toolkit-scroll-bars. The + # resulting emacs-gtk package will have the old scrollbars. +@@ -317,6 +320,9 @@ confflags_lucid += --with-x=yes + confflags_lucid += --with-x-toolkit=lucid + confflags_lucid += --with-toolkit-scroll-bars + confflags_lucid += --without-gsettings ++confflags_gtk += --with-imagemagick ++#confflags_gtk += --with-tree-sitter ++confflags_gtk += --with-json + + define cfg_tree + cd $(1) && \ +diff --git a/debian/control b/debian/control +index 005b695..169abfc 100644 +--- a/debian/control ++++ b/debian/control +@@ -26,10 +26,12 @@ Build-Depends: + libgpm-dev [linux-any], + libgtk-3-dev, + libharfbuzz-dev, ++ libjansson-dev, + libjpeg-dev, + liblcms2-dev, + liblockfile-dev, + libm17n-dev, ++ libmagickwand-dev, + libncurses-dev, + liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64], + libotf-dev, diff --git a/helpers/make-emacs b/helpers/make-emacs index d60e7f9..be5842c 100644 --- a/helpers/make-emacs +++ b/helpers/make-emacs @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2022 Luis Guzman +# Copyright (C) 2025 Luis Guzman # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,10 +16,15 @@ # along with this program. If not, see . -VERSION=1 +VERSION=1.1 +EXTERNAL='deb-src http://ftp.debian.org/debian bookworm-backports main' +REPOKEY=0E98404D386FA1D9 +BUILD_UNTIL=11.0 . ./config +apply_patch_changes + sed -i 's|emacs-common-non-dfsg|emacs-common-gfdl|g' debian/control changelog "Adjust emacs suggestion to emacs-common-gfdl"