Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package emacs-libgit2 for openSUSE:Factory checked in at 2024-03-28 13:54:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs-libgit2 (Old) and /work/SRC/openSUSE:Factory/.emacs-libgit2.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "emacs-libgit2" Thu Mar 28 13:54:45 2024 rev:3 rq:1163043 version:471.373defa Changes: -------- --- /work/SRC/openSUSE:Factory/emacs-libgit2/emacs-libgit2.changes 2024-03-05 18:50:38.472997820 +0100 +++ /work/SRC/openSUSE:Factory/.emacs-libgit2.new.1905/emacs-libgit2.changes 2024-03-28 14:26:01.623326367 +0100 @@ -1,0 +2,12 @@ +Mon Mar 25 18:21:17 UTC 2024 - Björn Bidar <bjorn.bidar@thaodan.de> + +- Drop the following patches as they have been accepted by upstream: + * 0001-libgit.el-Be-able-to-load-libegit2-from-load-path-if.patch + * 0002-Add-install-targets-for-libgit-and-libegit2.patch + * 0003-Don-t-mark-libgit2-target-as-phony-don-t-rebuild-it-.patch +- Update to 471.373defa + * Make it possible to install libgit and libegit2 from Makefile + * Be able to load libegit2 from load-path if found + * License changed from GPL-3.0-or-later to GPL-2.0-or-later + +------------------------------------------------------------------- Old: ---- 0001-libgit.el-Be-able-to-load-libegit2-from-load-path-if.patch 0002-Add-install-targets-for-libgit-and-libegit2.patch 0003-Don-t-mark-libgit2-target-as-phony-don-t-rebuild-it-.patch libegit2-467.ab1a53a.tar.gz New: ---- libegit2-471.373defa.tar.gz BETA DEBUG BEGIN: Old:- Drop the following patches as they have been accepted by upstream: * 0001-libgit.el-Be-able-to-load-libegit2-from-load-path-if.patch * 0002-Add-install-targets-for-libgit-and-libegit2.patch Old: * 0001-libgit.el-Be-able-to-load-libegit2-from-load-path-if.patch * 0002-Add-install-targets-for-libgit-and-libegit2.patch * 0003-Don-t-mark-libgit2-target-as-phony-don-t-rebuild-it-.patch Old: * 0002-Add-install-targets-for-libgit-and-libegit2.patch * 0003-Don-t-mark-libgit2-target-as-phony-don-t-rebuild-it-.patch - Update to 471.373defa BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs-libgit2.spec ++++++ --- /var/tmp/diff_new_pack.4Wm6bi/_old 2024-03-28 14:26:16.395853274 +0100 +++ /var/tmp/diff_new_pack.4Wm6bi/_new 2024-03-28 14:26:16.399853416 +0100 @@ -17,19 +17,13 @@ Name: emacs-libgit2 -Version: 467.ab1a53a +Version: 471.373defa Release: 0 Summary: An experimental module for libgit2 bindings to Emacs -License: GPL-3.0-or-later +License: GPL-2.0-or-later Group: Productivity/Text/Editors URL: https://github.com/magit/libegit2 Source0: libegit2-%{version}.tar.gz -# PATCH-FEATURE-UPSTREAM load libegit from load-path PR 126 -Patch1: 0001-libgit.el-Be-able-to-load-libegit2-from-load-path-if.patch -# PATCH-FEATURE-UPSTREAM install targets PR 126 -Patch2: 0002-Add-install-targets-for-libgit-and-libegit2.patch -# PATCH-FEATURE-UPSTREAM Don't rebuild libgit even if it already has been build PR 126 -Patch3: 0003-Don-t-mark-libgit2-target-as-phony-don-t-rebuild-it-.patch BuildRequires: cmake BuildRequires: emacs-devel BuildRequires: emacs-nox ++++++ libegit2-467.ab1a53a.tar.gz -> libegit2-471.373defa.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libegit2-467.ab1a53a/Makefile new/libegit2-471.373defa/Makefile --- old/libegit2-467.ab1a53a/Makefile 2023-01-29 06:44:59.000000000 +0100 +++ new/libegit2-471.373defa/Makefile 2023-12-04 16:38:25.000000000 +0100 @@ -1,3 +1,11 @@ +DESTDIR ?= +PREFIX ?= /usr +DATADIR ?= $(PREFIX)/share +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib +ELDIR ?= $(DATADIR)/emacs/site-lisp +DYNMODDRIR ?= $(LIBDIR)/emacs/site-lisp + BUILD_OPTIONS=-DCMAKE_BUILD_TYPE=Debug ifeq '$(findstring ;,$(PATH))' ';' @@ -54,7 +62,7 @@ LOAD_PATH ?= -L . -L build -.PHONY: test libgit2 submodule-update +.PHONY: test submodule-update install all: lisp @@ -135,3 +143,17 @@ (update-directory-autoloads default-directory))" endif + +install-%-dynamic-module: + $(if $<, install -m755 -d $(DESTDIR)$(DYNMODDRIR)) + $(if $<, install -m755 $^ $(DESTDIR)$(DYNMODDRIR)) + +install-%-el: + $(if $<, install -m755 -d $(DESTDIR)$(ELDIR)) + $(if $<, install -m644 $^ $(DESTDIR)$(ELDIR)) + +install: $(addprefix install-, libgit-el libgit-dynamic-module) + +install-libgit-el: $(ELS) $(ELCS) $(PKG)-autoloads.el + +install-libgit-dynamic-module: build/libegit2.so diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libegit2-467.ab1a53a/libgit.el new/libegit2-471.373defa/libgit.el --- old/libegit2-467.ab1a53a/libgit.el 2023-01-29 06:44:59.000000000 +0100 +++ new/libegit2-471.373defa/libgit.el 2023-12-04 16:38:25.000000000 +0100 @@ -53,8 +53,13 @@ (expand-file-name "build" libgit--root) "Directory where the libegit2 dynamic module file should be built.") -(defvar libgit--module-file - (expand-file-name "libegit2.so" libgit--build-dir) +(defvar libgit--module-file-name + (file-name-with-extension "libegit2" module-file-suffix) + "Name of the libegit2 dynamic module file.") + +(defvar libgit--module-file-name-path + (expand-file-name libgit--module-file-name + libgit--build-dir) "Path to the libegit2 dynamic module file.") (defun libgit--configure () @@ -90,7 +95,7 @@ "Load the `libegit2' dynamic module. If that fails, then raise an error." (unless (featurep 'libegit2) - (load libgit--module-file nil t t)) + (load libgit--module-file-name-path nil t t)) (unless (featurep 'libegit2) (error "libgit: unable to load the libegit2 dynamic module"))) @@ -100,8 +105,11 @@ If the module is not available, then offer to build it." (interactive) (cond - ((file-exists-p libgit--module-file) - (libgit--load)) + ((file-exists-p libgit--module-file-name-path) + (libgit--load)) + ((locate-library libgit--module-file-name t) + (setq libgit--module-file-name-path (locate-library libgit--module-file-name t)) + (libgit--load)) (libgit-auto-rebuild (libgit--configure)) ((and (not noninteractive)