x11-wm/fvwm: Sync with upstream.

It is currently not installable due to dependency failures wrt.
x86-fbsd.  Simplify patch application a bit.

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 3606e7652949ca04201e5b0bbe9fce0dc38d4118..93e54538d080ccaabd950506628c9cae73a5afa3 100644 (file)
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,10 +1,10 @@
 AUX README.translucency 3723 BLAKE2B aae37e9dbdf8f7b730b6947d55f0e286c1269d5cacc9ce6d2481562b054c2fa9010acf6ee0d6c994ea3cee64d3df99ef6d08dfa8c6b58706bc9bb8b477095e1b SHA512 a64ef5147e52e07d4cec8a2f3ebd1340827d0139031ef7ddaf27fc144fcc58858c3ec40eee854034423f853b2c7bdd813f66236c8a9679977084f4a2176a8ffa
-AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa1045b91ef76101ccf8cc6fdf4854c1675b397715977efafb174e340c487bafed12677a1cacb83e201424a9fed43bdfa7f8475 SHA512 92f78b624ea2bfddb88f825f40930a0a7e4bb1d284276e62985f189cd5b72ee8a92131f7d2a91efdbf508fc8ef002f5b4168188b12b0e23e28fb1ebec471969d
-AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be66d110441075839484b6bb26667104090258267b3e484c6fc0b0650349488902d216f3cf841c23e45b59e SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45
-AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
-AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
+AUX fvwm-2.5.27-translucent-menus.diff 15793 BLAKE2B 4f650c0de57d97d7c4cf6ba00728acf482f9e819e4594d540411fb790211a3e2343090ddacaffe8d25eb17f11ca80d2e7046f99c4d40bb857120d3b46551dfc3 SHA512 90427feb28cf19d9e5b92705e41d80371a7c8874fe47b5a94cf4a3f64c297536f0070ea27f749c854a5fa7b32479be48f59e6cfb8559a85f2d489c79b9bc3de6
+AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B 521f2f8bdde469a158b617949f9cbc6dca2530fee377871927d0d91d1bf531e067f3e5d6aecb025512e274b1759ee3522eea639888cc2fd53737e27c3fb54f2d SHA512 fbac194b9fafafbeb1b833d842d25fd6983c041d69a4484f3d7fb75063f4ec400b55f0a5a328113cdaa93e40159552d5920e36b6885fbcd6e76549befc9135b4
+AUX fvwm-2.6.5-mouse-buttons.patch 523 BLAKE2B 3d30cdf5d9137d1d67f2795bb06256d7658bd9fe3cec6d2f1f9c3979f8dd0facd939b9bd9fef9030fbc8e3c0fcd18439563355521f7ad93f0c65d9e6844789d6 SHA512 4481397f6941f61e6962347411ab3adc66f1d3c3d443fb166840673ae404c874e8ea0c60b7df6e112d3972f3beeff94c91bd3431a7db4b62c65046ae544109e3
+AUX fvwm-2.6.8-perl528.patch 519 BLAKE2B 2e1e0e59a10dbe52275c6ef1d73e41813fba0c8e7fb6446999235b926f86fb893b3689964635b7f40599e06c67dd36984a962ec805fc4f8f5ee44dc241137cfb SHA512 8b6c960bf1ce92548288ce11e5c29e95bd60cb67505dd8051adf849c42f80a6baeaa30e3b3d67c0554d41082e7ef472bac6c6ea4c4a3ec979525a18481b18797
 AUX fvwm-2.6.9-bundled-manpage.patch 340 BLAKE2B 5a63e18490342637ce1e692333db2faa19a175ab27516f02374cd29dff030b52e906e52d6eb0bd2914cd7105caf0c23ccc73a2cd0b743efec157e9db8bda5ad0 SHA512 de4cc81da91416f4183f61ec205b91650336d532194ea285298ea629610a1567bb1f6a6f95eda4003e247a110d3d2f2d5236cdfa795c636715f03813a0e1f9db
 AUX fvwm-2.6.9-respect-docdir.patch 455 BLAKE2B d4272d43e010a8a4456965033dff2c88a9965c6fa2c89040fa49855cd8fb7e84bf6a1fdb634359ac9f667501b29a23bf8dc052107119f53f5b9468eac2d43498 SHA512 ff17efd2f1c5e2e252ce78d6647617430582f5dad946ef6672f2893fbc383991d93725709631df671c9f10546d8f3d7fe7c634fadebfac70f1d63cc1c9f1df99
 AUX fvwm-2.6.9-respect-htmldir.patch 655 BLAKE2B 3199958847a2dee691fdecc3148f630ff4c13c74845053bf4e3d566712ef6791c34a02d091c8d2966458b19ef5f1ff16b25ed7eb93cbea2ab2ee026ae177a6e0 SHA512 a20b734342d2bd6dc3e1392852dc7fc20c0f1aaa0f7aa494f0da988c41b2f6f0d8cee8811de5d56afe67715d84fa72a072ffae1206f56425ab3c9763d9ce7fdc
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
-EBUILD fvwm-2.6.9.ebuild 4673 BLAKE2B 470385ab61dbadc9f7f2bea1f561e77e67ab4333912857f77f59f21d2ca38f4d7d447f686ddeece1576b7e5895fdce906ae55173ec87515e6a9e4891f2ce5f05 SHA512 c065d284de98f0521447804c88a0c1a88bdf731f72a5f6295e02c8e809675ae3ecd7aa0c7e4fd98b0766de66f40d455927d20a5f5477adafc23b4e8972f01ca7
+EBUILD fvwm-2.6.9.ebuild 4787 BLAKE2B 542457d8ca2fdf758eb2c1ff704e6e9358db90d95d0b30797f9161b4370d2e2f98c0a55bf5cb01122fc71b3d45b4567cbac8e87a5112b891ca8d827ced760f5a SHA512 84ab1dd8c5981fec343ec0846ee5cd2a6b3221fb044ee0911e7c14deb1b606227305e08ca809002a83f8bfb9c9d346106dbf854153d71d20456c465baba0ff92

