[PR PATCH] AppStream: fix library path in cmake files

[PR PATCH] AppStream: fix library path in cmake files

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages AppSteam
https://github.com/void-linux/void-packages/pull/49251

AppStream: fix library path in cmake files
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49251.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-AppSteam-49251.patch --]
[-- Type: text/x-diff, Size: 1976 bytes --]

From 31b4e3f3e75d804b308aa46a98ad08dc11e0b748 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 12 Mar 2024 13:04:54 +0100
Subject: [PATCH] AppStream: fix library path in cmake files

---
 srcpkgs/AppStream/patches/cross.patch | 21 +++++++++++++++++++++
 srcpkgs/AppStream/template            |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/AppStream/patches/cross.patch

diff --git a/srcpkgs/AppStream/patches/cross.patch b/srcpkgs/AppStream/patches/cross.patch
new file mode 100644
index 00000000000000..c0adb6fd5ab045
--- /dev/null
+++ b/srcpkgs/AppStream/patches/cross.patch
@@ -0,0 +1,21 @@
+--- a/qt/meson.build	2024-02-24 22:22:21.000000000 +0100
++++ -	2024-03-12 13:03:47.811844901 +0100
+@@ -127,6 +127,7 @@
+ 
+ cmake_data = configuration_data()
+ cmake_data.set('LIBDIR_FULL', join_paths(get_option('prefix'), get_option('libdir')))
++cmake_data.set('LIBDIR', get_option('libdir'))
+ cmake_data.set('PREFIX', get_option('prefix'))
+ cmake_data.set('VERSION', as_version)
+ 
+--- a/qt/cmake/AppStreamQtConfig.cmake.in	2024-02-24 22:22:21.000000000 +0100
++++ -	2024-03-12 13:04:12.791711630 +0100
+@@ -32,7 +32,7 @@
+ 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}/@LIBDIR@/libAppStreamQt.so.${AppStreamQt_VERSION}"
+   IMPORTED_SONAME "libAppStreamQt.${AppStreamQt_VERSION_MAJOR}"
+ )
+ 
diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 004c59df1c6421..baa23da41321e1 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,7 +1,7 @@
 # Template file for 'AppStream'
 pkgname=AppStream
 version=1.0.2
-revision=1
+revision=2
 build_style=meson
 build_helper="gir qemu"
 configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi)

Re: AppStream: fix library path in cmake files

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/49251#issuecomment-1993960030

Comment:
Should this be submitted upstream?

Re: AppStream: fix library path in cmake files

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/49251#issuecomment-2002145562

Comment:
Send PR to upstream https://github.com/ximion/appstream/pull/620

Re: [PR PATCH] [Merged]: AppStream: fix library path in cmake files

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]

There's a merged pull request on the void-packages repository

AppStream: fix library path in cmake files
https://github.com/void-linux/void-packages/pull/49251

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->