Frederik Schwan pushed to branch main at Arch Linux / Packaging / Packages / 
pcsclite


Commits:
8272faa0 by Frederik Schwan at 2024-05-04T19:08:24+02:00
Remove meson patch fixed by upstream commit 
960e367edc01518b90684ffff99010ee07ae1bd4

- - - - -


2 changed files:

- − 0001-use-default-prefix-for-binary-install-dir.patch
- PKGBUILD


Changes:

=====================================
0001-use-default-prefix-for-binary-install-dir.patch deleted
=====================================
@@ -1,34 +0,0 @@
-From 803e38397fe174b69a41fc6e708ff41120a182f0 Mon Sep 17 00:00:00 2001
-From: Frederik Schwan <frederik.sch...@linux.com>
-Date: Sat, 4 May 2024 10:52:09 +0200
-Subject: [PATCH] use default prefix for binary install dir
-
----
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 843d643e..ce649fac 100644
---- a/meson.build
-+++ b/meson.build
-@@ -24,7 +24,7 @@ confgen_data = configuration_data({
-   'VERSION' : meson.project_version(),
-   'ipcdir' : get_option('ipcdir'),
-   'sysconfdir' : get_option('sysconfdir'),
--  'sbindir_exp' : '/' / get_option('sbindir'),
-+  'sbindir_exp' : get_option('sbindir'),
-   'PCSCLITE_CONFIG_DIR' : get_option('serialconfdir'),
-   'usbdropdir' : get_option('usbdropdir'),
-   })
-@@ -143,7 +143,7 @@ executable('pcscd',
-   dependencies : pcscd_dep,
-   c_args: '-DPCSCD',
-   export_dynamic : true,
--  install_dir : '/' / get_option('sbindir'),
-+  install_dir : get_option('sbindir'),
-   install : true)
- 
- # libpcsclite_real library
--- 
-2.45.0
-


=====================================
PKGBUILD
=====================================
@@ -39,15 +39,8 @@ provides=(
 validpgpkeys=('F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E') # Ludovic Rousseau 
<rouss...@debian.org>
 source=(
   "git+https://github.com/LudovicRousseau/PCSC.git#tag=${pkgver}?signed";
-  0001-use-default-prefix-for-binary-install-dir.patch
 )
-sha256sums=('6888231cfb24d8283f0617fa01824eacda005d38c4324bd5327a39e63ac335d2'
-            'ff045d7b0f2b33487c9cb3ecff9f8324fb204f8b72d1b6ada53e58b287df5e65')
-
-prepare() {
-  cd PCSC
-  patch -Np1 < ../0001-use-default-prefix-for-binary-install-dir.patch
-}
+sha256sums=('6888231cfb24d8283f0617fa01824eacda005d38c4324bd5327a39e63ac335d2')
 
 build() {
   local meson_options=(



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/pcsclite/-/commit/8272faa019abc84ecf18a5adfa1d9935452611a5

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/pcsclite/-/commit/8272faa019abc84ecf18a5adfa1d9935452611a5
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to