diff --git a/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff b/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff
index 1c49f69007d067c74e97ea0ef99fc07ef929cd2a..f3019e6fbec2320f7acca82d1e24f0ed3cd44399 100644 (file)
--- a/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff
+++ b/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff
@@ -3,8 +3,8 @@ Index: fvwm/colorset.c
 RCS file: /home/cvs/fvwm/fvwm/fvwm/colorset.c,v
 retrieving revision 1.52
 diff -u -r1.52 colorset.c
---- fvwm/colorset.c    27 Jan 2007 11:33:15 -0000      1.52
-+++ fvwm/colorset.c    5 Feb 2007 19:15:51 -0000
+--- a/fvwm/colorset.c  27 Jan 2007 11:33:15 -0000      1.52
++++ b/fvwm/colorset.c  5 Feb 2007 19:15:51 -0000
 @@ -164,6 +164,8 @@
        "NoIconTint",
        "IconAlpha",
@@ -123,8 +123,8 @@ Index: fvwm/menuroot.h
 RCS file: /home/cvs/fvwm/fvwm/fvwm/menuroot.h,v
 retrieving revision 1.3
 diff -u -r1.3 menuroot.h
---- fvwm/menuroot.h    13 Jan 2007 15:07:14 -0000      1.3
-+++ fvwm/menuroot.h    5 Feb 2007 19:17:37 -0000
+--- a/fvwm/menuroot.h  13 Jan 2007 15:07:14 -0000      1.3
++++ b/fvwm/menuroot.h  5 Feb 2007 19:17:37 -0000
 @@ -146,6 +146,9 @@
                int d_npixels;
        } stored_pixels;
@@ -140,8 +140,8 @@ Index: fvwm/menus.c
 RCS file: /home/cvs/fvwm/fvwm/fvwm/menus.c,v
 retrieving revision 1.409
 diff -u -r1.409 menus.c
---- fvwm/menus.c       27 Jan 2007 11:51:15 -0000      1.409
-+++ fvwm/menus.c       5 Feb 2007 19:17:50 -0000
+--- a/fvwm/menus.c     27 Jan 2007 11:51:15 -0000      1.409
++++ b/fvwm/menus.c     5 Feb 2007 19:17:50 -0000
 @@ -75,6 +75,19 @@
  
  /* ---------------------------- local macros ------------------------------- */
@@ -442,8 +442,8 @@ Index: fvwm/menus.h
 RCS file: /home/cvs/fvwm/fvwm/fvwm/menus.h,v
 retrieving revision 1.111
 diff -u -r1.111 menus.h
---- fvwm/menus.h       27 Jan 2007 11:51:15 -0000      1.111
-+++ fvwm/menus.h       5 Feb 2007 19:17:50 -0000
+--- a/fvwm/menus.h     27 Jan 2007 11:51:15 -0000      1.111
++++ b/fvwm/menus.h     5 Feb 2007 19:17:50 -0000
 @@ -15,6 +15,9 @@
  #define IS_MENU_RETURN(x) \
    ((x)==MENU_DONE || (x)==MENU_ABORTED || (x)==MENU_SUBMENU_TORN_OFF)
@@ -459,8 +459,8 @@ Index: libs/Colorset.h
 RCS file: /home/cvs/fvwm/fvwm/libs/Colorset.h,v
 retrieving revision 1.38
 diff -u -r1.38 Colorset.h
