Package: kup-backup Version: 0.7.3+dfsg-1 Severity: important Tags: patch upstream
Dear Maintainer, libgit2 1.0 is now available in experimental. I have built kup-backup against it, it needs the attached patch to work. Please forward it upstream and also apply it in this Debian package. The severity of this report will be raised to serious once libgit2 1.0 is uploaded to unstable. Thanks Ximin -- System Information: Debian Release: bullseye/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable'), (300, 'unstable'), (100, 'experimental'), (1, 'experimental-debug') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.7.0-1-amd64 (SMP w/4 CPU threads) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8), LANGUAGE=en_GB:en Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages kup-backup depends on: ii kio 5.70.1-1 ii libc6 2.31-3 ii libgcc-s1 10.2.0-9 ii libgit2-28 0.28.5+dfsg.1-1 ii libkf5completion5 5.70.0-1 ii libkf5configcore5 5.70.0-1 ii libkf5configwidgets5 5.70.0-2 ii libkf5coreaddons5 5.70.0-2 ii libkf5dbusaddons5 5.70.0-1 ii libkf5i18n5 5.70.0-1 ii libkf5iconthemes5 5.70.0-1 ii libkf5idletime5 5.70.0-1 ii libkf5jobwidgets5 5.70.0-1 ii libkf5kiocore5 5.70.1-1 ii libkf5kiofilewidgets5 5.70.1-1 ii libkf5kiowidgets5 5.70.1-1 ii libkf5notifications5 5.70.0-1 pn libkf5plasma5 <none> ii libkf5solid5 5.70.0-1 ii libkf5widgetsaddons5 5.70.0-1 ii libkf5xmlgui5 5.70.0-1+b1 ii libqt5core5a 5.14.2+dfsg-6 ii libqt5dbus5 5.14.2+dfsg-6 ii libqt5gui5 5.14.2+dfsg-6 ii libqt5network5 5.14.2+dfsg-6 ii libqt5widgets5 5.14.2+dfsg-6 ii libstdc++6 10.2.0-9 Versions of packages kup-backup recommends: pn bup <none> ii rsync 3.2.3-2 kup-backup suggests no packages.
--- a/filedigger/main.cpp +++ b/filedigger/main.cpp @@ -21,10 +21,10 @@ #include "filedigger.h" #include "mergedvfs.h" -#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 -#include <git2/global.h> -#else +#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR < 24 #include <git2/threads.h> +#else +#include <git2/global.h> #endif #include <KAboutData> @@ -69,19 +69,19 @@ } // This needs to be called first thing, before any other calls to libgit2. - #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 - git_libgit2_init(); - #else + #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR < 24 git_threads_init(); + #else + git_libgit2_init(); #endif FileDigger *lFileDigger = new FileDigger(lRepoPath, lParser.value(QStringLiteral("branch"))); lFileDigger->show(); int lRetVal = lApp.exec(); - #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 - git_libgit2_shutdown(); - #else + #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR < 24 git_threads_shutdown(); + #else + git_libgit2_shutdown(); #endif return lRetVal; } --- a/kioslave/bupslave.cpp +++ b/kioslave/bupslave.cpp @@ -63,10 +63,10 @@ { mRepository = nullptr; mOpenFile = nullptr; - #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 - git_libgit2_init(); - #else + #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR < 24 git_threads_init(); + #else + git_libgit2_init(); #endif } @@ -74,10 +74,10 @@ if(mRepository != nullptr) { delete mRepository; } - #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24 - git_libgit2_shutdown(); - #else + #if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR < 24 git_threads_shutdown(); + #else + git_libgit2_shutdown(); #endif }