[neon/extras/peruse/Neon/unstable] debian: more lints
Carlos De Maine
null at kde.org
Mon May 5 07:37:50 BST 2025
Git commit a60373cffcb675aba4fe164df6bd6319cf17f243 by Carlos De Maine.
Committed on 05/05/2025 at 06:37.
Pushed by carlosdem into branch 'Neon/unstable'.
more lints
D +0 -37 debian/patches/make-acbf-static.patch
D +0 -100 debian/patches/remove-rar-support.patch
D +0 -2 debian/patches/series
M +1 -1 debian/watch
https://invent.kde.org/neon/extras/peruse/-/commit/a60373cffcb675aba4fe164df6bd6319cf17f243
diff --git a/debian/patches/make-acbf-static.patch b/debian/patches/make-acbf-static.patch
deleted file mode 100644
index a7a3d2b..0000000
--- a/debian/patches/make-acbf-static.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: This patch makes libacbf static so it isn't a public library.
- Also, disable the installation of the related development bits.
-Author: Simon Quigley <tsimonq2 at ubuntu.com>
-Author: Pino Toscano <pino at debian.org>
-Last-Update: 2021-08-16
---- a/src/acbf/CMakeLists.txt
-+++ b/src/acbf/CMakeLists.txt
-@@ -63,7 +63,7 @@ ecm_qt_declare_logging_category(acbf_SRC
- EXPORT AdvancedComicBookFormat
- )
-
--add_library(acbf SHARED ${acbf_SRCS})
-+add_library(acbf STATIC ${acbf_SRCS})
- include(ECMGenerateExportHeader)
- ecm_generate_export_header(acbf
- EXPORT_FILE_NAME acbf_export.h
-@@ -133,20 +133,6 @@ configure_package_config_file(
- INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
- )
-
--install(FILES
-- "${CMAKE_CURRENT_BINARY_DIR}/AdvancedComicBookFormatConfig.cmake"
-- "${CMAKE_CURRENT_BINARY_DIR}/AdvancedComicBookFormatConfigVersion.cmake"
-- DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
-- COMPONENT Devel
--)
--install(FILES
-- ${acbf_HEADERS}
-- ${CMAKE_CURRENT_BINARY_DIR}/acbf_version.h
-- DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}/AdvancedComicBookFormat" COMPONENT Devel
--)
--
--install(TARGETS acbf EXPORT AdvancedComicBookFormatTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
--install(EXPORT AdvancedComicBookFormatTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE AdvancedComicBookFormatTargets.cmake )
- ecm_qt_install_logging_categories(
- EXPORT AdvancedComicBookFormat
- FILE AdvancedComicBookFormat.categories
diff --git a/debian/patches/remove-rar-support.patch b/debian/patches/remove-rar-support.patch
deleted file mode 100644
index 65e5349..0000000
--- a/debian/patches/remove-rar-support.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Description: Remove RAR support
- The embedded RAR support cannot be distributed as-is, so don't build it.
-Author: Simon Quigley <tsimonq2 at ubuntu.com>
-Forwarded: not-needed
-Last-Update: 2021-08-16
---- a/src/qtquick/ArchiveBookModel.cpp
-+++ b/src/qtquick/ArchiveBookModel.cpp
-@@ -45,7 +45,6 @@
- #include <KLocalizedString>
- #include <karchive.h>
- #include <kzip.h>
--#include "KRar.h" // "" because it's a custom thing for now
-
- #include <qtquick_debug.h>
- #include <AcbfData.h>
-@@ -210,10 +209,6 @@ void ArchiveBookModel::setFilename(QStri
- {
- d->archive = new KZip(newFilename);
- }
-- else if (mime.inherits("application/x-rar"))
-- {
-- d->archive = new KRar(newFilename);
-- }
-
- bool success = false;
- if(d->archive)
---- a/src/qtquick/ComicCoverImageProvider.cpp
-+++ b/src/qtquick/ComicCoverImageProvider.cpp
-@@ -21,7 +21,6 @@
-
- #include "ComicCoverImageProvider.h"
-
--#include <KRar.h>
- #include <KZip>
- #include <karchive.h>
- #include <karchivefile.h>
-@@ -172,9 +171,7 @@ void ComicCoverRunnable::run()
- QMimeDatabase db;
- db.mimeTypeForFile(d->id, QMimeDatabase::MatchContent);
- const QMimeType mime = db.mimeTypeForFile(d->id, QMimeDatabase::MatchContent);
-- if(!d->isAborted() && (mime.inherits("application/x-cbr") || mime.inherits("application/x-rar"))) {
-- archive = new KRar(d->id);
-- } else if(!d->isAborted() && (mime.inherits("application/x-cbz") || mime.inherits("application/zip"))) {
-+ if(!d->isAborted() && (mime.inherits("application/x-cbz") || mime.inherits("application/zip"))) {
- archive = new KZip(d->id);
- }
- // FIXME: This goes elsewhere - see below
---- a/src/qtquick/CMakeLists.txt
-+++ b/src/qtquick/CMakeLists.txt
-@@ -1,5 +1,3 @@
--add_subdirectory(karchive-rar)
--
- set(qmlplugin_SRCS
- qmlplugin.cpp
- ArchiveBookModel.cpp
-@@ -18,11 +16,6 @@ set(qmlplugin_SRCS
- TextViewerItem.cpp
- )
-
--set(karchive_rar_SRCS
-- karchive-rar/KRar.cpp
-- karchive-rar/KRarFileEntry.cpp
--)
--
- if(USE_PERUSE_PDFTHUMBNAILER)
- set(qmlplugin_SRCS
- ${qmlplugin_SRCS}
-@@ -37,7 +30,7 @@ ecm_qt_declare_logging_category(qmlplugi
- DEFAULT_SEVERITY Warning
- )
-
--add_library (peruseqmlplugin SHARED ${qmlplugin_SRCS} ${karchive_rar_SRCS} $<TARGET_OBJECTS:karchive-c-unarr>)
-+add_library (peruseqmlplugin SHARED ${qmlplugin_SRCS})
- if(USE_PERUSE_PDFTHUMBNAILER)
- target_compile_definitions(peruseqmlplugin
- PRIVATE
-@@ -46,8 +39,6 @@ target_compile_definitions(peruseqmlplug
- endif()
- target_include_directories(peruseqmlplugin
- PRIVATE
-- karchive-rar
-- karchive-rar/unarr
- acbf
- ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
- )
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -78,12 +78,6 @@ set_package_properties(KF5Kirigami2 PROP
- TYPE RUNTIME
- )
-
--find_package(ZLIB)
--set_package_properties(ZLIB PROPERTIES
-- PURPOSE "Required for the unarr based rar support used for reading books in the CBR format"
-- TYPE REQUIRED
--)
--
- # The following checks for the QQuickTextNode private header
- # The original checking code can be found in QtWebKit
- include(CheckCXXSourceCompiles)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c932ecf..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-#make-acbf-static.patch
-#remove-rar-support.patch
diff --git a/debian/watch b/debian/watch
index f204cc2..d18296d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=4
-https://download.kde.org/Attic/peruse/peruse-1.80.tar.xz
\ No newline at end of file
+opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/release-service/([\d.]+)/src/@PACKAGE at -@ANY_VERSION@@ARCHIVE_EXT@
\ No newline at end of file
More information about the Neon-commits
mailing list