[neon/snap-packaging/kf6-snap] /: Remove libpoppler, libpgpme and libappstream from kf6-snap

Benjamin Port null at kde.org
Mon Apr 22 21:01:59 BST 2024


Git commit e9c047945e13bb965e7fad4b2681fd7e9d85109e by Benjamin Port.
Committed on 22/04/2024 at 09:12.
Pushed by bport into branch 'master'.

Remove libpoppler, libpgpme and libappstream from kf6-snap

D  +0    -13   patches/libappstream-qt6/01_cmake_locate_lib_based_on_package_prefix_dir
D  +0    -1    patches/libappstream-qt6/series
M  +0    -133  snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-snap/-/commit/e9c047945e13bb965e7fad4b2681fd7e9d85109e

diff --git a/patches/libappstream-qt6/01_cmake_locate_lib_based_on_package_prefix_dir b/patches/libappstream-qt6/01_cmake_locate_lib_based_on_package_prefix_dir
deleted file mode 100644
index 7495545..0000000
--- a/patches/libappstream-qt6/01_cmake_locate_lib_based_on_package_prefix_dir
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/qt/cmake/AppStreamQtConfig.cmake.in b/qt/cmake/AppStreamQtConfig.cmake.in
-index 0e3eb11..9f76c2f 100644
---- a/qt/cmake/AppStreamQtConfig.cmake.in
-+++ b/qt/cmake/AppStreamQtConfig.cmake.in
-@@ -32,7 +32,7 @@ add_library(AppStreamQt SHARED IMPORTED)
- set_target_properties(AppStreamQt PROPERTIES
-   INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include/"
-   INTERFACE_LINK_LIBRARIES "Qt::Core"
--  IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt.so.${AppStreamQt_VERSION}"
-+  IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/.. at LIBDIR_FULL@/libAppStreamQt.so.${AppStreamQt_VERSION}"
-   IMPORTED_SONAME "libAppStreamQt.${AppStreamQt_VERSION_MAJOR}"
- )
- 
diff --git a/patches/libappstream-qt6/series b/patches/libappstream-qt6/series
deleted file mode 100644
index 281e942..0000000
--- a/patches/libappstream-qt6/series
+++ /dev/null
@@ -1 +0,0 @@
-01_cmake_locate_lib_based_on_package_prefix_dir
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 9ccafae..ccee786 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -817,114 +817,6 @@ parts:
         cmake-generator: Ninja
         cmake-parameters: *cmakeparameters
         build-environment: *buildenvironment
-    libpoppler:
-        after:
-        - qtconf
-        plugin: cmake
-        source: https://gitlab.freedesktop.org/poppler/poppler.git
-        source-tag: poppler-24.04.0
-        build-packages:
-        - libboost-dev
-        - libjpeg-dev
-        - libopenjp2-7-dev
-        - libnss3-dev
-        - libcurl4-gnutls-dev
-        - liblcms2-dev
-        - libboost-container-dev
-        - libtiff-dev
-        stage-packages:
-        - libfreetype6
-        - liblcms2-2
-        - libcurl3-gnutls
-        - libfontconfig1
-        - libjpeg-turbo8
-        - libnspr4
-        - libnss3
-        - libopenjp2-7
-        - libpng16-16
-        - zlib1g
-        - libtiff5
-        build-snaps:
-        - kde-qt6-core22-sdk
-        cmake-generator: Ninja
-        cmake-parameters:
-        - -DCMAKE_INSTALL_PREFIX=/usr
-        - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-        - -DQT_MAJOR_VERSION=6
-        - -DENABLE_QT5=OFF
-        - -DENABLE_QT6=ON
-        - -DENABLE_GLIB=OFF
-        - -DBUILD_QT5_TESTS=OFF
-        - -DBUILD_QT6_TESTS=OFF
-        - -DBUILD_CPP_TESTS=OFF
-        - -DBUILD_GTK_TESTS=OFF
-        - -DENABLE_GPGME=OFF
-        - -DBUILD_MANUAL_TESTS=OFF
-        - -DCMAKE_INSTALL_SYSCONFDIR=/etc
-        - -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-        - -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
-        - -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF
-        - -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON
-        - -DCMAKE_INSTALL_RUNSTATEDIR=/run
-        - -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON
-        - -DCMAKE_VERBOSE_MAKEFILE=ON
-        - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-        - -DENABLE_DOCS=OFF
-        - --log-level=STATUS
-        - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-        - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
-        - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
-        build-environment: *buildenvironment
-    libappstream-qt6:
-        after:
-        - qtconf
-        source: https://github.com/ximion/appstream/archive/refs/tags/v1.0.2.tar.gz
-        override-pull: |
-            craftctl default
-            while read -r PATCHFILE ; do
-                patch -p1 < "$CRAFT_PROJECT_DIR/patches/libappstream-qt6/$PATCHFILE"
-            done < $CRAFT_PROJECT_DIR/patches/libappstream-qt6/series
-        plugin: meson
-        build-packages:
-        - meson
-        - ninja-build
-        - libyaml-dev
-        - gettext
-        - gi-docgen
-        - gobject-introspection
-        - gperf
-        - gtk-doc-tools
-        - itstool
-        - libcairo2-dev
-        - libcurl4-gnutls-dev
-        - libfontconfig-dev
-        - libgdk-pixbuf-2.0-dev
-        - libgirepository1.0-dev
-        - libglib2.0-dev
-        - libjs-highlight.js
-        - libpango1.0-dev
-        - librsvg2-dev
-        - libstemmer-dev
-        - libsystemd-dev
-        - libxml2-dev
-        - libxmlb-dev
-        - libzstd-dev
-        - libyaml-dev
-        - valac
-        stage-packages:
-        - libcurl3-gnutls
-        - libstemmer0d
-        - libsystemd0
-        - libxml2
-        - libxmlb2
-        - libyaml-0-2
-        - libzstd1
-        build-snaps:
-        - kde-qt6-core22-sdk
-        meson-parameters:
-        - -Dqt=true
-        - --prefix=/usr
-        build-environment: *buildenvironment
     libdbusmenu-qt6:
         after:
         - qtconf
@@ -959,30 +851,6 @@ parts:
         - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
         - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
         build-environment: *buildenvironment
-
-    #    libgpgmepp-qt6:
-#        after:
-#        - qtconf
-#        build-packages:
-#        - libassuan-dev
-#        - libgpg-error-dev
-#        - rsync
-#        stage-packages:
-#        - libassuan0
-#        - libgpg-error0
-#        build-snaps:
-#        - kde-qt6-core22-sdk
-#        source: https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.23.2.tar.bz2
-#        source-checksum: sha256/9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224
-#        plugin: autotools
-#        autotools-configure-parameters:
-#        - --disable-gpgsm-test
-#        - --enable-languages=cpp,qt6
-#        - --prefix=/usr
-#        build-environment: *buildenvironment
-#        override-build: |
-#            craftctl default
-#            rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /
     kfilemetadata:
         after:
         - extra-cmake-modules
@@ -990,7 +858,6 @@ parts:
         - kconfig
         - kcoreaddons
         - ki18n
-        - libpoppler
         source: https://invent.kde.org/frameworks/kfilemetadata.git
         source-tag: *kf6-version
         build-packages:



More information about the Neon-commits mailing list