---- libs/Colorset.h    10 Jan 2007 00:34:27 -0000      1.38
-+++ libs/Colorset.h    5 Feb 2007 19:19:00 -0000
+--- a/libs/Colorset.h  10 Jan 2007 00:34:27 -0000      1.38
++++ b/libs/Colorset.h  5 Feb 2007 19:19:00 -0000
 @@ -51,6 +51,10 @@
        Bool dither;
        Bool allows_buffered_transparency;
@@ -497,8 +497,8 @@ Index: libs/PictureGraphics.c
 RCS file: /home/cvs/fvwm/fvwm/libs/PictureGraphics.c,v
 retrieving revision 1.29
 diff -u -r1.29 PictureGraphics.c
---- libs/PictureGraphics.c     27 Jan 2007 11:33:16 -0000      1.29
-+++ libs/PictureGraphics.c     5 Feb 2007 19:19:49 -0000
+--- a/libs/PictureGraphics.c   27 Jan 2007 11:33:16 -0000      1.29
++++ b/libs/PictureGraphics.c   5 Feb 2007 19:19:49 -0000
 @@ -1340,7 +1340,7 @@
        }
  }
@@ -513,8 +513,8 @@ Index: libs/PictureGraphics.h
 RCS file: /home/cvs/fvwm/fvwm/libs/PictureGraphics.h,v
 retrieving revision 1.13
 diff -u -r1.13 PictureGraphics.h
---- libs/PictureGraphics.h     9 May 2006 20:46:29 -0000       1.13
-+++ libs/PictureGraphics.h     5 Feb 2007 19:19:49 -0000
+--- a/libs/PictureGraphics.h   9 May 2006 20:46:29 -0000       1.13
++++ b/libs/PictureGraphics.h   5 Feb 2007 19:19:49 -0000
 @@ -122,7 +122,9 @@
        Display *dpy, Window win, Pixel tint, int tint_percent,
        Drawable dest, Bool dest_is_a_window, GC gc, GC mono_gc, GC alpha_gc,

diff --git a/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch b/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch
index b1d62006967fc98c88314b1c428da97789b730b5..df3f39ccf72dbb67e0605e1c03844abb62ba64ea 100644 (file)
--- a/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch
+++ b/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch
@@ -1,5 +1,5 @@
---- configure.ac       2012-04-20 12:58:29.000000000 +0200
-+++ configure_new.ac   2013-07-21 18:26:17.513904607 +0200
+--- a/configure.ac     2012-04-20 12:58:29.000000000 +0200
++++ b/configure.ac     2013-07-21 18:26:17.513904607 +0200
 @@ -209,6 +209,10 @@
  # optional libraries.
  AC_PROG_CC
@@ -11,8 +11,8 @@
  
  # added -Wall for gcc, what about for others?
  if test "x$GCC" = "xyes"; then
---- libs/Makefile.in   2012-04-20 13:03:55.000000000 +0200
-+++ libs/Makefile_new.in       2013-07-21 18:27:17.443992505 +0200
+--- a/libs/Makefile.in 2012-04-20 13:03:55.000000000 +0200
++++ b/libs/Makefile.in 2013-07-21 18:27:17.443992505 +0200
 @@ -48,7 +48,7 @@
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
@@ -22,8 +22,8 @@
  ARFLAGS = cru
  libfvwm_a_AR = $(AR) $(ARFLAGS)
  libfvwm_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
---- modules/FvwmScript/Widgets/Makefile.in     2012-04-20 13:03:56.000000000 +0200
-+++ modules/FvwmScript/Widgets/Makefile_new.in 2013-07-21 18:27:23.844001892 +0200
+--- a/modules/FvwmScript/Widgets/Makefile.in   2012-04-20 13:03:56.000000000 +0200
++++ b/modules/FvwmScript/Widgets/Makefile.in   2013-07-21 18:27:23.844001892 +0200
 @@ -46,7 +46,7 @@
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =

