[Git][haskell-team/DHG_packages][master] hclip: add Wayland support from upstreamed PR

[Marcel Fourné (@mfourne)]

Marcel Fourné pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
7726059d by Marcel Fourné at 2022-08-27T09:59:32+02:00
hclip: add Wayland support from upstreamed PR

- - - - -


4 changed files:

- p/haskell-hclip/debian/changelog
- p/haskell-hclip/debian/control
- + p/haskell-hclip/debian/patches/series
- + p/haskell-hclip/debian/patches/wayland-support


Changes:

=====================================
p/haskell-hclip/debian/changelog
=====================================
@@ -1,3 +1,11 @@
+haskell-hclip (3.0.0.4-8.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * add patch for wayland support, adapted from upstream PR
+  * Closes: #1018215
+
+ -- Marcel Fourné <debian at marcelfourne.de>  Sat, 27 Aug 2022 09:35:31 +0200
+
 haskell-hclip (3.0.0.4-8) unstable; urgency=medium
 
   * Declare compliance with Debian policy 4.6.1


=====================================
p/haskell-hclip/debian/control
=====================================
@@ -25,7 +25,7 @@ Package: libghc-hclip-dev
 Architecture: any
 Depends: ${haskell:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Recommends: ${haskell:Recommends}
-Suggests: xclip, ${haskell:Suggests}
+Suggests: xclip, wl-clipboard, ${haskell:Suggests}
 Conflicts: ${haskell:Conflicts}
 Provides: ${haskell:Provides}
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}


=====================================
p/haskell-hclip/debian/patches/series
=====================================
@@ -0,0 +1 @@
+wayland-support


=====================================
p/haskell-hclip/debian/patches/wayland-support
=====================================
@@ -0,0 +1,23 @@
+Description: add Wayland support
+Slightly adapted patch from upstream pull request
+
+Origin: other, https://github.com/jetho/Hclip/pull/8/commits/394afc48ae57e9bf86c79670ef315dfe6911bf61
+Bug: https://github.com/jetho/Hclip/issues/7
+Forwarded: not-needed
+Last-Update: 2022-08-27
+
+--- haskell-hclip-3.0.0.4.orig/System/Hclip.hs
++++ haskell-hclip-3.0.0.4/System/Hclip.hs
+@@ -152,9 +152,11 @@ execute Windows (SetClipboard s) =
+ 
+ -- | Determine the correct Linux command.
+ resolveLinuxApp :: Command a -> IO String
+-resolveLinuxApp cmd = decode cmd <$> chooseFirstApp ["xsel", "xclip"] 
++resolveLinuxApp cmd = decode cmd <$> chooseFirstApp ["wl-copy", "xsel", "xclip"] 
+     where
+         decode :: Command a -> String -> String
++        decode GetClipboard     "wl-copy" = "wl-paste --no-newline"
++        decode (SetClipboard _) "wl-copy" = "wl-copy"
+         decode GetClipboard     "xsel"  = "xsel -b -o"
+         decode (SetClipboard _) "xsel"  = "xsel -b -i"
+         decode GetClipboard     "xclip" = "xclip -selection c -o"



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/7726059db183ab00737813132425136d7950906c

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/7726059db183ab00737813132425136d7950906c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220827/97ad2542/attachment-0001.htm>