From bdeea61b51e93b63402f3d90b73f050c8af0be79 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 18 Apr 2022 02:17:17 +0300 Subject: [PATCH] packaging: kde-extraapps dependencies update Signed-off-by: Ivailo Monev --- packaging/debian/katana-extraapps/control | 2 +- packaging/debian/libpoppler-katie/changelog | 17 ----------- packaging/debian/libpoppler-katie/compat | 1 - packaging/debian/libpoppler-katie/control | 16 ----------- packaging/debian/libpoppler-katie/rules | 12 -------- packaging/freebsd/katana-extraapps/Makefile | 7 +++-- packaging/freebsd/poppler-katie/Makefile | 32 --------------------- packaging/freebsd/poppler-katie/distinfo | 3 -- packaging/freebsd/poppler-katie/pkg-descr | 3 -- packaging/freebsd/poppler-katie/pkg-plist | 12 -------- packaging/netbsd/Makefile | 3 +- packaging/netbsd/kde-extraapps/Makefile | 2 +- 12 files changed, 7 insertions(+), 103 deletions(-) delete mode 100644 packaging/debian/libpoppler-katie/changelog delete mode 100644 packaging/debian/libpoppler-katie/compat delete mode 100644 packaging/debian/libpoppler-katie/control delete mode 100755 packaging/debian/libpoppler-katie/rules delete mode 100644 packaging/freebsd/poppler-katie/Makefile delete mode 100644 packaging/freebsd/poppler-katie/distinfo delete mode 100644 packaging/freebsd/poppler-katie/pkg-descr delete mode 100644 packaging/freebsd/poppler-katie/pkg-plist diff --git a/packaging/debian/katana-extraapps/control b/packaging/debian/katana-extraapps/control index fba41e8..5edd1ca 100644 --- a/packaging/debian/katana-extraapps/control +++ b/packaging/debian/katana-extraapps/control @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9~), cmake, katie-dev, katana-baseapps, libqalculate-dev, libspectre-dev, libspeechd-dev, libswscale-dev, libtag1-dev, uuid-dev, libudev-dev [linux-any], libvncserver-dev, freerdp2-dev, libffmpegthumbnailer-dev, libbz2-dev, - libtorrent-rasterbar-dev, libdbusmenu-katie, libpoppler-katie + libtorrent-rasterbar-dev, libpoppler-cpp-dev, libdbusmenu-katie Package: katana-extraapps Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x hurd-i386 diff --git a/packaging/debian/libpoppler-katie/changelog b/packaging/debian/libpoppler-katie/changelog deleted file mode 100644 index 2fd4e84..0000000 --- a/packaging/debian/libpoppler-katie/changelog +++ /dev/null @@ -1,17 +0,0 @@ -libpoppler-katie (4.21.0) unstable; urgency=medium - - * Package update - - -- Ivailo Monev Fri, 13 Aug 2020 07:32:58 +0200 - -libpoppler-katie (4.20.0) stable; urgency=medium - - * Package update - - -- Ivailo Monev Wed, 03 Feb 2021 10:33:05 +0000 - -libpoppler-katie (4.19.0) unstable; urgency=medium - - * Initial package - - -- Ivailo Monev Sat, 01 Feb 2020 10:33:05 +0000 diff --git a/packaging/debian/libpoppler-katie/compat b/packaging/debian/libpoppler-katie/compat deleted file mode 100644 index 9a03714..0000000 --- a/packaging/debian/libpoppler-katie/compat +++ /dev/null @@ -1 +0,0 @@ -10 \ No newline at end of file diff --git a/packaging/debian/libpoppler-katie/control b/packaging/debian/libpoppler-katie/control deleted file mode 100644 index 52c7236..0000000 --- a/packaging/debian/libpoppler-katie/control +++ /dev/null @@ -1,16 +0,0 @@ -Source: libpoppler-katie -Section: libdevel -Priority: optional -Maintainer: Ivailo Monev -Homepage: https://github.com/fluxer/poppler -Vcs-Git: git://github.com/fluxer/poppler.git -Vcs-browser: https://github.com/fluxer/poppler -Standards-Version: 4.21.0 -Build-Depends: debhelper (>= 9~), cmake, libfreetype6-dev, libfontconfig1-dev, - libpng-dev, libjpeg-dev, libtiff5-dev, liblcms2-dev, libopenjp2-7-dev, - libnss3-dev, zlib1g-dev, libc6-dev, libcurl4-nss-dev, katie-dev - -Package: libpoppler-katie -Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x hurd-i386 -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Katie bindings for poppler diff --git a/packaging/debian/libpoppler-katie/rules b/packaging/debian/libpoppler-katie/rules deleted file mode 100755 index 76f28af..0000000 --- a/packaging/debian/libpoppler-katie/rules +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/make -f - -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -%: - dh $@ --parallel - -override_dh_auto_configure: - dh_auto_configure -- -Wno-dev \ - -DENABLE_UTILS=OFF \ - -DBUILD_TESTS=OFF \ - -DBUILD_QT4_TESTS=OFF diff --git a/packaging/freebsd/katana-extraapps/Makefile b/packaging/freebsd/katana-extraapps/Makefile index 41ea73d..3204098 100644 --- a/packaging/freebsd/katana-extraapps/Makefile +++ b/packaging/freebsd/katana-extraapps/Makefile @@ -29,14 +29,15 @@ RUN_DEPENDS = xfreerdp:net/freerdp xsltproc:textproc/libxslt \ # zlib and oss are not part of any package LIB_DEPENDS = libKtCore.so:katana/katie libkdecore.so:katana/katanalibs \ libkonq.so:katana/katana-baseapps libplasmagenericshell.so:katana/katana-workspace \ - libpoppler-katie.so:katana/poppler-katie libdbusmenu-katie.so:katana/libdbusmenu-katie \ - libgmp.so:math/gmp libexiv2.so:graphics/exiv2 libasound.so:audio/alsa-lib \ + libdbusmenu-katie.so:katana/libdbusmenu-katie libgmp.so:math/gmp \ + libexiv2.so:graphics/exiv2 libasound.so:audio/alsa-lib \ libspeechd.so:accessibility/speech-dispatcher libtag.so:audio/taglib \ libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer \ libqalculate.so:math/libqalculate libspectre.so:print/libspectre \ libfreetype.so:print/freetype2 libdjvulibre.so:graphics/djvulibre \ libepub.so:textproc/ebook-tools libmms.so:net/libmms libvncserver.so:net/libvncserver \ - libfreerdp2.so:net/freerdp libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar + libfreerdp2.so:net/freerdp libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \ + libpoppler-cpp.so:graphics/poppler CMAKE_ARGS = -Wno-dev -DBUILD_partitionmanager=FALSE LDFLAGS += -Wl,--as-needed diff --git a/packaging/freebsd/poppler-katie/Makefile b/packaging/freebsd/poppler-katie/Makefile deleted file mode 100644 index 74497db..0000000 --- a/packaging/freebsd/poppler-katie/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/ - -PORTNAME = poppler-katie -DISTVERSION = 4.21.0.d20210531 -CATEGORIES = devel -MAINTAINER = xakepa10@gmail.com -COMMENT = Katie bindings for poppler -LICENSE = GPLv2 GPLv3 -LICENSE_COMB = multi - -MASTER_SITES = https://github.com/fluxer/poppler/archive/ -DISTFILES = master.tar.gz -DIST_SUBDIR = ${PORTNAME} -WRKSRC = ${WRKDIR}/poppler-master - -USES = compiler:c++11-lang pkgconfig cmake jpeg -USE_LDCONFIG = yes -# zlib is not part of any package -# building against openjpeg15 because if both openjpeg and openjpeg2 are installed the header from -# openjpeg15 will be found first by the compiler (openjpeg15 header is installed in the local base -# headers directory, openjpeg2 in a sub-directory of the local base headers directory) -LIB_DEPENDS = libKtCore.so:katana/katie libnss3.so:security/nss \ - libfontconfig.so:x11-fonts/fontconfig libfreetype.so:print/freetype2 \ - libpng16.so:graphics/png libtiff.so:graphics/tiff libopenjpeg.so:graphics/openjpeg15 \ - liblcms2.so:graphics/lcms2 libcurl.so:ftp/curl -CMAKE_ARGS = -Wno-dev -DENABLE_LIBOPENJPEG=openjpeg1 -DENABLE_UTILS=OFF -DBUILD_TESTS=OFF \ - -DBUILD_QT4_TESTS=OFF -LDFLAGS += -Wl,--as-needed -# workaround to make it possible to link to libraries that are not specified as full paths -LDFLAGS += -L${LOCALBASE}/lib - -.include diff --git a/packaging/freebsd/poppler-katie/distinfo b/packaging/freebsd/poppler-katie/distinfo deleted file mode 100644 index 15cf20a..0000000 --- a/packaging/freebsd/poppler-katie/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1645543957 -SHA256 (poppler-katie/master.tar.gz) = 3b676d6e6211d6fb24a2958de5195e3189013d52c21485593afa81b75cb0a2c7 -SIZE (poppler-katie/master.tar.gz) = 1093663 diff --git a/packaging/freebsd/poppler-katie/pkg-descr b/packaging/freebsd/poppler-katie/pkg-descr deleted file mode 100644 index a448a32..0000000 --- a/packaging/freebsd/poppler-katie/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Katie bindings for poppler - -WWW: https://github.com/fluxer/poppler diff --git a/packaging/freebsd/poppler-katie/pkg-plist b/packaging/freebsd/poppler-katie/pkg-plist deleted file mode 100644 index 4c88831..0000000 --- a/packaging/freebsd/poppler-katie/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -include/poppler/katie/poppler-annotation.h -include/poppler/katie/poppler-export.h -include/poppler/katie/poppler-form.h -include/poppler/katie/poppler-link.h -include/poppler/katie/poppler-media.h -include/poppler/katie/poppler-optcontent.h -include/poppler/katie/poppler-page-transition.h -include/poppler/katie/poppler-qt4.h -lib/libpoppler-katie.so -lib/libpoppler-katie.so.0 -lib/libpoppler-katie.so.0.61 -libdata/pkgconfig/poppler-katie.pc diff --git a/packaging/netbsd/Makefile b/packaging/netbsd/Makefile index 1c3a287..60e39a7 100644 --- a/packaging/netbsd/Makefile +++ b/packaging/netbsd/Makefile @@ -4,7 +4,6 @@ COMMENT = Katana Desktop Environment SUBDIR += ariya-icons SUBDIR += libdbusmenu-katie -SUBDIR += poppler-katie SUBDIR += kdelibs SUBDIR += kde-baseapps SUBDIR += kde-workspace @@ -15,7 +14,7 @@ SUBDIR += kde-extraapps replace: ${RUN} $(MAKE) distclean ${RUN} $(MAKE) makesum - ${RUN} for sub in ariya-icons libdbusmenu-katie poppler-katie \ + ${RUN} for sub in ariya-icons libdbusmenu-katie \ kdelibs kde-baseapps kde-workspace kde-extraapps;do \ $(MAKE) -C $$sub replace; \ done diff --git a/packaging/netbsd/kde-extraapps/Makefile b/packaging/netbsd/kde-extraapps/Makefile index a2a35ec..78d3b0d 100644 --- a/packaging/netbsd/kde-extraapps/Makefile +++ b/packaging/netbsd/kde-extraapps/Makefile @@ -56,6 +56,7 @@ DEPENDS += kpathsea-[0-9]*:../../print/kpathsea .include "../../multimedia/ffmpegthumbnailer/buildlink3.mk" .include "../../math/qalculate/buildlink3.mk" .include "../../print/libspectre/buildlink3.mk" +.include "../../print/poppler-cpp/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/djvulibre-lib/buildlink3.mk" .include "../../graphics/exiv2/buildlink3.mk" @@ -66,6 +67,5 @@ DEPENDS += kpathsea-[0-9]*:../../print/kpathsea # see above # .include "../../net/freerdp2/buildlink3.mk" .include "../../katana/libdbusmenu-katie/buildlink3.mk" -.include "../../katana/poppler-katie/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk"