diff --git a/programming/library/appstream/actions.py b/programming/library/appstream/actions.py index 703c091b50..03edb0c4b9 100755 --- a/programming/library/appstream/actions.py +++ b/programming/library/appstream/actions.py @@ -8,20 +8,38 @@ from pisi.actionsapi import get from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import mesontools +from pisi.actionsapi import shelltools + def setup(): + shelltools.cd("%s" % get.workDIR()) + shelltools.copytree("AppStream-%s" % get.srcVERSION(), "AppStream-qt6") + + shelltools.cd("AppStream-%s" % get.srcVERSION()) + mesontools.configure("--libexecdir=lib \ + -Dstemming=false \ + -Dqt5=true \ + -Dapidocs=false \ + -Dvapi=true") + + shelltools.cd("../AppStream-qt6") mesontools.configure("--libexecdir=lib \ -Dstemming=false \ -Dqt=true \ + -Dapidocs=false \ -Dvapi=true") - def build(): mesontools.build() + + shelltools.cd("../AppStream-qt6") + mesontools.build() def install(): mesontools.install() + shelltools.cd("../AppStream-qt6") + mesontools.install() pisitools.insinto("/usr/share/pixmaps/", "docs/images/src/png/appstream-logo.png") diff --git a/programming/library/appstream/files/fix-qt5-link-target.patch b/programming/library/appstream/files/fix-qt5-link-target.patch new file mode 100644 index 0000000000..c813b6ff2b --- /dev/null +++ b/programming/library/appstream/files/fix-qt5-link-target.patch @@ -0,0 +1,15 @@ +diff --git a/qt/cmake/AppStreamQt5Config.cmake.in b/qt/cmake/AppStreamQt5Config.cmake.in +index 0bef7e80..1d66c566 100644 +--- a/qt/cmake/AppStreamQt5Config.cmake.in ++++ b/qt/cmake/AppStreamQt5Config.cmake.in +@@ -32,8 +32,8 @@ add_library(AppStreamQt SHARED IMPORTED) + set_target_properties(AppStreamQt PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include/" + INTERFACE_LINK_LIBRARIES "Qt5::Core" +- IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt5.so.${AppStreamQt_VERSION}" +- IMPORTED_SONAME "libAppStreamQt5.${AppStreamQt_VERSION_MAJOR}" ++ IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt5.so.${AppStreamQt5_VERSION}" ++ IMPORTED_SONAME "libAppStreamQt5.${AppStreamQt5_VERSION_MAJOR}" + ) + + #################################################################################### diff --git a/programming/library/appstream/pspec.xml b/programming/library/appstream/pspec.xml index 5e2c264261..9b0c349de6 100755 --- a/programming/library/appstream/pspec.xml +++ b/programming/library/appstream/pspec.xml @@ -13,13 +13,14 @@ appstream-logo Provides a standard for creating app stores across distributions Provides a standard for creating app stores across distributions - https://www.freedesktop.org/software/appstream/releases/AppStream-0.16.3.tar.xz + https://www.freedesktop.org/software/appstream/releases/AppStream-1.0.0.tar.xz cmake meson xmlto gtk-doc vala-devel + zstd-devel itstool docbook-xsl docbook-xml @@ -38,7 +39,12 @@ gperf curl-devel gobject-introspection-devel + qt6-base-devel + qt6-linguist + + fix-qt5-link-target.patch + @@ -48,6 +54,7 @@ libxml2 libyaml glib2 + zstd libsoup lmdb libxmlb @@ -65,6 +72,7 @@ /usr/share/gir-1.0 /usr/share/libalpm /usr/share/pixmaps + /usr/share/appstream/appstream.conf /usr/share/installed-tests/appstream/metainfo-validate.test @@ -81,7 +89,7 @@ glib2 - /usr/lib/libAppStreamQt.* + /usr/lib/libAppStreamQt5.* @@ -92,8 +100,33 @@ appstream-qt5 - /usr/include/AppStreamQt - /usr/lib/cmake + /usr/include/AppStreamQt5 + /usr/lib/cmake/AppStreamQt5 + + + + + appstream-qt6 + + qt6-base + libgcc + appstream + glib2 + + + /usr/lib/libAppStreamQt.* + + + + + appstream-qt6-devel + Development files for appstream + + appstream-qt6 + + + /usr/include/AppStreamQt6 + /usr/lib/cmake/AppStreamQt @@ -111,6 +144,13 @@ + + 2023-11-14 + 1.0.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-11-04 0.16.3