diff options
-rw-r--r-- | testing/qalculate-gtk/APKBUILD | 2 | ||||
-rw-r--r-- | testing/qalculate-gtk/install-provider-to-libexecdir.patch | 34 |
2 files changed, 36 insertions, 0 deletions
diff --git a/testing/qalculate-gtk/APKBUILD b/testing/qalculate-gtk/APKBUILD index 1cb4014e551..4079155b1ce 100644 --- a/testing/qalculate-gtk/APKBUILD +++ b/testing/qalculate-gtk/APKBUILD @@ -20,6 +20,7 @@ makedepends=" subpackages="$pkgname-doc $pkgname-lang" source="https://github.com/Qalculate/qalculate-gtk/releases/download/v$pkgver/qalculate-gtk-$pkgver.tar.gz dont-rewrite-Os-to-O2.patch + install-provider-to-libexecdir.patch " options="!check" # no test suite @@ -45,4 +46,5 @@ package() { sha512sums=" 029e0a5db69d04a1bfb796915ded3b4533f3036d99833035ae7e8b214f0b2086f6ecb1c08f463561642bdbbd0fd729250a9bc892bbac5ee0a72a9073d7555a04 qalculate-gtk-3.22.0.tar.gz 69ae01c2ed88e0ffc54783913412a830b1d60b06e512b0f1510f18174a29699d41001c9e94d81caa74ac62a3b1119c68b8188ea1ad928672a3ad056681204d07 dont-rewrite-Os-to-O2.patch +53571261070c75c8f597ddb191dc3e97f9f9a8c1a0b214d1c1ceb68353df1ef816e3bce069bf88ec72793fa7882dca7dfaac91a0ced0812531e1ececa71dcba9 install-provider-to-libexecdir.patch " diff --git a/testing/qalculate-gtk/install-provider-to-libexecdir.patch b/testing/qalculate-gtk/install-provider-to-libexecdir.patch new file mode 100644 index 00000000000..3822b0c2ec6 --- /dev/null +++ b/testing/qalculate-gtk/install-provider-to-libexecdir.patch @@ -0,0 +1,34 @@ +Patch-Source: https://github.com/Qalculate/qalculate-gtk/pull/351 +From dffa7e480c31d6a83a3882c8f9278ef1c3aa5c5f Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Fri, 21 Jan 2022 01:56:03 +0100 +Subject: [PATCH] Install search provider to libexecdir instead of libdir + +See https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html +and https://www.gnu.org/prep/standards/html_node/Directory-Variables.html +--- + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 14592f80..7e9acbd3 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -12,7 +12,7 @@ AM_CPPFLAGS = \ + @QALCULATE_CFLAGS@ + + if ENABLE_SEARCH_PROVIDER +-searchproviderdir=@libdir@ ++searchproviderdir=@libexecdir@ + searchprovider_PROGRAMS = qalculate-search-provider + endif + bin_PROGRAMS = @QALCULATE_GTK@ +@@ -70,7 +70,7 @@ dbusservice_DATA = io.github.Qalculate.SearchProvider.service + io.github.Qalculate.SearchProvider.service: Makefile + $(AM_V_GEN) (echo '[D-BUS Service]'; \ + echo 'Name=io.github.Qalculate.SearchProvider'; \ +- echo 'Exec=@libdir@/qalculate-search-provider') > $@.tmp && \ ++ echo 'Exec=@libexecdir@/qalculate-search-provider') > $@.tmp && \ + mv $@.tmp $@ + + endif |