diff --git a/x11-wm/fvwm/files/fvwm-2.6.5-mouse-buttons.patch b/x11-wm/fvwm/files/fvwm-2.6.5-mouse-buttons.patch
index 7eaa3e20b7c78a525775a0fc3c239949ca17683f..0c46690845043e7519281f81bebc82f94f0598db 100644 (file)
--- a/x11-wm/fvwm/files/fvwm-2.6.5-mouse-buttons.patch
+++ b/x11-wm/fvwm/files/fvwm-2.6.5-mouse-buttons.patch
@@ -1,5 +1,5 @@
---- libs/defaults.h    2011-08-15 18:25:40.000000000 +0200
-+++ libs/defaults.h    2012-04-12 21:13:47.000000000 +0200
+--- a/libs/defaults.h  2011-08-15 18:25:40.000000000 +0200
++++ b/libs/defaults.h  2012-04-12 21:13:47.000000000 +0200
 @@ -25,7 +25,7 @@
  /* The "extended" buttons do not provide the full functionality because X has
   * no bit mask value for them.  Things like dragging windows don't work with

diff --git a/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch b/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch
index 5735fb1f89b72bf0ffcbe2194ffab31fce8566a2..5555560d4d2e685d8637db5e40e39bab3f7f3647 100644 (file)
--- a/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch
+++ b/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch
@@ -1,5 +1,5 @@
---- modules/FvwmPerl/FvwmPerl.in       2018-04-28 07:46:28.000000000 -0400
-+++ modules/FvwmPerl/FvwmPerl.in       2019-01-06 20:44:59.035950968 -0500
+--- a/modules/FvwmPerl/FvwmPerl.in     2018-04-28 07:46:28.000000000 -0400
++++ b/modules/FvwmPerl/FvwmPerl.in     2019-01-06 20:44:59.035950968 -0500
 @@ -319,11 +319,11 @@
                $FVWM_DATADIR = $FVWM_DATADIR || $module->site_data_dir;
                $FVWM_USERDIR = $FVWM_USERDIR || $module->user_data_dir;

diff --git a/x11-wm/fvwm/fvwm-2.6.9.ebuild b/x11-wm/fvwm/fvwm-2.6.9.ebuild
index 2f03c11a78e3f0f344b7795be715c74faab4167a..0ad1fcc5aa173ed5367332201f3f0ba0b255c2fa 100644 (file)
--- a/x11-wm/fvwm/fvwm-2.6.9.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright © 2021 Nick Bowler
+# Copyright © 2021-2022 Nick Bowler
 # License GPLv2+: GNU General Public License version 2 or any later version.
 # This is free software: you are free to change and redistribute it.
 # There is NO WARRANTY, to the extent permitted by law.
@@ -6,19 +6,25 @@
 # This is a modified version of the original ebuild from Gentoo GNU/Linux,
 # covered by the following copyright and permission notice:
 #
-#   Copyright 1999-2020 Gentoo Authors
+#   Copyright 1999-2022 Gentoo Authors
 #   Distributed under the terms of the GNU General Public License v2
+#
+# The modifications include:
+#
+#   * patch build system to install bundled manpage (2021-02)
+#   * fix prefixed installation in src_install (2021-02)
+#   * convert patches to -p1 (2022-06)
 
 EAPI=7
 inherit autotools flag-o-matic desktop
 
 DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
+HOMEPAGE="https://www.fvwm.org/"
 SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-2 FVWM"
+LICENSE="GPL-2+ FVWM"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
 
 COMMON_DEPEND="
@@ -53,6 +59,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        dev-lang/perl
+       sys-apps/debianutils
        perl? ( tk? (
                        dev-lang/tk
                        dev-perl/Tk
@@ -61,8 +68,7 @@ RDEPEND="${COMMON_DEPEND}
        )
        rplay? ( media-sound/rplay )
        lock? ( x11-misc/xlockmore )
-       userland_GNU? ( sys-apps/debianutils )
-       !x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
+       netpbm? ( media-libs/netpbm )
 "
 DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
@@ -70,25 +76,21 @@ DEPEND="${COMMON_DEPEND}
        doc? ( dev-libs/libxslt )
 "
 
-PATCHES=(      
+PATCHES=(
+       "$FILESDIR/$PN-2.6.5-ar.patch"      #474528
+       "$FILESDIR/$PN-2.6.8-perl528.patch" # Fix for Perl 5.28
        "$FILESDIR/$PN-2.6.9-respect-docdir.patch"
        "$FILESDIR/$PN-2.6.9-respect-htmldir.patch"
        "$FILESDIR/$PN-2.6.9-bundled-manpage.patch"
 )
-
 src_prepare() {
-       if ! use vanilla; then
+       use vanilla || PATCHES+=(
                # Enables fast translucent menus; patch from fvwm-user mailing list.
-               eapply -p0 "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
+               "$FILESDIR/$PN-2.5.27-translucent-menus.diff"
 
                # Allow more mouse buttons, bug #411811
-               eapply -p0 "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
-       fi
-
-       eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
-
-       # Fix for Perl 5.28
-       eapply -p0 "${FILESDIR}/${PN}-2.6.8-perl528.patch"
+               "$FILESDIR/$PN-2.6.5-mouse-buttons.patch"
+       )
 
        default
        eautoreconf